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

.gitignore

 target/
-/.idea/
+.idea/
 *.iml
 .classpath
 .project
@@ -7,3 +7,69 @@ target/
 .settings
 *.factorypath
 log/
+
+# For Java
+*.lck
+*.json
+logback-test.xml
+
+
+# Compiled class file
+*.class
+
+# Log file
+*.log
+
+# BlueJ files
+*.ctxt
+
+# Mobile Tools for Java (J2ME)
+.mtj.tmp/
+
+# Package Files #
+*.jar
+*.war
+*.nar
+*.ear
+*.zip
+*.tar.gz
+*.rar
+
+# virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml
+hs_err_pid*
+
+# Image snapshot diff
+__diff_output__/
+/jest-stare
+
+.ipr
+.iws
+*~
+~*
+*.diff
+*.patch
+*.bak
+.DS_Store
+Thumbs.db
+.*proj
+.svn/
+*.swp
+*.swo
+*.log.*
+*.json.gzip
+node_modules/
+.buildpath
+dist
+npm-debug.log
+nohup.out
+_site
+_data
+report.html
+/lib
+/es
+elasticsearch-*
+config/base.yaml
+/.vscode/
+/coverage
+/.history
+*.tmp
\ No newline at end of file

amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/resources/mapper/OrgUsrMapper.xml

@@ -119,7 +119,10 @@
             u.amos_org_id amosOrgId,
             u.biz_org_code bizOrgCode,
             u.parent_id parentId,
+            u.person_status personStatus,
             (select biz_org_name from cb_org_usr where sequence_nbr = u.parent_id) as companyName,
+            (SELECT IFNULL(SUM(IF(aqr.SOURCE = 'patrol', 1, 0)), 0) FROM dl_amos_idx_biz.idx_access_qrcode_record aqr WHERE aqr.buss_id = u.sequence_nbr  ) as 'patrol',
+            (SELECT IFNULL(SUM(IF(aqr.SOURCE != 'patrol', 1, 0)), 0) FROM dl_amos_idx_biz.idx_access_qrcode_record aqr WHERE aqr.buss_id = u.sequence_nbr  ) as 'other',
             g.*
             FROM
             cb_org_usr u
@@ -188,6 +191,9 @@
                     #{item}
                 </foreach>
             </if>
+            <if test="map.personStatus != null and map.personStatus != ''">
+                AND u.person_status = #{map.personStatus}
+            </if>
             GROUP BY
             u.sequence_nbr ,
             u.biz_org_name ,

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

@@ -73,4 +73,10 @@ public class EquipTypeImgAmountVO {
     @ApiModelProperty(value = "分类名称/车或者装备")
     private String systemType;
 
+    @ApiModelProperty(value = "状态评估")
+    private String other;
+
+    @ApiModelProperty(value = "日常运维")
+    private String equip;
+
 }

amos-boot-module/amos-boot-module-biz/amos-boot-module-common-biz/src/main/java/com/yeejoin/amos/boot/module/common/biz/controller/OrgUsrController.java

@@ -1104,6 +1104,7 @@ public class OrgUsrController extends BaseController {
 	 * @param
 	 * @return
 	 */
+	@PersonIdentify
 	@TycloudOperation(ApiLevel = UserType.AGENCY)
 	@RequestMapping(value = "/companyUserTreeByUserAndType", method = RequestMethod.GET)
 	@ApiOperation(httpMethod = "GET", value = "根据登陆人获取单位部门用户树", notes = "根据登陆人获取单位部门用户树")

amos-boot-module/amos-boot-module-biz/amos-boot-module-common-biz/src/main/java/com/yeejoin/amos/boot/module/common/biz/service/impl/OrgUsrServiceImpl.java

@@ -614,6 +614,12 @@ public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapp
 			map.put("peopleType", peopleType);
 		}
 
+		String personStatus = "";
+		if(req.containsKey("personStatus")) {
+			personStatus = req.get("personStatus").toString();
+			map.put("personStatus", personStatus);
+		}
+
 		req.remove("pageSize");
 		req.remove("pageNum");
 		req.remove("parentId");
