追加物联报表定时任务日志

amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/controller/ConfigureController.java

@@ -5,6 +5,7 @@ import com.alibaba.fastjson.JSONArray;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.yeejoin.amos.boot.biz.common.bo.ReginParams;
+import com.yeejoin.amos.boot.biz.common.rule.action.MessageAction;
 import com.yeejoin.equipmanage.common.dto.AnalysisReportLogDto;
 import com.yeejoin.equipmanage.common.utils.*;
 import com.yeejoin.equipmanage.config.PersonIdentify;
@@ -17,6 +18,8 @@ import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
 import org.apache.commons.lang3.StringUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.http.MediaType;
@@ -67,6 +70,8 @@ public class ConfigureController extends AbstractBaseController {
     @Autowired
     IAnalysisReportLogService iAnalysisReportLogService;
 
+    public static final Logger log = LoggerFactory.getLogger(ConfigureController.class);
+
     @PersonIdentify
     @RequestMapping(value = "/alarmLogPage", method = RequestMethod.GET)
     @TycloudOperation(ApiLevel = UserType.AGENCY)
@@ -759,6 +764,7 @@ public class ConfigureController extends AbstractBaseController {
     public ResponseModel iotMonthReportScheduled() {
         String startDate = null;
         String endDate = null;
+        log.info("定时生成 物联报表-月执行开始");
             try {
                 //上月开始时间
                 Date start = DateUtils.minDateOfMonth(new Date());
@@ -789,6 +795,7 @@ public class ConfigureController extends AbstractBaseController {
     public ResponseModel iotWeekReportScheduled() {
         String startDate = null;
         String endDate = null;
+        log.info("定时生成 物联报表-周执行开始");
         try {
             Date start = DateUtils.getBeginDayOfWeek();
             start = DateUtils.dateAddDays(start,-7);
@@ -815,6 +822,7 @@ public class ConfigureController extends AbstractBaseController {
     public ResponseModel iotDayReportScheduled() {
         String startDate = null;
         String endDate = null;
+        log.info("定时生成 物联报表-日执行开始");
         try {
             Date start = DateUtils.getCurrentDayStartTime(new Date());
             start = DateUtils.dateAddDays(start,-1);
@@ -867,6 +875,7 @@ public class ConfigureController extends AbstractBaseController {
         page.setSize(20L);
         page.setCurrent(1L);
         List<Integer> reportTypes = Arrays.asList(1, 2, 3);
+        log.info("物联报表历史数据处理执行开始");
         reportTypes.forEach(reportType->{
             AnalysisReportLogDto dto = new AnalysisReportLogDto();
             dto.setReportType(reportType);

amos-boot-system-equip/src/main/resources/mapper/FireFightingSystemMapper.xml

@@ -4058,7 +4058,7 @@
           LEFT JOIN wl_equipment_detail detail ON spec.equipment_detail_id = detail.id
           LEFT JOIN wl_equipment equipment ON equipment.id =detail.equipment_id
           left join f_fire_fighting_system s on FIND_IN_SET(s.id,spec.system_id)
-        where spec.system_id = #{systemId} AND equipment.is_iot = 1
+        where  FIND_IN_SET( #{systemId},spec.system_id) AND equipment.is_iot = 1
           GROUP BY code,s.id, name ORDER BY system_id, code ) a) as  a1
 
 
@@ -4118,7 +4118,7 @@
 
           join f_fire_fighting_system s on FIND_IN_SET(s.id,spec.system_id)
 
-         WHERE s.id = #{systemId}
+         WHERE FIND_IN_SET( #{systemId},spec.system_id)
 
         GROUP BY systemId,code,type_code
         )temp LEFT JOIN wl_equipment_index wei on temp.equipment_index_id = wei.id
@@ -4462,7 +4462,8 @@
         LEFT JOIN wl_equipment_detail detail ON spec.equipment_detail_id = detail.id
         LEFT JOIN wl_equipment equipment ON equipment.id =detail.equipment_id
         left join f_fire_fighting_system s on FIND_IN_SET(s.id,spec.system_id)
-        where spec.system_id = #{systemId} AND equipment.is_iot = 1
+        where
+        FIND_IN_SET(#{systemId},spec.system_id) AND equipment.is_iot = 1
         GROUP BY code,s.id, name ORDER BY system_id, code ) a) as  a1
         GROUP BY a1.system_id
         ) as b