设备列表导出优化

common-lib/src/main/java/com/mortals/xhx/feign/site/ISiteFeign.java

 package com.mortals.xhx.feign.site;
 
+import com.mortals.xhx.common.pdu.RespData;
 import com.mortals.xhx.common.pdu.site.SitePdu;
 import com.alibaba.fastjson.JSON;
 import com.mortals.framework.common.Rest;
@@ -30,7 +31,7 @@ public interface ISiteFeign extends IFeign {
      * @return
      */
     @PostMapping(value = "/site/list")
-    String list(@RequestBody SitePdu sitePdu);
+    Rest<RespData<List<SitePdu>>> list(@RequestBody SitePdu sitePdu);
 
 
     /**
@@ -40,7 +41,7 @@ public interface ISiteFeign extends IFeign {
      * @return
      */
     @GetMapping(value = "/site/info")
-    String info(@RequestParam(value = "id") Long id);
+    Rest<SitePdu> info(@RequestParam(value = "id") Long id);
 
     /**
      * 删除站点
@@ -49,7 +50,7 @@ public interface ISiteFeign extends IFeign {
      * @return
      */
     @GetMapping(value = "/site/delete")
-    String delete(Long[] ids, @RequestHeader("Authorization") String authorization);
+    Rest<Void> delete(Long[] ids, @RequestHeader("Authorization") String authorization);
 
 
     /**
@@ -59,7 +60,7 @@ public interface ISiteFeign extends IFeign {
      * @return
      */
     @PostMapping(value = "/site/save")
-    String save(@RequestBody SitePdu sitePdu, @RequestHeader("Authorization") String authorization);
+    Rest<RespData<SitePdu>> save(@RequestBody SitePdu sitePdu, @RequestHeader("Authorization") String authorization);
 
     /**
      * 获取站点树
@@ -87,26 +88,26 @@ public interface ISiteFeign extends IFeign {
 class SiteFeignFallbackFactory implements FallbackFactory<ISiteFeign> {
     @Override
     public ISiteFeign create(Throwable t) {
-        log.error("异常：",t);
+        log.error("异常：", t);
         return new ISiteFeign() {
             @Override
-            public String list(SitePdu sitePdu) {
-                return JSON.toJSONString(Rest.fail("暂时无法获取站点列表，请稍后再试!"));
+            public Rest<RespData<List<SitePdu>>> list(SitePdu sitePdu) {
+                return Rest.fail("暂时无法获取站点列表，请稍后再试!");
             }
 
             @Override
-            public String info(Long id) {
-                return JSON.toJSONString(Rest.fail("暂时无法获取站点详细，请稍后再试!"));
+            public Rest<SitePdu> info(Long id) {
+                return Rest.fail("暂时无法获取站点详细，请稍后再试!");
             }
 
             @Override
-            public String delete(Long[] ids, String authorization) {
-                return JSON.toJSONString(Rest.fail("暂时无法删除站点，请稍后再试!"));
+            public Rest<Void> delete(Long[] ids, String authorization) {
+                return Rest.fail("暂时无法删除站点，请稍后再试!");
             }
 
             @Override
-            public String save(SitePdu sitePdu, String authorization) {
-                return JSON.toJSONString(Rest.fail("暂时无法保存站点，请稍后再试!"));
+            public Rest<RespData<SitePdu>> save(SitePdu sitePdu, String authorization) {
+                return Rest.fail("暂时无法保存站点，请稍后再试!");
             }
 
             @Override
@@ -116,7 +117,7 @@ class SiteFeignFallbackFactory implements FallbackFactory<ISiteFeign> {
 
             @Override
             public Rest<List<SitePdu>> getFlatSitesBySiteId(SitePdu sitePdu) {
-                return  Rest.fail("暂时无法获取站点子站点，请稍后再试!");
+                return Rest.fail("暂时无法获取站点子站点，请稍后再试!");
             }
         };
     }

device-manager/src/main/java/com/mortals/xhx/busiz/rsp/DeviceInfo.java

@@ -36,5 +36,12 @@ public class DeviceInfo implements Serializable {
      */
     private String productName;
 
+    /**
+     * 设备启用状态 (0.停止，1.启用)
+     */
+    private Integer enabled;
+
+    private Integer source;
+
 
 }

device-manager/src/main/java/com/mortals/xhx/busiz/web/DeviceApiController.java

