修改同步用户

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

@@ -2,8 +2,10 @@ package com.mortals.xhx.module.device.service.impl;
 
 import com.alibaba.fastjson.JSON;
 import com.mortals.framework.common.Rest;
+import com.mortals.xhx.common.code.DeviceMethodEnum;
 import com.mortals.xhx.common.code.DeviceStatusEnum;
 import com.mortals.xhx.common.code.EnabledEnum;
+import com.mortals.xhx.common.code.MeetStatusEnum;
 import com.mortals.xhx.common.pdu.LoginForm;
 import com.mortals.xhx.common.pdu.device.DeviceReq;
 import com.mortals.xhx.feign.device.IDeviceFeign;
@@ -52,48 +54,12 @@ public class DeviceServiceImpl extends AbstractCRUDServiceImpl<DeviceDao, Device
     @Override
     protected void saveAfter(DeviceEntity entity, Context context) throws AppException {
         super.saveAfter(entity, context);
-        //todo 通知设备管理系统
-        String token = getToken();
-        DeviceReq deviceReq = new DeviceReq();
-        deviceReq.setReceiveMethod(1);
-        deviceReq.setDeviceName(entity.getDeviceName());
-        deviceReq.setDeviceCode(entity.getDeviceCode());
-        deviceReq.setProductCode(entity.getProductCode());
-        deviceReq.setIp(entity.getIp());
-        deviceReq.setPort(entity.getPort());
-        deviceReq.setSiteId(1L);
-        deviceReq.setSiteCode("511500000000-0001");
-        deviceReq.setSiteName("宜宾市民中心");
-        deviceReq.setLeadingOfficial(entity.getLeadingOfficial());
-        deviceReq.setLeadingOfficialTelephone(entity.getLeadingOfficialTelephone());
-        deviceReq.setSource(1);
-        deviceReq.setDeviceStatus(entity.getDeviceStatus());
-        Rest<String> rest = deviceFeign.deviceCall(deviceReq, token);
-        log.info("添加结果：{}", JSON.toJSONString(rest));
     }
 
 
     @Override
     protected void updateAfter(DeviceEntity entity, Context context) throws AppException {
         super.updateAfter(entity, context);
-        //todo 通知设备管理系统
-        String token = getToken();
-        DeviceReq deviceReq = new DeviceReq();
-        deviceReq.setReceiveMethod(2);
-        deviceReq.setDeviceName(entity.getDeviceName());
-        deviceReq.setDeviceCode(entity.getDeviceCode());
-        deviceReq.setProductCode(entity.getProductCode());
-        deviceReq.setIp(entity.getIp());
-        deviceReq.setPort(entity.getPort());
-        deviceReq.setSiteId(1L);
-        deviceReq.setSiteCode("511500000000-0001");
-        deviceReq.setSiteName("宜宾市民中心");
-        deviceReq.setLeadingOfficial(entity.getLeadingOfficial());
-        deviceReq.setLeadingOfficialTelephone(entity.getLeadingOfficialTelephone());
-        deviceReq.setSource(1);
-        deviceReq.setDeviceStatus(entity.getDeviceStatus());
-        Rest<String> rest = deviceFeign.deviceCall(deviceReq, token);
-        log.info("更新结果：{}", JSON.toJSONString(rest));
     }
 
     @Override
@@ -108,7 +74,7 @@ public class DeviceServiceImpl extends AbstractCRUDServiceImpl<DeviceDao, Device
 
         String token = getToken();
         DeviceReq deviceReq = new DeviceReq();
-        deviceReq.setReceiveMethod(4);
+        deviceReq.setReceiveMethod(DeviceMethodEnum.ACTIVE.getValue());
         deviceReq.setDeviceCode(deviceCode);
         Rest<String> rest = deviceFeign.deviceCall(deviceReq, token);
         log.info("激活结果：{}", JSON.toJSONString(rest));
@@ -124,26 +90,12 @@ public class DeviceServiceImpl extends AbstractCRUDServiceImpl<DeviceDao, Device
         this.getDao().update(deviceEntity);
         String token = getToken();
         DeviceReq deviceReq = new DeviceReq();
-        deviceReq.setReceiveMethod(5);
+        deviceReq.setReceiveMethod(DeviceMethodEnum.ENABLED.getValue());
         deviceReq.setDeviceCode(deviceEntity.getDeviceCode());
         Rest<String> rest = deviceFeign.deviceCall(deviceReq, token);
