隐患流程修改

amos-boot-module/amos-boot-module-api/amos-boot-module-latentdanger-api/src/main/java/com/yeejoin/amos/latentdanger/common/enums/ExecuteTypeEnum.java

+package com.yeejoin.amos.latentdanger.common.enums;
+
+
+/**
+ * @author DELL
+ */
+
+public enum ExecuteTypeEnum {
+
+    /**
+     * 未执行
+     */
+    未执行("未执行", -1),
+    通过("通过", 0),
+    驳回("驳回", 1);
+
+    /**
+     * 名称，描述
+     */
+    private String name;
+    /**
+     * 编码
+     */
+    private Integer code;
+
+
+    ExecuteTypeEnum(String name, Integer code) {
+        this.name = name;
+        this.code = code;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public Integer getCode() {
+        return code;
+    }
+
+    public void setCode(Integer code) {
+        this.code = code;
+    }
+
+    public static ExecuteTypeEnum getByCode(Integer code) {
+        for (ExecuteTypeEnum e : ExecuteTypeEnum.values()) {
+            if (code.equals(e.getCode())) {
+                return e;
+            }
+        }
+        return null;
+    }
+}

amos-boot-module/amos-boot-module-api/amos-boot-module-latentdanger-api/src/main/java/com/yeejoin/amos/latentdanger/common/enums/LatentDangerState.java

 package com.yeejoin.amos.latentdanger.common.enums;
 
+import com.google.common.collect.Lists;
+import com.google.common.collect.Maps;
+
+import java.util.List;
+import java.util.Map;
+
 /**
  * @author DELL
  */
@@ -11,7 +17,9 @@ public interface LatentDangerState {
      * @param code
      * @return
      */
-    LatentDangerState getEnumByCode(String code);
+    static LatentDangerState getEnumByCode(String code) {
+        return null;
+    }
 
     /**
      * 根据code获取枚举名称
@@ -19,7 +27,9 @@ public interface LatentDangerState {
      * @param code
      * @return
      */
-    String getEnumNameByCode(String code);
+    static String getEnumNameByCode(String code) {
+        return null;
+    }
 
     enum SupervisionDangerStateEnum implements LatentDangerState {
         /**
@@ -129,16 +139,7 @@ public interface LatentDangerState {
             this.rejectNext = rejectNext;
         }
 
-        public LatentDangerState getNextEnum() {
-            return getEnumByCode(next);
-        }
-
-        public LatentDangerState getRejectNextEnum() {
-            return getEnumByCode(rejectNext);
-        }
-
-        @Override
-        public LatentDangerState getEnumByCode(String code) {
+        public static SupervisionDangerStateEnum getEnumByCode(String code) {
             for (SupervisionDangerStateEnum _enum : SupervisionDangerStateEnum.values()) {
                 if (code.equals(_enum.getCode())) {
                     return _enum;
@@ -147,8 +148,7 @@ public interface LatentDangerState {
             return null;
         }
 
-        @Override
-        public String getEnumNameByCode(String code) {
+        public static String getEnumNameByCode(String code) {
             String enumName = "";
             for(SupervisionDangerStateEnum type: SupervisionDangerStateEnum.values()) {
                 if (type.getCode().equals(code)) {
@@ -158,6 +158,17 @@ public interface LatentDangerState {
             }
             return enumName;
         }
+
+        public static List<Map<String, String>> getEnumList() {
+            List<Map<String, String>> enumList = Lists.newArrayList();
+            for(SupervisionDangerStateEnum type: SupervisionDangerStateEnum.values()) {
+                Map<String, String> resultMap = Maps.newHashMap();
+                resultMap.put("key", type.getCode());
+                resultMap.put("name", type.getName());
+                enumList.add(resultMap);
+            }
+            return enumList;
+        }
     }
 
     enum PatrolDangerLevelEnum implements LatentDangerState {
@@ -205,7 +216,6 @@ public interface LatentDangerState {
             this.code = code;
         }
 
-        @Override
         public LatentDangerState getEnumByCode(String code) {
             for (PatrolDangerLevelEnum _enum : PatrolDangerLevelEnum.values()) {
                 if (code.equals(_enum.getCode())) {
@@ -215,7 +225,6 @@ public interface LatentDangerState {
             return null;
         }
 
-        @Override
         public String getEnumNameByCode(String code) {
             String enumName = "";
             for(PatrolDangerLevelEnum type: PatrolDangerLevelEnum.values()) {
@@ -226,5 +235,16 @@ public interface LatentDangerState {
             }
             return enumName;
         }
+
+        public static List<Map<String, String>> getEnumList() {
+            List<Map<String, String>> enumList = Lists.newArrayList();
+            for(PatrolDangerLevelEnum type: PatrolDangerLevelEnum.values()) {
+                Map<String, String> resultMap = Maps.newHashMap();
+                resultMap.put("key", type.getCode());
+                resultMap.put("name", type.getName());
+                enumList.add(resultMap);
+            }
+            return enumList;
+        }
     }
 }

amos-boot-module/amos-boot-module-api/amos-boot-module-latentdanger-api/src/main/java/com/yeejoin/amos/latentdanger/dao/entity/LatentDanger.java

@@ -215,5 +215,5 @@ public class LatentDanger extends BasicEntity {
      * 业务信息
      */
     @Column(name = "biz_info")
-    private JSONObject bizInfo;
+    private String bizInfo;
 }

amos-boot-module/amos-boot-module-biz/amos-boot-module-latentdanger-biz/src/main/java/com/yeejoin/amos/latentdanger/business/controller/LatentDangerController.java

@@ -125,8 +125,7 @@ public class LatentDangerController extends BaseController {
     public ResponseModel<LatentDangerDetailVo> detail(@ApiParam(value = "隐患Id", required = true) @RequestParam Long dangerId,
                                                       @ApiParam(value = "是否完成") @RequestParam(required = false) boolean isFinish) throws Exception {
         AgencyUserModel user = getUserInfo();
-        throw new Exception("aaaa");
-//        return iLatentDangerService.detail(dangerId, user.getUserId(), isFinish);
+        return iLatentDangerService.detail(dangerId, user.getUserId(), isFinish);
     }
 
     @ApiOperation(value = "隐患执行记录", notes = "隐患执行记录")
@@ -300,4 +299,11 @@ public class LatentDangerController extends BaseController {
     public ResponseModel<Boolean> delete(@RequestParam String ids) throws Exception {
         return ResponseHelper.buildResponse(iLatentDangerService.delete(ids));
     }
+
+    @ApiOperation(value = "隐患状态列表", notes = "隐患状态列表")
+    @GetMapping(value = "/state")
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    public ResponseModel getDangerState() {
+        return ResponseHelper.buildResponse(iLatentDangerService.getDangerState());
+    }
 }

amos-boot-module/amos-boot-module-biz/amos-boot-module-latentdanger-biz/src/main/java/com/yeejoin/amos/latentdanger/business/param/PageParam.java

@@ -39,17 +39,29 @@ public class PageParam<K, V> extends HashMap<K, V> implements Pageable {
         this.offset = size * current;
     }
 
-    public PageParam(int pageNumber, int size) {
-        this.current = pageNumber;
+    public PageParam(int current, int size) {
+        this.current = current;
         this.size = size;
-        this.offset = size * pageNumber;
+        this.offset = size * current;
     }
 
-    public PageParam(int pageNumber, int size, Sort sort) {
-        this.current = pageNumber;
+    public PageParam(int current, int size, Sort sort) {
+        this.current = current;
         this.size = size;
         this.sort = sort;
-        this.offset = size * pageNumber;
+        this.offset = size * current;
+    }
+
+    public int getCurrent() {
+        return current;
+    }
+
+    public void setCurrent(int current) {
+        this.current = current;
+    }
+
+    public int getSize() {
+        return size;
     }
 
     public void setSize(int size) {

amos-boot-module/amos-boot-module-biz/amos-boot-module-latentdanger-biz/src/main/java/com/yeejoin/amos/latentdanger/business/service/intfc/ILatentDangerService.java

@@ -123,4 +123,11 @@ public interface ILatentDangerService {
      * @return
      */
     Boolean delete(String ids) throws Exception;
+
+    /**
+     * 获取隐患状态
+     *
+     * @return
+     */
+    List<Map<String, String>> getDangerState();
 }

amos-boot-system-latentdanger/src/main/java/com/yeejoin/amos/LatentDangerApplication.java

@@ -69,7 +69,6 @@ public class LatentDangerApplication {
     public static void main(String[] args) throws UnknownHostException {
         logger.info("start Service..........");
         ConfigurableApplicationContext context = SpringApplication.run(LatentDangerApplication.class, args);
-        GlobalExceptionHandler.setAlwaysOk(true);
         Environment env = context.getEnvironment();
         String ip = InetAddress.getLocalHost().getHostAddress();
         String port = env.getProperty("server.port");