Merge branch 'master' of http://gitlab.scsmile.cn/zxf/sample-form-platform

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

@@ -58,7 +58,7 @@ public class DeviceServiceImpl extends AbstractCRUDCacheServiceImpl<DeviceDao, D
         deviceEntity.setDeviceStatus(DeviceStatusEnum.离线.getValue());
         deviceEntity.setEnabled(EnabledEnum.启用.getValue());
         this.getDao().update(deviceEntity);
-
+        this.putCache(deviceEntity.getId().toString(), deviceEntity);
         String token = getToken();
         DeviceReq deviceReq = new DeviceReq();
         deviceReq.setReceiveMethod(DeviceMethodEnum.ACTIVE.getValue());
@@ -75,6 +75,7 @@ public class DeviceServiceImpl extends AbstractCRUDCacheServiceImpl<DeviceDao, D
         deviceEntity.setUpdateTime(new Date());
         deviceEntity.setUpdateUserId(getContextUserId(context));
         this.getDao().update(deviceEntity);
+        this.putCache(deviceEntity.getId().toString(), deviceEntity);
         String token = getToken();
         DeviceReq deviceReq = new DeviceReq();
         deviceReq.setReceiveMethod(DeviceMethodEnum.ENABLED.getValue());

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

@@ -157,7 +157,7 @@ public class DeviceController extends BaseCRUDJsonBodyMappingController<DeviceSe
     @Override
     protected int saveAfter(DeviceEntity entity, Map<String, Object> model, Context context) throws AppException {
         if (ObjectUtils.isEmpty(entity.getUpdateTime())) {
-            String token = getToken();
+/*            String token = getToken();
             DeviceReq deviceReq = new DeviceReq();
             deviceReq.setReceiveMethod(DeviceMethodEnum.ADD.getValue());
             deviceReq.setDeviceName(entity.getDeviceName());
@@ -173,19 +173,19 @@ public class DeviceController extends BaseCRUDJsonBodyMappingController<DeviceSe
             deviceReq.setSource(1);
             deviceReq.setDeviceStatus(entity.getDeviceStatus());
             Rest<String> rest = deviceFeign.deviceCall(deviceReq, token);
-            log.info("添加结果：{}", JSON.toJSONString(rest));
+            log.info("添加结果：{}", JSON.toJSONString(rest));*/
         } else {
             String token = getToken();
             DeviceReq deviceReq = new DeviceReq();
             deviceReq.setReceiveMethod(DeviceMethodEnum.UPDATE.getValue());
-            deviceReq.setDeviceName(entity.getDeviceName());
+/*            deviceReq.setDeviceName(entity.getDeviceName());
             deviceReq.setDeviceCode(entity.getDeviceCode());
-            deviceReq.setProductCode(entity.getProductCode());
+            deviceReq.setProductCode(entity.getProductCode());*/
             deviceReq.setIp(entity.getIp());
             deviceReq.setPort(entity.getPort());
-            deviceReq.setSiteId(1L);
+/*            deviceReq.setSiteId(1L);
             deviceReq.setSiteCode("511500000000-0001");
-            deviceReq.setSiteName("宜宾市民中心");
+            deviceReq.setSiteName("宜宾市民中心");*/
             deviceReq.setLeadingOfficial(entity.getLeadingOfficial());
             deviceReq.setLeadingOfficialTelephone(entity.getLeadingOfficialTelephone());
             deviceReq.setSource(1);