添加排除事项

sample-form-manager/src/main/java/com/mortals/xhx/base/framework/interceptor/AuthTokenServiceImpl.java

@@ -78,7 +78,7 @@ public class AuthTokenServiceImpl implements IAuthTokenService {
 
     protected static final Long SECOND_WEEK = 7 * SECOND_DAY;
 
-    private static final Long SECOND_MINUTE_TEN = 1 * SECOND_MINUTE;
+    private static final Long SECOND_MINUTE_TEN = 10 * SECOND_MINUTE;
 
     @Autowired
     private ICacheService cacheService;

sample-form-manager/src/main/java/com/mortals/xhx/base/system/resource/service/impl/ResourceServiceImpl.java

@@ -25,6 +25,7 @@ import com.mortals.xhx.base.system.role.service.RoleAuthService;
 import com.mortals.xhx.common.key.RedisKey;
 import com.mortals.xhx.common.utils.ControllerScanUtil;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Lazy;
 import org.springframework.stereotype.Service;
 import org.springframework.util.ObjectUtils;
 
@@ -49,6 +50,7 @@ public class ResourceServiceImpl extends AbstractCRUDServiceImpl<ResourceDao, Re
     private ICacheService cacheService;
 
     @Autowired
+    @Lazy
     private RoleAuthService roleAuthService;
 
     @Override

sample-form-manager/src/main/java/com/mortals/xhx/base/system/user/service/impl/UserServiceImpl.java

@@ -69,8 +69,8 @@ public class UserServiceImpl extends AbstractCRUDCacheServiceImpl<UserDao, UserE
     @Autowired
     private RoleUserService roleUserService;
 
-    @Lazy
     @Autowired
+    @Lazy
     private IUserFeign userFeign;
 
     @Override

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

@@ -4,6 +4,8 @@ import com.alibaba.fastjson.JSON;
 import com.mortals.framework.annotation.UnAuth;
 import com.mortals.framework.common.Rest;
 import com.mortals.framework.exception.AppException;
+import com.mortals.framework.service.IUser;
+import com.mortals.framework.util.DataUtil;
 import com.mortals.framework.web.BaseCRUDJsonBodyMappingController;
 import com.mortals.xhx.base.system.param.service.ParamService;
 import com.mortals.xhx.common.code.DeviceMethodEnum;
@@ -13,8 +15,10 @@ import com.mortals.xhx.common.pdu.LoginForm;
 import com.mortals.xhx.common.pdu.RespData;
 import com.mortals.xhx.common.pdu.device.DeviceReq;
 import com.mortals.xhx.common.pdu.firm.FirmPdu;
+import com.mortals.xhx.feign.base.pdu.SitePdu;
 import com.mortals.xhx.feign.device.IDeviceFeign;
 import com.mortals.xhx.feign.firm.IFirmFeign;
+import com.mortals.xhx.feign.rsp.ApiResp;
 import com.mortals.xhx.module.device.model.DeviceQuery;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.ObjectUtils;
@@ -34,15 +38,11 @@ import com.mortals.xhx.module.device.service.DeviceService;
 import org.apache.commons.lang3.ArrayUtils;
 import com.mortals.framework.util.StringUtils;
 
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 import java.util.stream.Collectors;
 
 import com.alibaba.fastjson.JSONObject;
 
-import java.util.Arrays;
-
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 
@@ -156,36 +156,11 @@ 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();
-            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();
+        if (!ObjectUtils.isEmpty(entity.getUpdateTime())) {
             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);
@@ -213,13 +188,29 @@ public class DeviceController extends BaseCRUDJsonBodyMappingController<DeviceSe
         }
     }
 
-/*    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;
-    }*/
 
+
+    @PostMapping({"matter/list"})
+    public Rest<Object> list() {
+
+        Rest<Object> ret = new Rest();
+        Map<String, Object> model = new HashMap();
+        String busiDesc = "查询第设备事项列表";
+
+        int code = 1;
+        try {
+
+            model.put("message_info", busiDesc + "成功");
+            this.recordSysLog(this.request, busiDesc + " 【成功】");
+        } catch (Exception e) {
+            code = VALUE_RESULT_FAILURE;
+            this.doException(this.request, busiDesc, model, e);
+        }
+
+        ret.setCode(code);
+        ret.setData(model);
+        ret.setDict(model.get("dict"));
+        ret.setMsg(model.get("message_info") == null ? "" : model.remove("message_info").toString());
+        return ret;
+    }
 }
\ No newline at end of file