-        log.info("激活结果：{}", JSON.toJSONString(rest));
-    }
-
-    @Override
-    protected void removeBefore(Long[] ids, Context context) throws AppException {
-        super.removeBefore(ids, context);
-        String token = getToken();
-        List<DeviceEntity> deviceEntities = this.get(ids, context);
-        for (DeviceEntity entity : deviceEntities) {
-            DeviceReq deviceReq = new DeviceReq();
-            deviceReq.setReceiveMethod(3);
-            deviceReq.setDeviceCode(entity.getDeviceCode());
-            Rest<String> rest = deviceFeign.deviceCall(deviceReq, token);
-            log.info("删除结果：{}", JSON.toJSONString(rest));
+        log.info("启用结果：{}", JSON.toJSONString(rest));
     }
 
-    }
 
     private String getToken() {
         LoginForm loginForm = new LoginForm();

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

 package com.mortals.xhx.module.device.web;
+import com.alibaba.fastjson.JSON;
 import com.mortals.framework.common.Rest;
+import com.mortals.framework.exception.AppException;
 import com.mortals.framework.web.BaseCRUDJsonBodyMappingController;
 import com.mortals.xhx.base.system.param.service.ParamService;
+import com.mortals.xhx.common.code.DeviceMethodEnum;
 import com.mortals.xhx.common.code.EnabledEnum;
+import com.mortals.xhx.common.pdu.LoginForm;
+import com.mortals.xhx.common.pdu.device.DeviceReq;
+import com.mortals.xhx.feign.device.IDeviceFeign;
 import com.mortals.xhx.module.device.model.DeviceQuery;
 import com.mortals.xhx.module.room.model.RoomQuery;
 import com.mortals.xhx.module.room.service.RoomService;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.ObjectUtils;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 import org.springframework.web.bind.annotation.*;
@@ -45,6 +52,13 @@ public class DeviceController extends BaseCRUDJsonBodyMappingController<DeviceSe
     @Autowired
     private RoomService roomService;
 
+    @Autowired
+    private IDeviceFeign deviceFeign;
+    @Value("${token.loginName:'admin'}")
+    private String loginName;
+    @Value("${token.password:'admin'}")
+    private String password;
+
     public DeviceController(){
         super.setModuleDesc( "设备管理");
     }
@@ -109,6 +123,73 @@ public class DeviceController extends BaseCRUDJsonBodyMappingController<DeviceSe
         return jsonObject.toJSONString();
     }
 
+    @Override
+    protected int saveAfter(DeviceEntity entity, Map<String, Object> model, Context context) throws AppException {
+        if(ObjectUtils.isEmpty(entity.getUpdateTime())){
+            String token = getToken();
+            DeviceReq deviceReq = new DeviceReq();
+            deviceReq.setReceiveMethod(DeviceMethodEnum.ADD.getValue());
+            deviceReq.setDeviceName(entity.getDeviceName());
+            deviceReq.setDeviceCode(entity.getDeviceCode());
+            deviceReq.setProductCode(entity.getProductCode());
+            deviceReq.setIp(entity.getIp());
+            deviceReq.setPort(entity.getPort());
+            deviceReq.setSiteId(1L);
+            deviceReq.setSiteCode("511500000000-0001");
+            deviceReq.setSiteName("宜宾市民中心");
+            deviceReq.setLeadingOfficial(entity.getLeadingOfficial());
+            deviceReq.setLeadingOfficialTelephone(entity.getLeadingOfficialTelephone());
+            deviceReq.setSource(1);
+            deviceReq.setDeviceStatus(entity.getDeviceStatus());
+            Rest<String> rest = deviceFeign.deviceCall(deviceReq, token);
+            log.info("添加结果：{}", JSON.toJSONString(rest));
+        }else{
+            String token = getToken();
+            DeviceReq deviceReq = new DeviceReq();
+            deviceReq.setReceiveMethod(DeviceMethodEnum.UPDATE.getValue());
+            deviceReq.setDeviceName(entity.getDeviceName());
+            deviceReq.setDeviceCode(entity.getDeviceCode());
+            deviceReq.setProductCode(entity.getProductCode());
+            deviceReq.setIp(entity.getIp());
+            deviceReq.setPort(entity.getPort());
+            deviceReq.setSiteId(1L);
+            deviceReq.setSiteCode("511500000000-0001");
+            deviceReq.setSiteName("宜宾市民中心");
+            deviceReq.setLeadingOfficial(entity.getLeadingOfficial());
+            deviceReq.setLeadingOfficialTelephone(entity.getLeadingOfficialTelephone());
+            deviceReq.setSource(1);
+            deviceReq.setDeviceStatus(entity.getDeviceStatus());
+            Rest<String> rest = deviceFeign.deviceCall(deviceReq, token);
+            log.info("更新结果：{}", JSON.toJSONString(rest));
+        }
 
+        return super.saveAfter(entity, model, context);
+    }
 
+    @Override
+    protected void deleteBefore(Long[] ids, Context context) throws AppException {
+        super.deleteBefore(ids, context);
+        String token = getToken();
+        DeviceQuery deviceQuery = new DeviceQuery();
+        deviceQuery.setIdList(Arrays.asList(ids));
+        List<DeviceEntity> deviceEntities = this.service.find(deviceQuery, context);
+        for (DeviceEntity entity : deviceEntities) {
+            DeviceReq deviceReq = new DeviceReq();
+            deviceReq.setReceiveMethod(DeviceMethodEnum.DEL.getValue());
+            deviceReq.setDeviceCode(entity.getDeviceCode());
+            Rest<String> rest = deviceFeign.deviceCall(deviceReq, token);
+            log.info("删除结果：{}", JSON.toJSONString(rest));
+        }
+
+
+    }
+
+    private String getToken() {
+        LoginForm loginForm = new LoginForm();
+        loginForm.setLoginName(loginName);
+        loginForm.setPassword(password);
+        Rest<String> rest = deviceFeign.getToken(loginForm);
+        String token = rest.getData();
+        return token;
+    }
 }
\ No newline at end of file