更新

amos-boot-module/amos-boot-module-biz/amos-boot-module-supervision-biz/src/main/java/com/yeejoin/amos/supervision/business/controller/CheckController.java

@@ -618,9 +618,9 @@ public class CheckController extends AbstractBaseController {
     public ResponseModel getPlanExecuteInfo(
             @ApiParam(value = "计划id") @RequestParam(value = "planId") Long planId,
             @ApiParam(value = "点id") @RequestParam(value = "pointId", required = false) Long pointId,
-            @ApiParam(value = "点id") @RequestParam(value = "pointId", required = false) String executeState,
-            @ApiParam(value = "点id") @RequestParam(value = "pointId", required = false) String status,
-            @ApiParam(value = "点id") @RequestParam(value = "pointId", required = false) String teamId,
+            @ApiParam(value = "执行状态") @RequestParam(value = "executeState", required = false) String executeState,
+            @ApiParam(value = "状态") @RequestParam(value = "status", required = false) String status,
+            @ApiParam(value = "单位id") @RequestParam(value = "companyName", required = false) String companyName,
             @ApiParam(value = "当前页") @RequestParam(value = "pageNumber") int pageNumber,
             @ApiParam(value = "页大小") @RequestParam(value = "pageSize") int pageSize) {
         HashMap<String, Object> map = new HashMap<>();
@@ -628,7 +628,7 @@ public class CheckController extends AbstractBaseController {
         map.put("pointId", pointId);
         map.put("executeState", executeState);
         map.put("status", status);
-        map.put("teamId", teamId);
+        map.put("companyName", companyName);
         CommonPageable pageable = new CommonPageable(pageNumber, pageSize);
         return ResponseHelper.buildResponse(checkService.getPlanExecuteInfo(map, pageable));
     }

amos-boot-module/amos-boot-module-biz/amos-boot-module-supervision-biz/src/main/java/com/yeejoin/amos/supervision/business/service/impl/CheckServiceImpl.java

@@ -1156,6 +1156,8 @@ public class CheckServiceImpl implements ICheckService {
         if (total == 0) {
             return new PageImpl<>(content, page, total);
         }
+        ;
+        map.put("status", PlanTaskFinishStatusEnum.getValue(String.valueOf(map.get("status"))));
         map.put("offset", page.getOffset());
         map.put("pageSize", page.getPageSize());
         content = checkMapper.getCheckItems(map);

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

@@ -3,7 +3,7 @@ spring.datasource.url = jdbc:mysql://172.16.11.20:3306/amos-supervision_v1.0?use
 spring.datasource.username= root
 spring.datasource.password= root_123
 ## eureka properties:
-eureka.client.serviceUrl.defaultZone=http://172.16.10.72:10001/eureka/
+eureka.client.serviceUrl.defaultZone=http://172.16.11.20:10001/eureka/
 
 security.password=a1234560
 security.loginId=jc_wjk006
@@ -12,10 +12,10 @@ security.productApp=STUDIO_APP_MOBILE
 security.appKey=studio_normalapp_3168830
 
 #redis 配置
-spring.redis.database=0
-spring.redis.host=172.16.10.85
+spring.redis.database=1
+spring.redis.host=172.16.11.20
 spring.redis.port=6379
-spring.redis.password=amos2019Redis
+spring.redis.password=1234560
 spring.redis.jedis.pool.max-active=200
 spring.redis.jedis.pool.max-wait=-1
 spring.redis.jedis.pool.max-idle=10
@@ -45,9 +45,9 @@ linux.img.path = /
 ## emqx
 emqx.clean-session=true
 emqx.client-id=${spring.application.name}-${random.int[1024,65536]}-1
-emqx.broker=tcp://172.16.10.85:1883
-emqx.user-name=super
-emqx.password=a123456
+emqx.broker=tcp://172.16.11.33:1883
+emqx.user-name=admin
+emqx.password=public
 emqx.max-inflight=1000
 
 file.url=http://39.98.45.134:9000/
\ No newline at end of file

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

@@ -1894,7 +1894,7 @@
         d.date
     </select>
 
-    <select id="getItemCount" resultType="Map">
+    <select id="getItemCount" resultType="long">
         SELECT
             count(1)
         FROM
@@ -1934,17 +1934,17 @@
             pc.id = pci.check_id
             AND pc.plan_task_detail_id = pptd.id
             AND pc.plan_id = #{planId}
-            <if test="pointId != null and pointId != ''">
+            <if test="pointId != null and pointId != '' and pointId != -1">
                 AND pc.point_id = #{pointId}
             </if>
-            <if test="executeState != null and executeState != ''">
-                AND pptd.is_finish = #{executeState}
+            <if test="status != null and status != ''">
+                AND pptd.is_finish = #{status}
             </if>
 <!--            <if test="status != null and status != ''">-->
 <!--                AND pc.point_id = #{status}-->
 <!--            </if>-->
-            <if test="teamId != null and teamId != ''">
-                AND pc.company_id = #{teamId}
+            <if test="companyName != null and companyName != ''">
+                AND pc.company_name = #{company_name}
             </if>
         LIMIT limit #{offset},#{pageSize}
     </select>