Merge remote-tracking branch 'origin/develop_dl_plan6_temp' into develop_dl_plan6_temp

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)
@@ -761,6 +766,7 @@ public class ConfigureController extends AbstractBaseController {
     public ResponseModel iotMonthReportScheduled() {
         String startDate = null;
         String endDate = null;
+        log.info("定时生成 物联报表-月执行开始");
             try {
                 //上月开始时间
                 Date start = DateUtils.minDateOfMonth(new Date());
@@ -791,6 +797,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);
@@ -817,6 +824,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);
@@ -869,6 +877,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-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/service/impl/FireFightingSystemServiceImpl.java

@@ -2171,8 +2171,11 @@ public class FireFightingSystemServiceImpl extends ServiceImpl<FireFightingSyste
         wrapper.eq(FireFightingSystemEntity::getCode, systemCode);
         List<FireFightingSystemEntity> systemEntities = this.list(wrapper);
         if (systemEntities.isEmpty()) {
-            throw new RuntimeException("code" + systemCode + "不存在");
+            // throw new RuntimeException("code" + systemCode + "不存在");
+            map.put("isExist", false);
+            return map;
         }
+        map.put("isExist", true);
         if (systemEntities != null) {
             FireFightingSystemVo fireFightingSystemVo = fireFightingSystemMapper.getFightingSysInfo(systemEntities.get(0).getCode(), systemEntities.get(0).getId());
             map.put("systemStatus", "异常".equals(fireFightingSystemVo.getStatus()) ? false : true);

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

@@ -61,9 +61,9 @@ spring.mqtt.completionTimeout=3000
 
 #定时任务
 ##物联报表定时任务
-jobs.month.cron = 0 5 0 1 * ?
+jobs.month.cron = 0 50 0 1 * ?
 jobs.day.cron = 0 5 0 * * ?
-jobs.week.cron = 0 5 0 ? * 1
+jobs.week.cron = 0 25 0 ? * 1
 jobs.day.cron.old = 0 25 0 * * ?
 
 #数据同步开关
@@ -103,6 +103,9 @@ equipment.plan.pump=92010600,92030600,92130400,92140200,92150300
 #iot.code.prefix.have.used=20210003,20210004,20210005
 # 电力使用
 iot.code.prefix.have.used=
+#装备服务在接收到站端iot推送的装备数据后进行influxdb存库
+#1.在装备接口消息处向influxdb/{productKey}/{deviceName} 消息地址推送数据，iot负责存库
+#2.配置文件添加配置项开关，默认为关闭，该功能只使用于中心及系统
 #是否向iot推送消息
 isSendIot=false
 

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

@@ -4057,7 +4057,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
 
 
@@ -4117,7 +4117,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
@@ -4461,7 +4461,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

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

@@ -58,7 +58,7 @@
         </if>
 
         group by wlv.id
-        order by wlv.create_date desc, v.id desc
+        order by wlv.create_date desc, wlv.id desc
     </select>
     <!--    SELECT
         v.id AS id,