1、隐患bug修改

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

@@ -113,7 +113,7 @@ public class PageParam<K, V> extends HashMap<K, V> implements Pageable {
         if (this.get("current") instanceof String) {
             return Integer.parseInt((String) this.get("current"));
         } else {
-            return (Integer)(this.get("current"));
+            return (Integer)(this.get("current")) <= 0 ? 1 : (Integer)(this.get("current"));
         }
     }
 

amos-boot-module/amos-boot-module-biz/amos-boot-module-latentdanger-biz/src/main/java/com/yeejoin/amos/latentdanger/business/service/impl/LatentDangerServiceImpl.java

@@ -2043,6 +2043,7 @@ public class LatentDangerServiceImpl extends BaseService<LatentDangerBo, LatentD
         if (ValidationUtil.isEmpty(latentDanger)) {
             throw new Exception("隐患不存");
         }
+        latentDangerDto.setDangerPosition(null);
         Bean.copyExistPropertis(latentDangerDto, latentDanger);
         if (!ValidationUtil.isEmpty(latentDangerDto.getPhotoUrl())) {
             latentDanger.setPhotoUrls(Joiner.on(",").join(latentDangerDto.getPhotoUrl()));
@@ -2066,6 +2067,9 @@ public class LatentDangerServiceImpl extends BaseService<LatentDangerBo, LatentD
 
         executeSubmit(executeParam, latentDanger, userId, userName, deptId, deptName, executeSubmitDto, reginParams);
 
+        if (!executeSubmitDto.getIsOk()) {
+            throw new Exception(executeSubmitDto.getMsg());
+        }
         return executeSubmitDto;
     }
 

amos-boot-system-latentdanger/src/main/resources/application-dev.properties

@@ -18,7 +18,8 @@ ribbon.MaxAutoRetriesNextServer = 2
 ribbon.MaxAutoRetries = 1
 
 #DB properties:
-spring.datasource.url = jdbc:mysql://172.16.10.66:3306/safety-business-3.0.1?useUnicode=true&characterEncoding=utf-8&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=Asia/Shanghai
+spring.datasource.url = jdbc:mysql://172.16.6.60:3306/safety-business-3.0\
+  .1?useUnicode=true&characterEncoding=utf-8&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=Asia/Shanghai
 spring.datasource.username= root
 spring.datasource.password= root_123
 spring.datasource.driver-class-name = com.mysql.jdbc.Driver

amos-boot-system-supervision/src/main/resources/application-dev.properties

 #DB properties:
-spring.datasource.url = jdbc:mysql://172.16.11.20:3306/amos-supervision_v1.0?useUnicode=true&characterEncoding=utf-8&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=Asia/Shanghai
+spring.datasource.url = jdbc:mysql://172.16.6.60:3306/amos_supervision_v1\
+  .0?useUnicode=true&characterEncoding=utf-8&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=Asia/Shanghai
 spring.datasource.username= root
 spring.datasource.password= root_123
 ## eureka properties:

amos-boot-system-supervision/src/main/resources/db/mapper/pointMapper.xml

@@ -1168,8 +1168,9 @@
 			LEFT JOIN p_check_input pci ON pci.route_point_item_id = ppi.id
 			LEFT JOIN p_check_shot pcs ON pci.id = pcs.check_input_id
 		WHERE
-			prp.route_id = #{routeId} AND prp.point_id = #{pointId} AND pii.is_delete = 0 AND
-			( pci.input_value is NULL OR pci.input_value <![CDATA[<>]]> 'pass')
+			prp.route_id = #{routeId} AND prp.point_id = #{pointId} AND pii.is_delete = 0
+# 		  AND
+# 			( pci.input_value is NULL OR pci.input_value <![CDATA[<>]]> 'pass')
 			GROUP BY ppi.id
 	</select>