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-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-equip-biz/src/main/java/com/yeejoin/equipmanage/controller/FireFightingSystemController.java

@@ -556,9 +556,12 @@ 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);
+    }
 
 
     /**

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,5 @@ 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);
 }

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,6 @@ public interface IEquipmentSpecificSerivce extends IService<EquipmentSpecific> {
     void updateEquipSpecificStatus(String status, String id);
 
     String updateEquipSpecificStatusByCheckInput( String id);
+
+    IPage<EquipTypeImgAmountVO> getMonitoringUnitList(EquipTypeAmountPageDTO equipTypeAmountPage);
 }

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.*;
@@ -2145,4 +2146,8 @@ public class EquipmentSpecificSerivceImpl extends ServiceImpl<EquipmentSpecificM
       return equipmentSpecificMapper.updateEquipSpecificStatusByCheckInput(id);
     }
 
+    @Override
+    public IPage<EquipTypeImgAmountVO> getMonitoringUnitList(EquipTypeAmountPageDTO equipTypeAmountPage) {
+        return equipmentSpecificMapper.getMonitoringUnitList(equipTypeAmountPage.getPage(),equipTypeAmountPage);
+    }
 }

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,33 @@
             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,
+            IFNULL(IFNULL(SUM(IF(aqr.source='equip',1,0)),0),0) as 'equip',
+            IFNULL(count(aqr.sequence_nbr) - IFNULL(SUM(IF(aqr.source='equip',1,0)),0),0) as 'other'
+        FROM
+            wl_equipment_specific wes
+        LEFT JOIN wl_equipment_detail wed ON wed.id = wes.equipment_detail_id
+        LEFT JOIN dl_amos_idx_biz.idx_access_qrcode_record  aqr on aqr.buss_id = wes.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 wlc.equip_status = #{equipTypeAmountPage.equipStatus}
+            </if>
+            <if test="equipTypeAmountPage.equipmentClassificationCode!=null and equipTypeAmountPage.equipmentClassificationCode!=''">
+                and wed.`code` like concat(#{equipTypeAmountPage.equipmentClassificationCode}, '%')
+            </if>
+             and wes.id = aqr.buss_id
+        </where>
+        ORDER BY  CONVERT(bizOrgName USING gbk) ASC, equipStatus DESC
+    </select>
+
 </mapper>
\ No newline at end of file