Merge branch 'master' into test

device-api-service-merc-mini/src/main/java/com/xy/controller/MercMiniDeviceController.java

@@ -27,7 +27,7 @@ import com.xy.service.DeviceTempRecordsServiceImpl;
 import com.xy.service.be.MercFeignService;
 import com.xy.service.common.MercLineService;
 import com.xy.service.common.MercPlaceService;
-import com.xy.service.factory.device.service.DeviceFactory;
+import com.xy.service.factory.device.DeviceFactory;
 import com.xy.utils.*;
 import com.xy.utils.enums.DeviceActiveStateEnum;
 import com.xy.utils.enums.DeviceAuthCodeUseStatus;
@@ -88,7 +88,7 @@ public class MercMiniDeviceController {
 
     @ApiOperation("设备列表-Id&Name")
     @PostMapping("listOfIdName")
-    public R listOfIdName(){
+    public R listOfIdName() {
         DeviceInfoDto.ListCommon listCommonDto = new DeviceInfoDto.ListCommon();
         DeviceInfoDto.Vo voDto = new DeviceInfoDto.Vo();
         voDto.setActiveState(Integer.valueOf(DeviceActiveStateEnum.TRUE.getCode()))
@@ -232,7 +232,7 @@ public class MercMiniDeviceController {
                 return r;
             }
         }
-        return FactoryUtils.getService(factory, DeviceFactory.class).active(active);
+        return FactoryUtils.getServiceRoute(DeviceFactory.class, deviceInfo.getDeviceType()).active(active);
     }
 
     @ApiOperation("运营状态修改")
@@ -240,8 +240,7 @@ public class MercMiniDeviceController {
     public R modifyBusyStage(@RequestBody @Validated MercMiniDeviceDto.BusySate busySate) {
         Long mercId = MercAuthUtils.getMercId();
         DeviceInfo deviceInfo = deviceInfoService.getById(busySate.getDeviceId());
-        return FactoryUtils.getService(() -> deviceInfo.getDeviceType() == EnumDeviceType.N_5.getIntCode() ? 2 : 1, DeviceFactory.class)
-                .busyStatus(busySate.setMercId(mercId));
+        return FactoryUtils.getServiceRoute(DeviceFactory.class, deviceInfo.getDeviceType()).busyStatus(busySate.setMercId(mercId));
     }
 
     @ApiOperation("修改设备信息、上传坐标等")

device-api-service/src/main/java/com/xy/service/DeviceEventMsgServiceImpl.java

@@ -3,14 +3,13 @@ package com.xy.service;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.xy.device.EnumDeviceType;
 import com.xy.dto.DeviceEventMsgDto;
 import com.xy.dto.DeviceInfoDto;
 import com.xy.entity.DeviceEventMsg;
 import com.xy.entity.SysCodeConfigureRedis;
 import com.xy.enums.SysCodeConfigureEnum;
 import com.xy.mapper.DeviceEventMsgMapper;
-import com.xy.service.factory.device.service.DeviceFactory;
+import com.xy.service.factory.device.DeviceFactory;
 import com.xy.utils.*;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -51,8 +50,7 @@ public class DeviceEventMsgServiceImpl extends ServiceImpl<DeviceEventMsgMapper,
         if (deviceInfo == null) {
             return R.fail("设备不存在");
         }
-        return FactoryUtils.getService(() -> deviceInfo.getDeviceType() == EnumDeviceType.N_5.getIntCode() ? 2 : 1, DeviceFactory.class)
-                .eventMsg(save);
+        return FactoryUtils.getServiceRoute(DeviceFactory.class, deviceInfo.getDeviceType()).eventMsg(save);
     }
 
     @Override

device-api-service/src/main/java/com/xy/service/DeviceRegisterServiceImpl.java

@@ -13,7 +13,6 @@ import com.xy.collections.list.JArrayList;
 import com.xy.collections.list.JList;
 import com.xy.collections.map.JMap;
 import com.xy.config.DeviceThreadPoolConfig;
-import com.xy.device.EnumDeviceType;
 import com.xy.dto.DeviceCreateIdsDto;
 import com.xy.dto.DeviceQualityDto;
 import com.xy.dto.DeviceRegisterDto;
@@ -23,7 +22,7 @@ import com.xy.entity.DeviceSysinfo;
 import com.xy.entity.MqttUser;
 import com.xy.mapper.DeviceCreateIdsMapper;
 import com.xy.mapper.DeviceRegisterMapper;
-import com.xy.service.factory.device.service.DeviceFactory;
+import com.xy.service.factory.device.DeviceFactory;
 import com.xy.utils.*;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -91,8 +90,7 @@ public class DeviceRegisterServiceImpl extends ServiceImpl<DeviceRegisterMapper,
         if (count > 0) {
             return R.fail("设备SN已被绑定");
         }
-        return FactoryUtils.getService(() -> deviceCreateIds.getDeviceType() == EnumDeviceType.N_5.getIntCode() ? 2 : 1, DeviceFactory.class)
-                .save(save.setDeviceType(deviceCreateIds.getDeviceType()));
+        return FactoryUtils.getServiceRoute(DeviceFactory.class, deviceCreateIds.getDeviceType()).save(save.setDeviceType(deviceCreateIds.getDeviceType()));
     }
 
     @PostMapping("page")