@@ -623,6 +629,7 @@ public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapp
 		req.remove("peopleType");
 		req.remove("bizOrgName");
 		req.remove("fireManagementPost");
+		req.remove("personStatus");
 		map.put("fieldsValue", req);
 		map.put("fields", alertFormServiceImpl.queryListByFormId(OrgPersonEnum.人员.getCode()));
 		pageBean.setTotal(this.baseMapper.selectPersonListCount(map));

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

@@ -556,9 +556,19 @@ public class FireFightingSystemController extends AbstractBaseController {
 
     }
 
+    @PostMapping(value = "/getMonitoringUnitList")
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @ApiOperation(httpMethod = "POST", value = "查询监测部件列表", notes = "查询监测部件列表")
+    public IPage<EquipTypeImgAmountVO> getMonitoringUnitList(@RequestBody EquipTypeAmountPageDTO equipTypeAmountPage) {
+        return equipmentSpecificSerivce.getMonitoringUnitList(equipTypeAmountPage);
+    }
 
-
-
+    @GetMapping(value = "/getMonitoringCount")
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @ApiOperation(httpMethod = "GET", value = "查询监测部件列表", notes = "查询监测部件列表")
+    public List<Map<String, Object>> getMonitoringCount(String bizOrgCode) {
+        return equipmentSpecificSerivce.getMonitoringCount(bizOrgCode);
+    }
 
 
     /**

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

@@ -27,7 +27,7 @@ public class FireResourceSupervisionController extends BaseController {
     private IFireResourceSupervisionService iFireResourceSupervisionService;
 
     @TycloudOperation(ApiLevel = UserType.AGENCY)
-    @ApiOperation(httpMethod = "GET", value = "消防系统、检测部件、消防车辆统计信息查询", notes = "聚合接口: 消防系统、检测部件、消防车辆统计信息查询")
+    @ApiOperation(httpMethod = "GET", value = "消防系统、监测部件、消防车辆统计信息查询", notes = "聚合接口: 消防系统、监测部件、消防车辆统计信息查询")
     @RequestMapping(value = "/stats", method = RequestMethod.GET)
     public ResponseModel<Object> stats() {
         ReginParams reginParams = getSelectedOrgInfo();

amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/mapper/EquipmentSpecificMapper.java

@@ -9,6 +9,7 @@ import com.yeejoin.equipmanage.common.dto.EquipmentSpecificDto;
 import com.yeejoin.equipmanage.common.dto.FireFightingSystemDto;
 import com.yeejoin.equipmanage.common.dto.UserDto;
 import com.yeejoin.equipmanage.common.entity.*;
+import com.yeejoin.equipmanage.common.entity.dto.EquipTypeAmountPageDTO;
 import com.yeejoin.equipmanage.common.entity.dto.EquipmentSpecificDTO;
 import com.yeejoin.equipmanage.common.entity.vo.*;
 import com.yeejoin.equipmanage.common.vo.*;
@@ -290,4 +291,7 @@ public interface EquipmentSpecificMapper extends BaseMapper<EquipmentSpecific> {
 
     List<Map<String, Object>> getListByCode(@Param("code") String code, @Param("bizOrgCode") String bizOrgCode);
 
+    IPage<EquipTypeImgAmountVO> getMonitoringUnitList(@Param("page") IPage page,@Param("equipTypeAmountPage") EquipTypeAmountPageDTO equipTypeAmountPage);
+
+    List<Map<String, Object >> getMonitoringCount(String bizOrgCode);
 }

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

@@ -12,14 +12,11 @@ import com.yeejoin.equipmanage.common.dto.FireFightingSystemDto;
 import com.yeejoin.equipmanage.common.dto.UserDto;
 import com.yeejoin.equipmanage.common.entity.EquipmentSpecific;
 import com.yeejoin.equipmanage.common.entity.EquipmentSpecificIndex;
+import com.yeejoin.equipmanage.common.entity.dto.EquipTypeAmountPageDTO;
 import com.yeejoin.equipmanage.common.entity.dto.EquipmentSpecificDTO;
-import com.yeejoin.equipmanage.common.entity.vo.ComplementCodeVO;
-import com.yeejoin.equipmanage.common.entity.vo.EquipmentSpecificVo;
-import com.yeejoin.equipmanage.common.entity.vo.IotIndexInfoVo;
-import com.yeejoin.equipmanage.common.entity.vo.SourceNameByEquipSpeIdVO;
+import com.yeejoin.equipmanage.common.entity.vo.*;
 import com.yeejoin.equipmanage.common.vo.*;
 import org.typroject.tyboot.core.restful.utils.ResponseModel;
-
 import java.util.Date;
 import java.util.LinkedHashMap;
 import java.util.List;
@@ -288,4 +285,8 @@ public interface IEquipmentSpecificSerivce extends IService<EquipmentSpecific> {
     void updateEquipSpecificStatus(String status, String id);
 
     String updateEquipSpecificStatusByCheckInput( String id);
+
+    IPage<EquipTypeImgAmountVO> getMonitoringUnitList(EquipTypeAmountPageDTO equipTypeAmountPage);
+
+    List<Map<String, Object >> getMonitoringCount(String bizOrgCode);
 }

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

@@ -22,6 +22,7 @@ import com.yeejoin.equipmanage.common.dto.EquipmentSpecificDto;
 import com.yeejoin.equipmanage.common.dto.FireFightingSystemDto;
 import com.yeejoin.equipmanage.common.dto.UserDto;
 import com.yeejoin.equipmanage.common.entity.*;
+import com.yeejoin.equipmanage.common.entity.dto.EquipTypeAmountPageDTO;
 import com.yeejoin.equipmanage.common.entity.dto.EquipmentSpecificDTO;
 import com.yeejoin.equipmanage.common.entity.vo.*;
 import com.yeejoin.equipmanage.common.enums.*;
@@ -36,6 +37,7 @@ 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.S;
 import org.apache.commons.io.IOUtils;
 import org.apache.commons.lang.StringUtils;
 import org.springframework.beans.BeanUtils;
@@ -1967,7 +1969,7 @@ public class EquipmentSpecificSerivceImpl extends ServiceImpl<EquipmentSpecificM
             try {
                 if(e.get("weExpiry") != null) {
                     int year =  Integer.parseInt(e.get("weExpiry").toString());
-                    Date productDate = DateUtils.dateParse(e.get("product").toString(),"yyyy-MM-dd'T'HH:mm");
+                    Date productDate = DateUtils.dateParse(e.get("product").toString(),DateUtils.DATE_TIME_PATTERN);
                     Calendar calendar = Calendar.getInstance();
                     calendar.setTime(productDate);
                     calendar.add(Calendar.YEAR, year);
@@ -2145,4 +2147,13 @@ public class EquipmentSpecificSerivceImpl extends ServiceImpl<EquipmentSpecificM
       return equipmentSpecificMapper.updateEquipSpecificStatusByCheckInput(id);
     }
 
+    @Override
+    public IPage<EquipTypeImgAmountVO> getMonitoringUnitList(EquipTypeAmountPageDTO equipTypeAmountPage) {
+        return equipmentSpecificMapper.getMonitoringUnitList(equipTypeAmountPage.getPage(),equipTypeAmountPage);
+    }
+
+    @Override
+    public List<Map<String, Object >> getMonitoringCount(String bizOrgCode) {
+        return equipmentSpecificMapper.getMonitoringCount(bizOrgCode);
+    }
 }

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

@@ -113,7 +113,7 @@ public class RiskSourceServiceImpl implements IRiskSourceService {
             EquipmentSpecificIndex equipmentSpeIndex = equipmentSpecificIndexMapper.selectOne(queryWrapper);
             equipAlarm.setKey(indexKey);
             equipAlarm.setValue(equipmentSpeIndex.getValue());
-            equipAlarm.setAlarmContent(equipmentSpeIndex.getEquipmentName() + equipmentSpeIndex.getEquipmentIndexName());
+            equipAlarm.setAlarmContent(equipmentSpeIndex.getEquipmentSpecificName() + equipmentSpeIndex.getEquipmentIndexName());
             equipAlarm.setAlarmDate(equipmentSpeIndex.getUpdateDate());
 
 

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

@@ -26,6 +26,34 @@
                     column="id" select="getMenuChildren"/>
     </resultMap>
 
+    <resultMap id="CategoryAmountList" type="com.yeejoin.equipmanage.common.entity.vo.EquipTypeImgAmountVO">
+        <result column="id" property="id"></result>
+        <result column="fullqrCode" property="fullqrCode"></result>
+        <result column="amount" property="amount"></result>
+        <result column="equipmentName" property="equipmentName"></result>
+        <result column="unitName" property="unitName"></result>
+        <result property="qrCode" column="qr_code"></result>
+        <result property="standard" column="standard"></result>
+        <result property="img" column="img"></result>
+        <result property="warehouseStructureName" column="full_name"></result>
+        <result property="systemName" column="systemName"></result>
+        <result property="amount" column="amount"></result>
+        <result property="manufacturerName" column="manufacturerName"></result>
+        <result property="status" column="status"></result>
+        <result property="type" column="type"></result>
+        <result property="code" column="code"></result>
+        <result property="systemType" column="systemType"></result>
+        <result property="iotCode" column="iotCode"></result>
+        <result property="eqtype" column="eqtype"></result>
+        <result property="bizOrgCode" column="bizOrgCode"></result>
+        <result property="equipStatus" column="equipStatus"></result>
+        <result property="bizOrgName" column="bizOrgName"></result>
+        <result property="belongBuildName" column="belongBuildName"></result>
+        <result property="equip" column="equip"></result>
+        <result property="other" column="other"></result>
+
+    </resultMap>
+
     <select id="getEquipmentSpe" resultType="com.yeejoin.equipmanage.common.entity.vo.EquipmentSpecificVo">
         select * from
         (select
@@ -2566,4 +2594,45 @@
             limit 1
     </select>
 
+    <select id="getMonitoringUnitList" resultMap="CategoryAmountList">
+        SELECT
+            wes.id,
+            wes.biz_org_code as bizOrgCode,
+            wes.biz_org_name as bizOrgName,
+            wes.name as equipmentName,
+            wed.equipment_name systemType,
+            wes.equip_status AS equipStatus,
+            (SELECT IFNULL(SUM(IF(aqr.SOURCE = 'equip', 1, 0)), 0) FROM dl_amos_idx_biz.idx_access_qrcode_record aqr WHERE aqr.buss_id = wes.id  ) as 'equip',
+            (SELECT IFNULL(SUM(IF(aqr.SOURCE != 'equip', 1, 0)), 0) FROM dl_amos_idx_biz.idx_access_qrcode_record aqr WHERE aqr.buss_id = wes.id  ) as 'other'
+        FROM
+            wl_equipment_specific wes
+        LEFT JOIN wl_equipment_detail wed ON wed.id = wes.equipment_detail_id
+        <where>
+            <if test="equipTypeAmountPage.bizOrgCode!=null and equipTypeAmountPage.bizOrgCode!=''">
+                AND  wes.biz_org_code LIKE CONCAT(#{equipTypeAmountPage.bizOrgCode},'%')
+            </if>
+            <if test="equipTypeAmountPage.equipStatus!=null and equipTypeAmountPage.equipStatus!=''">
+                And wes.equip_status = #{equipTypeAmountPage.equipStatus}
+            </if>
+            <if test="equipTypeAmountPage.equipmentClassificationCode!=null and equipTypeAmountPage.equipmentClassificationCode!=''">
+                and wed.`code` like concat(#{equipTypeAmountPage.equipmentClassificationCode}, '%')
+            </if>
+        </where>
+        ORDER BY  CONVERT(bizOrgName USING gbk) ASC, equipStatus DESC
+    </select>
+    <select id="getMonitoringCount" resultType="java.util.Map">
+        SELECT
+            wes.id,
+            count(wed.code) AS count,
+            LEFT(wed.code, 8) AS code,
+            wed.equipment_name name
+                FROM
+                    wl_equipment_specific wes
+                    LEFT JOIN wl_equipment_detail wed ON wed.id = wes.equipment_detail_id
+                WHERE
+                    wes.biz_org_code LIKE CONCAT( #{bizOrgCode}, '%' )
+                  AND wed.equipment_name is not null
+                GROUP BY code
+    </select>
+
 </mapper>
\ No newline at end of file

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

@@ -35,6 +35,7 @@
         <result property="iotCode" column="iotCode"></result>
         <result property="eqtype" column="eqtype"></result>
         <result property="bizOrgCode" column="bizOrgCode"></result>
+        <result property="equipStatus" column="equipStatus"></result>
         <result property="bizOrgName" column="bizOrgName"></result>
         <result property="belongBuildName" column="belongBuildName"></result>
 
@@ -1899,6 +1900,7 @@
         wlc.biz_org_code as bizOrgCode,
         wlc.biz_org_name as bizOrgName,
         wlc.longitude,
+        wlc.equip_status as equipStatus,
         wlc.latitude
         FROM
         wl_car wlc
@@ -2039,7 +2041,7 @@
                 and wlsd.warehouse_structure_id is not null
             </if>
             <if test="equipTypeAmountPage.equipStatus!=null and equipTypeAmountPage.equipStatus!=''">
-                and wlsd.equip_status = #{equipTypeAmountPage.equipStatus}
+                and wles.equip_status = #{equipTypeAmountPage.equipStatus}
             </if>
             <if test="equipTypeAmountPage.equipmentName!=null and equipTypeAmountPage.equipmentName!=''">
                 AND wled.name LIKE CONCAT('%',#{equipTypeAmountPage.equipmentName},'%')
@@ -5907,8 +5909,9 @@
             from
             cb_water_resource
             <where>
+                (resource_type = 'industryPool' or resource_type = 'pool')
                 <if test="bizOrgCode != null and bizOrgCode != ''">
-                    biz_org_code like concat(#{bizOrgCode}, '%')
+                   AND biz_org_code like concat(#{bizOrgCode}, '%')
                 </if>
             </where>
             ) AS total,
@@ -5918,6 +5921,7 @@
             cb_water_resource
             <where>
                 water_status = '2'
+                AND (resource_type = 'industryPool' or resource_type = 'pool')
                 <if test="bizOrgCode != null and bizOrgCode != ''">
                     AND biz_org_code like concat(#{bizOrgCode}, '%')
                 </if>
@@ -5929,6 +5933,7 @@
             cb_water_resource
             <where>
                 water_status = '1'
+                AND (resource_type = 'industryPool' or resource_type = 'pool')
                 <if test="bizOrgCode != null and bizOrgCode != ''">
                     AND biz_org_code like concat(#{bizOrgCode}, '%')
                 </if>
@@ -6084,8 +6089,8 @@
             spe.`code`,
             spe.`iot_code` iotCode,
             cate.`name` AS category_name,
-            find_in_set(spe.id,(select  point_in_scene from  wl_source_scene  where source_id=#{systemId}))	 is_bound
-
+            find_in_set(spe.id,(select  point_in_scene from  wl_source_scene  where source_id=#{systemId}))	 is_bound,
+            spe.equip_status equipStatus
         FROM
             wl_equipment_specific AS spe
                 LEFT JOIN wl_equipment_detail AS det ON spe.equipment_detail_id = det.id

amos-boot-system-jcs/src/main/resources/db/changelog/jcs-1.0.0.0.xml

@@ -3906,4 +3906,16 @@
         </sql>
     </changeSet>
 
+    <changeSet author="ltw" id="2023-08-14">
+        <preConditions onFail="MARK_RAN">
+            <not>
+                <columnExists tableName="cb_org_usr" columnName="person_status"/>
+            </not>
+        </preConditions>
+        <comment>cb_org_usr add column</comment>
+        <sql>
+            alter table `cb_org_usr` add column `person_status` varchar(20) NULL DEFAULT '0' COMMENT '人员红黄绿码，0是绿码，1是黄码，2是黄码'
+        </sql>
+    </changeSet>
+
 </databaseChangeLog>