修改设备新增等

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

@@ -327,6 +327,7 @@ public class DeviceApiController {
         deviceEntity.setDeviceRemark(req.getDeviceRemark());
         deviceEntity.setCreateUserId(1L);
         deviceEntity.setCreateTime(new Date());
+        deviceEntity.setSwitchSend(false);
         deviceService.save(deviceEntity);
 
     }
@@ -372,6 +373,7 @@ public class DeviceApiController {
         deviceEntity.setDeviceRemark(req.getDeviceRemark());
         deviceEntity.setUpdateUserId(1L);
         deviceEntity.setUpdateTime(new Date());
+        deviceEntity.setSwitchSend(false);
         deviceService.save(deviceEntity);
 
     }
@@ -394,6 +396,7 @@ public class DeviceApiController {
         deviceEntity.setActive(ActiveEnum.已激活.getValue());
         deviceEntity.setUpdateTime(new Date());
         deviceEntity.setUpdateUserId(1L);
+        deviceEntity.setSwitchSend(false);
         deviceService.update(deviceEntity);
 
     }
@@ -405,6 +408,7 @@ public class DeviceApiController {
         deviceEntity.setActive(YesNoEnum.YES.getValue());
         deviceEntity.setUpdateTime(new Date());
         deviceEntity.setUpdateUserId(1L);
+        deviceEntity.setSwitchSend(false);
         deviceService.update(deviceEntity);
     }
 
@@ -414,6 +418,7 @@ public class DeviceApiController {
         deviceEntity.setActive(YesNoEnum.YES.getValue());
         deviceEntity.setUpdateTime(new Date());
         deviceEntity.setUpdateUserId(1L);
+        deviceEntity.setSwitchSend(false);
         deviceService.update(deviceEntity);
     }
 

device-manager/src/main/java/com/mortals/xhx/module/device/model/vo/DeviceVo.java

@@ -31,4 +31,9 @@ public class DeviceVo extends BaseEntityLong {
      */
     private Long expireTime;
 
+    /**
+     * 是否通知第三方
+     */
+    private Boolean switchSend=true;
+
 }
\ No newline at end of file

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

@@ -182,7 +182,9 @@ public class DeviceServiceImpl extends AbstractCRUDCacheServiceImpl<DeviceDao, D
         deviceReq.setReceiveMethod(update.getValue());
         deviceReq.setProductCode(productEntity.getProductCode());
         deviceReq.setPlatformCode(platformEntity.getPlatformSn());
-        if (!ObjectUtils.isEmpty(platformEntity.getSendUrl()) && platformEntity.getSendSwitch() == SendSwitchEnum.启用.getValue()) {
+        if (!ObjectUtils.isEmpty(platformEntity.getSendUrl())
+                && platformEntity.getSendSwitch() == SendSwitchEnum.启用.getValue()
+                &&entity.getSwitchSend()) {
             if (PatternPool.URL_HTTP.matcher(platformEntity.getSendUrl()).find()) {
                 ApiResp<String> resp = messageService.sendThirdParty(platformEntity.getSendUrl(), deviceReq);
             } else {

device-manager/src/main/java/com/mortals/xhx/module/device/web/DeviceController.java

@@ -166,12 +166,10 @@ public class DeviceController extends BaseCRUDJsonMappingController<DeviceServic
     }
 
     @Override
-    protected int saveAfter(HttpServletRequest request, HttpServletResponse response, DeviceForm form, Map<String, Object> model, Context context) throws AppException {
-        return super.saveAfter(request, response, form, model, context);
+    protected void saveBefore(HttpServletRequest request, HttpServletResponse response, DeviceForm form, Map<String, Object> model, Context context) throws AppException {
+        super.saveBefore(request, response, form, model, context);
     }
 
-
-
     /**
      * 设备激活
      */

device-manager/src/test/java/com/mortals/httpclient/device/DeviceController.http

@@ -92,13 +92,14 @@ Content-Type: application/json
 {
   "receiveMethod": 1,
   "deviceName": "测试接口创建设备3",
-  "deviceCode": "A1:12:23:12:23:1123",
+  "deviceCode": "A1:12:23:12:23:1124",
   "siteId": 123,
   "siteCode": "adfasfdasfdasf",
   "siteName": "测试站点",
   "platformCode": "phxt",
   "productCode": "pdj",
-  "deviceRemark": "车是是是打发斯蒂芬"
+  "deviceRemark": "车是是是打发斯蒂芬",
+  "homeUrl": "http://www.baidu.com"
 }