@@ -5,6 +5,7 @@ import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.alibaba.fastjson.TypeReference;
 import com.mortals.framework.annotation.UnAuth;
+import com.mortals.framework.common.Rest;
 import com.mortals.framework.exception.AppException;
 import com.mortals.framework.service.IAuthTokenService;
 import com.mortals.framework.util.DateUtils;
@@ -20,6 +21,7 @@ import com.mortals.xhx.common.code.*;
 import com.mortals.xhx.common.key.Constant;
 import com.mortals.xhx.common.model.DefaultTbQueueMsgHeaders;
 import com.mortals.xhx.common.model.MessageHeader;
+import com.mortals.xhx.common.pdu.RespData;
 import com.mortals.xhx.common.pdu.site.SitePdu;
 import com.mortals.xhx.common.utils.BeanUtil;
 import com.mortals.xhx.common.utils.DownMsgTask;
@@ -153,6 +155,8 @@ public class DeviceApiController {
             deviceInfo.setSiteName(deviceEntity.getSiteName());
             deviceInfo.setProductId(productEntity.getId());
             deviceInfo.setProductName(productEntity.getProductName());
+            deviceInfo.setEnabled(deviceEntity.getEnabled());
+
             registerResp.setDeviceInfo(deviceInfo);
             String content = EncryptUtil.myEnscrt(JSON.toJSONString(registerResp), 9, DES_STR, ENCRYPT_STR);
             deviceResp.setContent(content);
@@ -160,7 +164,7 @@ public class DeviceApiController {
             deviceEntity.setDeviceStatus(DeviceStatusEnum.在线.getValue());
             deviceService.update(deviceEntity);
             rsp.setData(deviceResp);
-            deviceService.sendThirdParty(deviceEntity,productEntity,platformEntity,DeviceMethodEnum.ONLINE);
+            deviceService.sendThirdParty(deviceEntity, productEntity, platformEntity, DeviceMethodEnum.ONLINE);
         } catch (Exception e) {
             log.error("接收数据失败", e);
             rsp.setCode(ApiRespCodeEnum.FAILED.getValue());
@@ -210,15 +214,6 @@ public class DeviceApiController {
         rsp.setCode(ApiRespCodeEnum.SUCCESS.getValue());
         DeviceInitResp deviceInitResp = new DeviceInitResp();
         try {
-            List<PlatformInfo> platformInfoList = platformService.find(new PlatformEntity()).stream().map(item -> {
-                PlatformInfo platformInfo = new PlatformInfo();
-                platformInfo.setPlatformId(item.getId());
-                platformInfo.setPlatformName(item.getPlatformName());
-                platformInfo.setPlatformSn(item.getPlatformSn());
-                return platformInfo;
-            }).collect(Collectors.toList());
-            deviceInitResp.setPlatformList(platformInfoList);
-            if (ObjectUtils.isEmpty(platformInfoList)) deviceInitResp.setPlatformList(new ArrayList<>());
             List<ProductInfo> productInfoList = productService.find(new ProductEntity()).stream().map(item -> {
                 ProductInfo productInfo = new ProductInfo();
                 BeanUtils.copyProperties(item, productInfo, BeanUtil.getNullPropertyNames(item));
@@ -237,12 +232,11 @@ public class DeviceApiController {
 
             deviceInitResp.setFirmList(firmList);
             if (ObjectUtils.isEmpty(firmList)) deviceInitResp.setFirmList(new ArrayList<>());
-
-            String resp = siteFeign.list(new SitePdu());
-            JSONObject jsonObject = JSONObject.parseObject(resp);
-            if (jsonObject.getInteger("code") == 1) {
-                List<SitePdu> sitePduList = jsonObject.getJSONObject("data").getObject("data", new TypeReference<List<SitePdu>>() {
-                });
+            SitePdu sitePdu = new SitePdu();
+            sitePdu.setSize(-1);
+            Rest<RespData<List<SitePdu>>> resp = siteFeign.list(new SitePdu());
+            if (resp.getCode() == 1) {
+                List<SitePdu> sitePduList = resp.getData().getData();
                 List<SiteInfo> siteInfoList = sitePduList.stream().map(site -> {
                     SiteInfo siteInfo = new SiteInfo();
                     siteInfo.setSiteId(site.getId());
@@ -309,8 +303,6 @@ public class DeviceApiController {
                 deviceEntity.setCreateTime(new Date());
                 deviceEntity.setCreateUserId(1L);
                 deviceService.save(deviceEntity, null);
-
-
             } else {
                 //更新
                 saveOrUpdate(req, platformEntity, productEntity, deviceEntity);
@@ -319,8 +311,8 @@ public class DeviceApiController {
                 deviceService.update(deviceEntity, null);
             }
 
-            deviceService.sendThirdParty(deviceEntity,productEntity,platformEntity,DeviceMethodEnum.ACTIVE);
-            deviceService.sendThirdParty(deviceEntity,productEntity,platformEntity,DeviceMethodEnum.ONLINE);
+            //deviceService.sendThirdParty(deviceEntity, productEntity, platformEntity, DeviceMethodEnum.ACTIVE);
+            //deviceService.sendThirdParty(deviceEntity, productEntity, platformEntity, DeviceMethodEnum.ONLINE);
             DeviceQueueAuthInfo authInfo = new DeviceQueueAuthInfo();
             authInfo.setHost(host);
             authInfo.setPort(port);
@@ -347,6 +339,8 @@ public class DeviceApiController {
             deviceInfo.setSiteName(deviceEntity.getSiteName());
             deviceInfo.setProductId(productEntity.getId());
             deviceInfo.setProductName(productEntity.getProductName());
+            deviceInfo.setEnabled(deviceEntity.getEnabled());
+            deviceInfo.setSource(deviceEntity.getSource());
 
             registerResp.setDeviceInfo(deviceInfo);
             String content = EncryptUtil.myEnscrt(JSON.toJSONString(registerResp), 9, DES_STR, ENCRYPT_STR);
@@ -369,7 +363,6 @@ public class DeviceApiController {
     private void saveOrUpdate(DeviceReq req, PlatformEntity platformEntity, ProductEntity productEntity, DeviceEntity deviceEntity) {
         BeanUtils.copyProperties(req, deviceEntity, BeanUtil.getNullPropertyNames(req));
 
-
         deviceEntity.setPlatformId(platformEntity.getId());
         deviceEntity.setPlatformName(platformEntity.getPlatformName());
 
@@ -385,7 +378,9 @@ public class DeviceApiController {
         deviceEntity.setDeviceCode(req.getDeviceCode());
 
         deviceEntity.setEnabled(YesNoEnum.YES.getValue());
-        deviceEntity.setDeviceStatus(DeviceStatusEnum.离线.getValue());
+        deviceEntity.setDeviceStatus(DeviceStatusEnum.未激活.getValue());
+
+        deviceEntity.setSource(req.getSource());
     }
 
     /**
@@ -402,7 +397,7 @@ public class DeviceApiController {
         rsp.setMsg(ApiRespCodeEnum.SUCCESS.getLabel());
         rsp.setCode(ApiRespCodeEnum.SUCCESS.getValue());
         try {
-            DownMsgTask downMsgTask = new DownMsgTask(list, platformService, productService, deviceService,deviceLogService);
+            DownMsgTask downMsgTask = new DownMsgTask(list, platformService, productService, deviceService, deviceLogService);
             sendTaskThreadPool.execute(downMsgTask);
         } catch (Exception e) {
             log.error("接收数据失败", e);
@@ -525,7 +520,7 @@ public class DeviceApiController {
         }
         PlatformEntity platformEntity = platformService.get(productEntity.getPlatformId());
         if (ObjectUtils.isEmpty(platformEntity)) {
-            throw new AppException(PLATFORM_IS_EMPTY,PLATFORM_IS_EMPTY_CONTENT);
+            throw new AppException(PLATFORM_IS_EMPTY, PLATFORM_IS_EMPTY_CONTENT);
         }
 
         deviceEntity = new DeviceEntity();
@@ -557,17 +552,17 @@ public class DeviceApiController {
         DeviceEntity deviceEntity = deviceService.getExtCache(req.getDeviceCode());
 
         if (ObjectUtils.isEmpty(deviceEntity)) {
-            throw new AppException(DEVICE_CODE_IS_EMPTY,DEVICE_CODE_IS_EMPTY_CONTENT);
+            throw new AppException(DEVICE_CODE_IS_EMPTY, DEVICE_CODE_IS_EMPTY_CONTENT);
         }
 
         ProductEntity productEntity = productService.selectOne(new ProductQuery().productCode(req.getProductCode()));
         if (ObjectUtils.isEmpty(productEntity)) {
-            throw new AppException(PRODUCT_IS_EMPTY,PRODUCT_IS_EMPTY_CONTENT);
+            throw new AppException(PRODUCT_IS_EMPTY, PRODUCT_IS_EMPTY_CONTENT);
         }
 
         PlatformEntity platformEntity = platformService.get(productEntity.getPlatformId());
         if (ObjectUtils.isEmpty(platformEntity)) {
-            throw new AppException(PLATFORM_IS_EMPTY,PLATFORM_IS_EMPTY_CONTENT);
+            throw new AppException(PLATFORM_IS_EMPTY, PLATFORM_IS_EMPTY_CONTENT);
         }
 
         deviceEntity.setDeviceName(req.getDeviceName());
@@ -650,6 +645,7 @@ public class DeviceApiController {
             deviceEntity.setCreateUserId(1L);
             deviceService.getDeviceDao().insert(deviceEntity);
             deviceService.putCache(deviceEntity.getDeviceCode(), deviceEntity);
+            throw new AppException(DEVICE_CONFIG_IS_EMPTY, DEVICE_CONFIG_IS_EMPTY_CONTENT);
 
         }
         return deviceEntity;

device-manager/src/main/java/com/mortals/xhx/common/key/ErrorCode.java

@@ -101,4 +101,8 @@ public interface ErrorCode {
     public static final int SITEID_IS_EMPTY = 1007;
     public static final String SITEID_IS_EMPTY_CONTENT = "站点ID为空！";
 
+
+    public static final int DEVICE_CONFIG_IS_EMPTY = 1008;
+    public static final String DEVICE_CONFIG_IS_EMPTY_CONTENT = "设备创建，请完善设备配置信息！";
+
 }

device-manager/src/main/java/com/mortals/xhx/daemon/task/DeviceTotalStatTaskImpl.java

@@ -3,6 +3,7 @@ package com.mortals.xhx.daemon.task;
 import cn.hutool.core.date.DateUtil;
 import com.alibaba.fastjson.JSONObject;
 import com.alibaba.fastjson.TypeReference;
+import com.mortals.framework.common.Rest;
 import com.mortals.framework.exception.AppException;
 import com.mortals.framework.service.ITask;
 import com.mortals.framework.service.ITaskExcuteService;
@@ -11,6 +12,7 @@ import com.mortals.xhx.common.code.DeviceStatusEnum;
 import com.mortals.xhx.common.code.LogTypeEnum;
 import com.mortals.xhx.common.code.SendStatusEnum;
 import com.mortals.xhx.common.code.YesNoEnum;
+import com.mortals.xhx.common.pdu.RespData;
 import com.mortals.xhx.common.pdu.site.SitePdu;
 import com.mortals.xhx.feign.site.ISiteFeign;
 import com.mortals.xhx.module.alarm.model.AlarmSmsSendEntity;
@@ -100,11 +102,10 @@ public class DeviceTotalStatTaskImpl implements ITaskExcuteService {
             deviceStatEntity.setDeviceAddCount(deviceTotalCount - yesterdayDeviceStat.getDeviceTotalCount());
 
             //站点数量
-            String resp = siteFeign.list(new SitePdu());
-            JSONObject jsonObject = JSONObject.parseObject(resp);
-            if (jsonObject.getInteger("code") == 1) {
-                List<SitePdu> sitePduList = jsonObject.getJSONObject("data").getObject("data", new TypeReference<List<SitePdu>>() {
-                });
+            Rest<RespData<List<SitePdu>>> resp = siteFeign.list(new SitePdu());
+
+            if(resp.getCode()==1) {
+                List<SitePdu> sitePduList = resp.getData().getData();
                 deviceStatEntity.setSiteTotalCount(sitePduList.size());
                 deviceStatEntity.setSiteAddCount(sitePduList.size() - yesterdayDeviceStat.getSiteTotalCount());
             }

device-manager/src/main/java/com/mortals/xhx/module/device/service/impl/DeviceServiceImpl.java

@@ -176,7 +176,8 @@ public class DeviceServiceImpl extends AbstractCRUDCacheServiceImpl<DeviceDao, D
             Set<TopicPartitionInfo> topicPartitionInfos = new HashSet<>();
             topicPartitionInfos.add(topicPartitionInfo);
             mainConsumer.subscribe(topicPartitionInfos);
-            //新增设备通知第三方平台
+            //新增设备通知第三方平台,先新增后激活
+            sendThirdParty(deviceEntity, productEntity, platformEntity, DeviceMethodEnum.ADD);
             sendThirdParty(deviceEntity, productEntity, platformEntity, DeviceMethodEnum.ACTIVE);
         }
 
@@ -210,7 +211,7 @@ public class DeviceServiceImpl extends AbstractCRUDCacheServiceImpl<DeviceDao, D
             registerRabbitQueue(entity, platformEntity, productEntity);
 
             //新增设备通知第三方平台
-            sendThirdParty(entity, productEntity, platformEntity, DeviceMethodEnum.ADD);
+           // sendThirdParty(entity, productEntity, platformEntity, DeviceMethodEnum.ADD);
         } else {
             throw new AppException("产品或平台不存在！");
         }
@@ -251,8 +252,10 @@ public class DeviceServiceImpl extends AbstractCRUDCacheServiceImpl<DeviceDao, D
         if (!ObjectUtils.isEmpty(platformEntity) && !ObjectUtils.isEmpty(productEntity)) {
             //注册rabbmit相关队列与绑定
             registerRabbitQueue(entity, platformEntity, productEntity);
-            //新增设备通知第三方平台
-            sendThirdParty(entity, productEntity, platformEntity, DeviceMethodEnum.UPDATE);
+            //新增设备通知第三方平台 激活后的设备才通知
+            if(entity.getDeviceStatus()>0){
+                sendThirdParty(entity, productEntity, platformEntity, DeviceMethodEnum.UPDATE);
+            }
         }
         super.updateAfter(entity, context);
     }

doc/api.md

@@ -123,6 +123,13 @@ rabbmitInfo|Object|rabbmit相关链接信息|-
 serviceInfo|Object|服务接口连接信息|-
  homeUrl|String|首页|-
  serverUrl|String|前端服务接口地址|-
+deviceInfo|Object|设备基础信息|-
+ siteId|Long|站点ID|-
+ siteCode|String|站点编码|-
+ siteName|String|站点名称|-
+ productId|Long|设备产品类型Id|-
+ productName|String|设备产品类型|-
+ enabled|Integer|设备启用状态 (0.停止，1.启用)|-
 
 
 **响应消息样例:**
@@ -163,10 +170,6 @@ serviceInfo|Object|服务接口连接信息|-
 code|Integer|结果码（-1.失败，1.成功）|-
 msg|String|消息|-
 data|object|数据对象|-
- platformList|array|平台列表|数组
-  platformId|Long|平台id|-
-  platformName|String|名称|-
-  platformSn|String|编码|-
  productList|array|产品列表|数组
   productId|Long|产品id|-
   productName|String|产品名称|-
@@ -191,13 +194,6 @@ data|object|数据对象|-
         "deviceFirmname": "四川新鸿翔"
       }
     ],
-    "platformList": [
-      {
-        "platformId": 1,
-        "platformName": "排号系统",
-        "platformSn": "phxt"
-      }
-    ],
     "productList": [
       {
         "productCode": "pdj",
@@ -377,7 +373,16 @@ rabbmitInfo|Object|rabbmit相关链接信息|-
 serviceInfo|Object|服务接口连接信息|-
  homeUrl|String|首页|-
  serverUrl|String|前端服务接口地址|-
-
+serviceInfo|Object|服务接口连接信息|-
+ homeUrl|String|首页|-
+ serverUrl|String|前端服务接口地址|-
+deviceInfo|Object|设备基础信息|-
+ siteId|Long|站点ID|-
+ siteCode|String|站点编码|-
+ siteName|String|站点名称|-
+ productId|Long|设备产品类型Id|-
+ productName|String|设备产品类型|-
+ enabled|Integer|设备启用状态 (0.停止，1.启用)|-
 
 **响应消息样例:**
 ```
@@ -671,6 +676,7 @@ key|String|消息唯一标识|是|-
 1005|所属平台不存在！请在后台添加后再激活|-
 1006|当前设备所属产品平台未配置，请在后台配置后再激活|-
 1007|站点ID为空|-
+1008|设备已创建，请完善设备配置信息|-
 -1|系统内部异常|-