Default Changelist

@@ -68,6 +68,23 @@ public class UserTerminalGroupRelationController extends BaseController
         return AjaxResult.success(list);
     }
 
+    @ApiOperation("查询分组终端")
+    @GetMapping("/grouplist")
+    public AjaxResult grouplist(Integer iot_terminal_group_id ,Integer product_id)
+    {
+        StringBuffer stringBuffer = new StringBuffer();
+        if (null != iot_terminal_group_id)
+        {
+            stringBuffer.append(" AND a.iot_terminal_group_id="+iot_terminal_group_id);
+        }
+        if (null != product_id)
+        {
+            stringBuffer.append(" AND b.product_id="+product_id);
+        }
+        List<Map<String,Object>> list = publicService.getObjectListBySQL("SELECT b.* FROM `user_terminal_group_relation` a LEFT JOIN `iot_terminal` b ON a.`iot_terminal_id`=b.`id` WHERE a.user_info_id="+getUserId().intValue()+stringBuffer);
+        return AjaxResult.success(list);
+    }
+
     /**
      * 导出终端分组关系列表
      */
@@ -106,11 +123,13 @@ public class UserTerminalGroupRelationController extends BaseController
         }
         List<UserTerminalGroupRelation> list = new ArrayList<>();
         String[] is = iotTerminalIds.split(",");
+        Integer userid = getUserId().intValue();
         for(String iotTerminalId:is)
         {
             UserTerminalGroupRelation newuserTerminalGroupRelation = new UserTerminalGroupRelation();
             BeanUtils.copyBeanProp(newuserTerminalGroupRelation,userTerminalGroupRelation);
             newuserTerminalGroupRelation.setIot_terminal_id(iotTerminalId);
+            newuserTerminalGroupRelation.setUser_info_id(userid);
             list.add(newuserTerminalGroupRelation);
         }
         return toAjax( publicService.insertAll(list));
@@ -124,7 +143,13 @@ public class UserTerminalGroupRelationController extends BaseController
     @PutMapping
     public AjaxResult edit(@RequestBody UserTerminalGroupRelation userTerminalGroupRelation)
     {
-        return toAjax(userTerminalGroupRelationService.updateUserTerminalGroupRelation(userTerminalGroupRelation));
+        String iotTerminalIds = userTerminalGroupRelation.getIot_terminal_id();
+        if(StringUtils.isEmpty(iotTerminalIds))
+        {
+            return AjaxResult.error("终端id必填");
+        }
+        int i = publicService.updateBySql("UPDATE `user_terminal_group_relation` SET iot_terminal_group_id="+userTerminalGroupRelation.getIot_terminal_group_id()+",iot_terminal_group_name='"+userTerminalGroupRelation.getIot_terminal_group_name()+"' WHERE iot_terminal_id IN('"+iotTerminalIds.replace(",","','")+"') and user_info_id="+getUserId().intValue());
+        return toAjax(i);
     }
 
     /**

@@ -246,6 +246,7 @@ public class ChatGPTController extends BaseController {
      */
     private CompletionResult3_5 sendGPTAi(List<ChatRoomMessages> messageList)
     {
+        logger.info("请求内容：{}",messageList);
         JSONObject jsonObject = new JSONObject();
         jsonObject.put("model","gpt-3.5-turbo-0301");
         jsonObject.put("messages",messageList);
@@ -262,10 +263,12 @@ public class ChatGPTController extends BaseController {
      */
     private CompletionResult3_5 sendFreeGPTAi(List<ChatRoomMessages> messageList)
     {
+        logger.info("请求内容：{}",messageList);
         JSONObject jsonObject = new JSONObject();
         jsonObject.put("model","gpt-3.5-turbo-0301");
         jsonObject.put("messages",messageList);
         String str = HttpUtil.post("https://free.chatgpt.njlaikun.com/v1/chat/completions",jsonObject.toString());
+        logger.info("返回的数据：{}",str);
         CompletionResult3_5 completionResult = JSONObject.parseObject(str, CompletionResult3_5.class);
         return completionResult;
     }

@@ -19,7 +19,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     <select id="selectUserTerminalGroupRelationList" parameterType="UserTerminalGroupRelation" resultMap="UserTerminalGroupRelationResult">
         <include refid="selectUserTerminalGroupRelationVo"/>
-        <where>  
+        <where>
+            <if test="iot_terminal_group_id !=null">
+                and iot_terminal_group_id = #{iot_terminal_group_id}
+            </if>
+            <if test="configKey !=null and configKey != ''">
+                and user_info_id = #{user_info_id}
+            </if>
         </where>
     </select>