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

amos-boot-module/amos-boot-module-api/amos-boot-module-equip-api/src/main/java/com/yeejoin/equipmanage/common/entity/EquipmentSpecific.java

@@ -173,6 +173,10 @@ public class EquipmentSpecific extends BaseEntity {
     @TableField("warranty_info")
     private String warrantyInfo;
 
+    @ApiModelProperty(value = "指标类型编码")
+    @TableField("type_code")
+    private String typeCode;
+
     @ApiModelProperty(value = "质保周期")
     @TableField("warranty_period")
     @JsonFormat(pattern = "yyyy-MM-dd")

amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/service/impl/EquipmentSpecificSerivceImpl.java

@@ -37,8 +37,6 @@ import com.yeejoin.equipmanage.mapper.*;
 import com.yeejoin.equipmanage.remote.RemoteSecurityService;
 import com.yeejoin.equipmanage.service.*;
 import com.yeejoin.equipmanage.utils.RelationRedisUtil;
-import liquibase.pro.packaged.J;
-import liquibase.pro.packaged.S;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.io.IOUtils;
 import org.apache.commons.lang.StringUtils;
@@ -1726,6 +1724,7 @@ public class EquipmentSpecificSerivceImpl extends ServiceImpl<EquipmentSpecificM
                 es.setRealtimeIotIndexId(index.getEquipmentIndexId());
                 es.setRealtimeIotIndexUpdateDate(index.getUpdateDate());
                 es.setValueLabel(index.getValueLabel());
+                es.setTypeCode(index.getTypeCode());
                 equipmentSpecificMapper.updateById(es);
             }
         }

amos-boot-system-equip/src/main/resources/changelog/wl-3.6.0.xml

@@ -1115,4 +1115,16 @@
             ADD pump_device_name varchar(1500) DEFAULT NULL COMMENT '消防泵装置名称s';
         </sql>
     </changeSet>
+
+    <changeSet author="xxz" id="20240510-1">
+        <preConditions onFail="MARK_RAN">
+            <not>
+                <columnExists tableName="wl_equipment_specific" columnName="type_code"/>
+            </not>
+        </preConditions>
+        <comment>wl_equipment_specific表新增属性字段type_code</comment>
+        <sql>
+            ALTER TABLE `wl_equipment_specific` ADD COLUMN `type_code` VARCHAR (50) NULL COMMENT '指标类型编码';
+        </sql>
+    </changeSet>
 </databaseChangeLog>
\ No newline at end of file

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

@@ -8,6 +8,7 @@
         <if test="systemId != null and systemId !=''">
             and FIND_IN_SET(#{systemId},a.system_ids)
         </if>
+        and date_format(a.`create_date`,'%Y-%m-%d') = date_format(now(),'%Y-%m-%d')
         UNION ALL
         SELECT count(*) num, 'wfggj' as code from wl_equipment_specific_alarm_log a where a.`status` = 1
         and a.biz_org_code like concat(#{bizOrgCode}, '%')
@@ -16,18 +17,21 @@
         </if>
         UNION ALL
         SELECT count(*) num, 'hzgj' as code from wl_equipment_specific_alarm_log  a where a.`type` = 'FIREALARM'
+        and a.`status` = 1
         and a.biz_org_code like concat(#{bizOrgCode}, '%')
         <if test="systemId != null and systemId !=''">
             and FIND_IN_SET(#{systemId},a.system_ids)
         </if>
         UNION ALL
         SELECT count(*) num, 'gzgj' as code from wl_equipment_specific_alarm_log a where a.`type` = 'BREAKDOWN'
+        a.`status` = 1
         and a.biz_org_code like concat(#{bizOrgCode}, '%')
         <if test="systemId != null and systemId !=''">
             and FIND_IN_SET(#{systemId},a.system_ids)
         </if>
         UNION ALL
         SELECT count(*) num, 'pbgj' as code from wl_equipment_specific_alarm_log a  where a.`type` = 'SHIELD'
+        and a.`status` = 1
         and a.biz_org_code like concat(#{bizOrgCode}, '%')
         <if test="systemId != null and systemId !=''">
             and FIND_IN_SET(#{systemId},a.system_ids)