device-api-service/src/main/java/com/xy/service/MqttServiceImpl.java

@@ -13,7 +13,6 @@ import com.xy.collections.list.JList;
 import com.xy.collections.map.JHashMap;
 import com.xy.collections.map.JMap;
 import com.xy.consumer.cmd.CmdProducer;
-import com.xy.device.EnumDeviceType;
 import com.xy.dto.AckMqttDto;
 import com.xy.dto.CommandMqtt;
 import com.xy.dto.MqttDto;
@@ -22,8 +21,8 @@ import com.xy.entity.DeviceInfo;
 import com.xy.entity.MqttCommand;
 import com.xy.error.CommRuntimeException;
 import com.xy.mapper.MqttCommandMapper;
-import com.xy.service.factory.cmd.service.CmdService;
-import com.xy.service.factory.device.service.DeviceFactory;
+import com.xy.service.factory.cmd.CmdService;
+import com.xy.service.factory.device.DeviceFactory;
 import com.xy.utils.*;
 import com.xy.utils.enums.MqttCommandStatusEnum;
 import io.swagger.annotations.Api;
@@ -129,7 +128,7 @@ public class MqttServiceImpl extends ServiceImpl<MqttCommandMapper, MqttCommand>
         });
         List<Tuple.Tuple3<Long, Long, Boolean>> list = new ArrayList<>();
         jMap.forEach((deviceType, commandMqttss) -> {
-            List<Tuple.Tuple3<Long, Long, Boolean>> data = FactoryUtils.getService(() -> deviceType == EnumDeviceType.N_5.getIntCode() ? 2 : 1, DeviceFactory.class)
+            List<Tuple.Tuple3<Long, Long, Boolean>> data = FactoryUtils.getServiceRoute(DeviceFactory.class, deviceType)
                     .senCommand(commandMqttss).getData();
             if (data != null) {
                 list.addAll(data);
@@ -172,7 +171,7 @@ public class MqttServiceImpl extends ServiceImpl<MqttCommandMapper, MqttCommand>
     @ApiOperation("指令结果通知")
     @PostMapping("commandResultBack")
     public R commandResultBack(@RequestBody @Validated MqttDto.ResultBack resultBack) {
-        return FactoryUtils.getService(resultBack.getCmdType(), CmdService.class).resultBack(resultBack);
+        return FactoryUtils.getService(CmdService.class, resultBack.getCmdType()).resultBack(resultBack);
     }
 
     @PostMapping("snByCmdAndResult")

device-api-service/src/main/java/com/xy/service/factory/cmd/service/CmdService.java → device-api-service/src/main/java/com/xy/service/factory/cmd/CmdService.java

@@ -1,4 +1,4 @@
-package com.xy.service.factory.cmd.service;
+package com.xy.service.factory.cmd;
 
 import com.xy.dto.MqttDto;
 import com.xy.utils.R;

device-api-service/src/main/java/com/xy/service/factory/cmd/QualityCmdServiceImpl.java → device-api-service/src/main/java/com/xy/service/factory/cmd/impl/QualityCmdServiceImpl.java

@@ -1,4 +1,4 @@
-package com.xy.service.factory.cmd;
+package com.xy.service.factory.cmd.impl;
 
 import cn.hutool.json.JSONObject;
 import com.xy.annotate.Factory;
@@ -8,7 +8,7 @@ import com.xy.dto.PaterDto;
 import com.xy.entity.DeviceQuality;
 import com.xy.error.CommRuntimeException;
 import com.xy.service.DeviceQualityServiceImpl;
-import com.xy.service.factory.cmd.service.CmdService;
+import com.xy.service.factory.cmd.CmdService;
 import com.xy.utils.Emptys;
 import com.xy.utils.LambdaUtils;
 import com.xy.utils.R;

device-api-service/src/main/java/com/xy/service/factory/cmd/SetsCmdServiceImpl.java → device-api-service/src/main/java/com/xy/service/factory/cmd/impl/SetsCmdServiceImpl.java

@@ -1,4 +1,4 @@
-package com.xy.service.factory.cmd;
+package com.xy.service.factory.cmd.impl;
 
 import cn.hutool.json.JSONObject;
 import com.xy.annotate.Factory;
@@ -8,7 +8,7 @@ import com.xy.dto.MqttDto;
 import com.xy.dto.PaterDto;
 import com.xy.entity.DeviceTempSet;
 import com.xy.service.DeviceTempSetServiceImpl;
-import com.xy.service.factory.cmd.service.CmdService;
+import com.xy.service.factory.cmd.CmdService;
 import com.xy.utils.R;
 import lombok.AllArgsConstructor;
 

device-api-service/src/main/java/com/xy/service/factory/cmd/TaskCmdServiceImpl.java → device-api-service/src/main/java/com/xy/service/factory/cmd/impl/TaskCmdServiceImpl.java

@@ -1,4 +1,4 @@
-package com.xy.service.factory.cmd;
+package com.xy.service.factory.cmd.impl;
 
 import cn.hutool.json.JSONObject;
 import com.xy.annotate.Factory;
@@ -6,7 +6,7 @@ import com.xy.device.EnumMqttCmdTempletTask;
 import com.xy.dto.ActivityInfoDto;
 import com.xy.dto.MqttDto;
 import com.xy.service.ActivityInfoService;
-import com.xy.service.factory.cmd.service.CmdService;
+import com.xy.service.factory.cmd.CmdService;
 import com.xy.utils.R;
 import lombok.AllArgsConstructor;
 

device-api-service/src/main/java/com/xy/service/factory/device/service/DeviceFactory.java → device-api-service/src/main/java/com/xy/service/factory/device/DeviceFactory.java

@@ -1,4 +1,4 @@
-package com.xy.service.factory.device.service;
+package com.xy.service.factory.device;
 
 import com.xy.dto.*;
 import com.xy.utils.R;

device-api-service/src/main/java/com/xy/service/factory/device/impl/DeviceFactoryRoute.java

@@ -0,0 +1,18 @@
+package com.xy.service.factory.device.impl;
+
+import com.xy.annotate.FactoryRoute;
+import com.xy.device.EnumDeviceType;
+import com.xy.service.factory.device.DeviceFactory;
+import com.xy.utils.FactoryUtils;
+import lombok.AllArgsConstructor;
+
+@AllArgsConstructor
+@FactoryRoute(interfaceClass = DeviceFactory.class)
+public class DeviceFactoryRoute implements FactoryUtils.RouteService {
+
+    @Override
+    public String route(Object object) {
+        Integer deviceType = Integer.valueOf(object.toString());
+        return deviceType == EnumDeviceType.N_5.getIntCode() ? "2" : "1";
+    }
+}

device-api-service/src/main/java/com/xy/service/factory/device/AliPayOpenDeviceFatoryImpl.java → device-api-service/src/main/java/com/xy/service/factory/device/impl/alipay/AliPayOpenDeviceFatoryImpl.java

@@ -1,4 +1,4 @@
-package com.xy.service.factory.device;
+package com.xy.service.factory.device.impl.alipay;
 
 import cn.hutool.json.JSONObject;
 import com.xy.alipay.SpiDeviceService;
@@ -19,7 +19,8 @@ import com.xy.service.AlipayDeviceService;
 import com.xy.service.DeviceEventMsgServiceImpl;
 import com.xy.service.DeviceInfoServiceImpl;
 import com.xy.service.DeviceStatusServiceImpl;
-import com.xy.service.factory.device.service.DeviceFactory;
+import com.xy.service.factory.device.impl.open.OpenDeviceFactoryImpl;
+import com.xy.service.factory.device.DeviceFactory;
 import com.xy.utils.*;
 import com.xy.utils.enums.DeviceErrorRecordTypesEnum;
 import com.xy.vo.DeviceDetailVO;

device-api-service/src/main/java/com/xy/service/factory/device/OpenDeviceFactoryImpl.java → device-api-service/src/main/java/com/xy/service/factory/device/impl/open/OpenDeviceFactoryImpl.java

@@ -1,4 +1,4 @@
-package com.xy.service.factory.device;
+package com.xy.service.factory.device.impl.open;
 
 import cn.hutool.json.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -15,8 +15,8 @@ import com.xy.mapper.DeviceInfoMapper;
 import com.xy.mapper.DeviceStatusMapper;
 import com.xy.mapper.DeviceSysinfoMapper;
 import com.xy.service.*;
-import com.xy.service.factory.cmd.service.CmdService;
-import com.xy.service.factory.device.service.DeviceFactory;
+import com.xy.service.factory.cmd.CmdService;
+import com.xy.service.factory.device.DeviceFactory;
 import com.xy.utils.*;
 import lombok.AllArgsConstructor;
 
@@ -189,7 +189,7 @@ public class OpenDeviceFactoryImpl implements DeviceFactory {
             map.get(cmdType).add(mqttDto);
         });
         map.forEach((k, v) -> {
-            CmdService service = FactoryUtils.getService(k, CmdService.class);
+            CmdService service = FactoryUtils.getService(CmdService.class, k);
             if (service == null) {
                 return;
             }