Browse Source

注释target_points数据入库

hxd 3 months ago
parent
commit
4d3c212ec3

+ 1 - 2
portal-service-application/src/test/java/com/hfln/portal/application/controller/wap/UserControllerTest.java

@@ -1,6 +1,5 @@
 package com.hfln.portal.application.controller.wap;
 
-import cn.dev33.satoken.stp.SaTokenInfo;
 import cn.hfln.framework.dto.ApiResult;
 import cn.hfln.framework.extension.BizException;
 import com.hfln.portal.common.dto.data.user.UserDto;
@@ -203,7 +202,7 @@ class UserControllerTest {
     @Test
     void loginByPhone_Exception() {
         // 准备测试数据
-        PhoneLoginParams params = createTestPhoneLoginParams(TEST_PHONE, TEST_OPENID, TEST_UNIONID);
+        PhoneLoginParams params = createTestPhoneLoginParams(SUCCESS_CODE,TEST_OPENID, TEST_UNIONID);
         
         // 模拟UserGateway抛出异常
         when(userGateway.loginByPhone(params)).thenThrow(new RuntimeException("数据库连接失败"));

+ 1 - 1
portal-service-domain/src/main/java/com/hfln/portal/domain/exception/ErrorEnum.java

@@ -56,13 +56,13 @@ public enum ErrorEnum implements ErrorEnumInterface{
      * 群组相关
      */
     GROUP_NAME_ISNULL("70001", "群组名称不能为空!"),
-    GROUP_NAME_IS_EXIST("50004", "群组名称已存在!"),
     GROUP_IS_NOT_EXIST("70002", "群组不存在!"),
     SHARE_IS_EXPIRED("70003", "分享已过期!"),
     SHARE_GROUP_IS_NOT_EXIST("70004", "共享群组不存在!"),
     DEVICE_IS_NOT_EXIST_GROUP("70005", "设备未加入此群组!"),
     SHARE_IS_HANDLED("70006", "分享已处理!"),
     DEVICE_ALREADY_IN_GROUP("70007","设备已绑定群组,请勿重复添加"),
+    GROUP_NAME_IS_EXIST("70008", "群组名称已存在!"),
 
     /**
      * 设备房间相关

+ 8 - 6
portal-service-infrastructure/src/main/java/com/hfln/portal/infrastructure/mqtt/MqttSubHandle.java

@@ -5,10 +5,12 @@ import com.alibaba.fastjson2.JSONArray;
 import com.alibaba.fastjson2.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.hfln.portal.common.constant.mqtt.topic.TopicConstants;
-import com.hfln.portal.domain.customer.util.DevPosFixUtil;
 import com.hfln.portal.domain.customer.util.MsgClient;
 import com.hfln.portal.domain.customer.util.WxOfficeAccountClient;
-import com.hfln.portal.infrastructure.po.*;
+import com.hfln.portal.infrastructure.po.DevInfo;
+import com.hfln.portal.infrastructure.po.EventList;
+import com.hfln.portal.infrastructure.po.UserInfo;
+import com.hfln.portal.infrastructure.po.WxRelation;
 import com.hfln.portal.infrastructure.service.*;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
@@ -171,7 +173,7 @@ public class MqttSubHandle {
                     }
                 }
 
-                // target_points数据入库
+/*                // target_points数据入库
                 DevTarget target = new DevTarget();
                 target.setDevId(dev.getDevId());
                 target.setPose(pose);
@@ -183,7 +185,7 @@ public class MqttSubHandle {
                 }
                 target.setTargetPoints(targetPointsStr);
                 target.setEvent(messageType);
-                devTargetService.save(target);
+                devTargetService.save(target);*/
 
                 DevInfo devInfo = new DevInfo();
                 devInfo.setTargetPoints(targetPointsStr);
@@ -354,7 +356,7 @@ public class MqttSubHandle {
                     }
                 }
 
-                // target_points数据入库
+/*                // target_points数据入库
                 DevTarget target = new DevTarget();
                 target.setDevId(dev.getDevId());
                 target.setPose(pose);
@@ -366,7 +368,7 @@ public class MqttSubHandle {
                 }
                 target.setTargetPoints(targetPointsStr);
                 target.setEvent(messageType);
-                devTargetService.save(target);
+                devTargetService.save(target);*/
 
                 DevInfo devInfo = new DevInfo();
                 devInfo.setTargetPoints(targetPointsStr);