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

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

@@ -1555,14 +1555,13 @@
         FROM
         (
         SELECT DISTINCT
-        u.sequence_nbr AS sequenceNbr,
-        u.person_status AS personStatus,
-        cf.biz_org_Name AS bizOrgName,
-        cf.`name` AS `name`,
-        g.*
+            u.sequence_nbr AS sequenceNbr,
+            u.person_status AS personStatus,
+            u.parent_name AS bizOrgName,
+            u.`biz_org_name` AS `name`,
+            g.*
         FROM
-        cb_org_usr u
-        LEFT JOIN cb_firefighters cf ON cf.org_usr_id = u.sequence_nbr
+            cb_org_usr u
         LEFT JOIN (
         SELECT
         v.`instance_id`,
@@ -1581,7 +1580,7 @@
         ) g ON u.sequence_nbr = g.instance_id
         WHERE
         u.biz_org_type = 'person'
-        AND g.peopleType IN ('1601', '1602', '1603')
+        AND g.peopleType IN ('1601', '1602', '1603', '1604')
         AND u.is_delete = 0
         <if test="map.bizOrgCode != null and map.bizOrgCode != ''">
             AND  u.biz_org_code LIKE CONCAT(#{map.bizOrgCode}, '%')
@@ -1616,14 +1615,13 @@
         FROM
             (
                 SELECT DISTINCT
-                    u.sequence_nbr AS sequenceNbr,
-                    u.person_status AS personStatus,
-                    cf.biz_org_Name AS bizOrgName,
-                    cf.`name` AS `name`,
-                    g.*
+                u.sequence_nbr AS sequenceNbr,
+                u.person_status AS personStatus,
+                u.parent_name AS bizOrgName,
+                u.`biz_org_name` AS `name`,
+                g.*
                 FROM
                     cb_org_usr u
-                        LEFT JOIN cb_firefighters cf ON cf.org_usr_id = u.sequence_nbr
                         LEFT JOIN (
                         SELECT
                             v.`instance_id`,
@@ -1642,9 +1640,8 @@
                     ) g ON u.sequence_nbr = g.instance_id
                 WHERE
                     u.biz_org_type = 'person'
-                  AND g.peopleType IN ('1601', '1602', '1603')
+                  AND g.peopleType IN ('1601', '1602', '1603', '1604')
                   AND u.is_delete = 0
-                  AND cf.biz_org_name is not null
                 <if test="map.bizOrgCode != null and map.bizOrgCode != ''">
                     AND  u.biz_org_code LIKE CONCAT(#{map.bizOrgCode}, '%')
                 </if>

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

@@ -45,7 +45,7 @@ public class EquipmentSpecific extends BaseEntity {
 
     @ApiModelProperty(value = "批量录入数量")
     @TableField(exist = false)
-    private Integer num;
+    private Float num;
 
     @ApiModelProperty(value = "单位编码")
     @TableField("org_code")

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

@@ -197,7 +197,7 @@ public class EquipmentDetailController extends AbstractBaseController {
         controllerProxy.refreshCount(vo.getBizOrgCode());
         WlSpareEquipment spareEquipment = equipmentDate.getSpareEquipment();
         if (ObjectUtil.isNotEmpty(spareEquipment) && ObjectUtil.isNotEmpty(spareEquipment.getId())) {
-            wlSpareEquipmentService.subtractNum(spareEquipment.getId(), Float.valueOf(vo.getNum()));
+            wlSpareEquipmentService.subtractNum(spareEquipment.getId(), vo.getNum());
         }
         return date;
     }

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

@@ -511,7 +511,7 @@ public class SupervisionConfigureController extends AbstractBaseController {
             }
         }
         // 稳压泵信息
-        List<Map<String, Object>> pressurePumps = fireFightingSystemMapper.selectAllPressurePumpInfo(bizOrgCode);
+        List<Map<String, Object>> pressurePumps = fireFightingSystemMapper.selectAllPressurePumpInfo(bizOrgCode, null);
         ArrayList<Map<String, Object>> names = new ArrayList<>();
         // x轴数据
         List<Map<String, Object>> data = fireFightingSystemMapper.selectAllDays();
@@ -566,7 +566,10 @@ public class SupervisionConfigureController extends AbstractBaseController {
     @RequestMapping(value = "/selectPressureDetails", method = RequestMethod.GET)
     @TycloudOperation(ApiLevel = UserType.AGENCY)
     @ApiOperation(httpMethod = "GET", value = "稳压泵详情", produces = "application/json;charset=UTF-8", notes = "稳压泵详情")
-    public ResponseModel selectPressureDetails(@RequestParam(value = "bizOrgCode", required = false) String bizOrgCode) {
+    public ResponseModel selectPressureDetails(@RequestParam(value = "bizOrgCode", required = false) String bizOrgCode,
+                                               @RequestParam(value = "id", required = false) String id,
+                                               @RequestParam(value = "startTime", required = false) String startTime,
+                                               @RequestParam(value = "endTime", required = false) String endTime) {
         if (ObjectUtils.isEmpty(bizOrgCode)) {
             ReginParams reginParams = getSelectedOrgInfo();
             ReginParams.PersonIdentity personIdentity = reginParams.getPersonIdentity();
@@ -577,7 +580,26 @@ public class SupervisionConfigureController extends AbstractBaseController {
                 }
             }
         }
-        List<Map<String, Object>> list = supervisionVideoService.selectPressureDetails(bizOrgCode);
+        List<Map<String, Object>> list = supervisionVideoService.selectPressureDetails(bizOrgCode, id, startTime, endTime);
+        return CommonResponseUtil.success(list);
+    }
+
+    @PersonIdentify
+    @RequestMapping(value = "/selectAllPressureList", method = RequestMethod.GET)
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @ApiOperation(httpMethod = "GET", value = "稳压泵下拉列表", produces = "application/json;charset=UTF-8", notes = "稳压泵下拉列表")
+    public ResponseModel selectAllPressureList(@RequestParam(value = "bizOrgCode", required = false) String bizOrgCode) {
+        if (ObjectUtils.isEmpty(bizOrgCode)) {
+            ReginParams reginParams = getSelectedOrgInfo();
+            ReginParams.PersonIdentity personIdentity = reginParams.getPersonIdentity();
+            if (!ValidationUtil.isEmpty(personIdentity)) {
+                bizOrgCode = personIdentity.getBizOrgCode();
+                if (bizOrgCode == null) {
+                    return CommonResponseUtil.success(null);
+                }
+            }
+        }
+        List<Map<String, Object>> list = supervisionVideoService.selectAllPressureName(bizOrgCode);
         return CommonResponseUtil.success(list);
     }
 

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

@@ -692,7 +692,9 @@ public interface FireFightingSystemMapper extends BaseMapper<FireFightingSystemE
 
     List<Map<String, Object>> getStationStatusStatistics();
 
-    List<Map<String, Object>> selectAllPressurePumpInfo(@Param("bizOrgCode") String bizOrgCode);
+    List<Map<String, Object>> selectAllPressurePumpInfo(@Param("bizOrgCode") String bizOrgCode, @Param("id") String id);
+
+    List<Map<String, Object>> selectAllPressureName(@Param("bizOrgCode") String bizOrgCode);
 
     List<Map<String, Object>> selectAllDays();
 

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

@@ -3,7 +3,9 @@ package com.yeejoin.equipmanage.service;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.yeejoin.equipmanage.common.entity.SupervisionVideo;
+import org.springframework.web.bind.annotation.RequestParam;
 
+import java.util.Date;
 import java.util.List;
 import java.util.Map;
 
@@ -22,5 +24,7 @@ public interface ISupervisionVideoService extends IService<SupervisionVideo> {
 
     Page<Map<String, Object>> queryPumpInfo(Page page, String bizOrgCode);
 
-    List<Map<String, Object>> selectPressureDetails(String bizOrgCode);
+    List<Map<String, Object>> selectPressureDetails(String bizOrgCode, String id, String startTime, String endTime);
+
+    List<Map<String, Object>> selectAllPressureName(String bizOrgCode);
 }

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

@@ -1328,7 +1328,7 @@ public class EquipmentSpecificSerivceImpl extends ServiceImpl<EquipmentSpecificM
             //如果多个二维码说明单项管理，批量录入
             if (equipmentSpecific.getNum() > 1) {
                 //TODO 1.去掉模板概念了，把EquipmentDetail当成EquipmentSpecific一对一子表,有多少二维码生成就有多少个EquipmentDetail
-                List<EquipmentDetail> equipmentDetails = this.saveEquipmentDetailBatch(equipmentData.getEquipmentDetail(), equipmentSpecific.getNum());
+                List<EquipmentDetail> equipmentDetails = this.saveEquipmentDetailBatch(equipmentData.getEquipmentDetail(), (int) equipmentSpecific.getNum().floatValue());
                 //2.生成二维码数据
                 List<String> list = genQrCode(equipmentDetails);
                 //3.插入设备实例基本表
@@ -1435,7 +1435,7 @@ public class EquipmentSpecificSerivceImpl extends ServiceImpl<EquipmentSpecificM
 
                 //页面参数返回数据处理
                 EquipmentSpecific resultEquipSpec = equipmentSpecifics.get(0);
-                resultEquipSpec.setNum(1);
+                resultEquipSpec.setNum(1F);
                 equipmentData.setEquipmentDetail(equipmentDetails.get(0));
                 equipmentData.setEquipmentSpecific(resultEquipSpec);
             } else {

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

@@ -1089,6 +1089,10 @@ public class FireFightingSystemServiceImpl extends ServiceImpl<FireFightingSyste
 
 
         list.getRecords().parallelStream().forEach(item -> {
+            if (!ObjectUtils.isEmpty(finalStockDetailMap.get(item.getId()))
+                    && !ObjectUtils.isEmpty(finalStockDetailMap.get(item.getId()).getAmount())) {
+                item.setAmount(finalStockDetailMap.get(item.getId()).getAmount().toString());
+            }
             if (!item.getEqtype().startsWith("4")
                     && !ObjectUtils.isEmpty(finalStockDetailMap.get(item.getId()))
                     && !ObjectUtils.isEmpty(finalStockDetailMap.get(item.getId()).getAmount())) {

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

@@ -648,7 +648,7 @@ public class StockServiceImpl extends ServiceImpl<StockMapper, Stock> implements
                  equipmentSpecific.setIotCode(iotCode);
                  equipmentSpecific.setCode(equipmentDetailDownloadVOS.getSystemCode());
                  equipmentSpecific.setSystemId(fightSysIds.get());
-                 equipmentSpecific.setNum(1);
+                 equipmentSpecific.setNum(1F);
                  equipmentSpecific.setSingle(true);
                  fireFightSysIdsBuffer.append(fightSysIds.get() + ",");
                  // 导入新增所属队伍
@@ -814,7 +814,7 @@ public class StockServiceImpl extends ServiceImpl<StockMapper, Stock> implements
             iotCode = ExcelUtils.replaceAllBlank(iotCode);
             equipmentSpecific.setIotCode(iotCode);
             equipmentSpecific.setCode(equipmentDetailDownloadVOS.get(i).getCode());
-            equipmentSpecific.setNum(1);
+            equipmentSpecific.setNum(1F);
             equipmentSpecific.setSingle(true);
             //数据检查
 

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

 package com.yeejoin.equipmanage.service.impl;
 
+import cn.hutool.core.date.DatePattern;
+import cn.hutool.core.date.DateUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -248,8 +250,8 @@ public class SupervisionVideoServiceImpl extends ServiceImpl<SupervisionVideoMap
     }
 
     @Override
-    public List<Map<String, Object>> selectPressureDetails(String bizOrgCode) {
-        List<Map<String, Object>> pressurePumpInfo = fireFightingSystemMapper.selectAllPressurePumpInfo(bizOrgCode);
+    public List<Map<String, Object>> selectPressureDetails(String bizOrgCode, String id, String startTime, String endTime) {
+        List<Map<String, Object>> pressurePumpInfo = fireFightingSystemMapper.selectAllPressurePumpInfo(bizOrgCode, id);
         pressurePumpInfo.stream().map(item -> {
             String prefix = null;
             String suffix = null;
@@ -275,7 +277,34 @@ public class SupervisionVideoServiceImpl extends ServiceImpl<SupervisionVideoMap
             }
             return item;
         }).collect(Collectors.toList());
-        return pressurePumpInfo;
+        List<Map<String, Object>> list = filterByTimestamp(pressurePumpInfo, startTime, endTime);
+        return list;
+    }
+
+    private List<Map<String, Object>> filterByTimestamp(List<Map<String, Object>> objects, String startTime, String endTime) {
+        if (ObjectUtils.isEmpty(startTime) && ObjectUtils.isEmpty(endTime)) {
+            return objects; // 如果起止时间都为空，则返回原始列表
+        } else if (ObjectUtils.isEmpty(startTime)) {
+            return objects.stream()
+                    .filter(obj -> !ObjectUtils.isEmpty(obj.get("startTime")))
+                    .filter(obj -> DateUtil.parse(obj.get("startTime").toString(), DatePattern.NORM_DATETIME_PATTERN).isBefore(DateUtil.parse(endTime, DatePattern.NORM_DATETIME_PATTERN)))
+                    .collect(Collectors.toList());
+        } else if (ObjectUtils.isEmpty(endTime)) {
+            return objects.stream()
+                    .filter(obj -> !ObjectUtils.isEmpty(obj.get("startTime")))
+                    .filter(obj -> DateUtil.parse(obj.get("startTime").toString(), DatePattern.NORM_DATETIME_PATTERN).isAfter(DateUtil.parse(startTime, DatePattern.NORM_DATETIME_PATTERN)))
+                    .collect(Collectors.toList());
+        } else {
+            return objects.stream()
+                    .filter(obj -> !ObjectUtils.isEmpty(obj.get("startTime")))
+                    .filter(obj -> DateUtil.parse(obj.get("startTime").toString(), DatePattern.NORM_DATETIME_PATTERN).isAfter(DateUtil.parse(startTime, DatePattern.NORM_DATETIME_PATTERN)) && DateUtil.parse(obj.get("startTime").toString(), DatePattern.NORM_DATETIME_PATTERN).isBefore(DateUtil.parse(endTime, DatePattern.NORM_DATETIME_PATTERN)))
+                    .collect(Collectors.toList());
+        }
     }
 
+
+    @Override
+    public List<Map<String, Object>> selectAllPressureName(String bizOrgCode) {
+        return fireFightingSystemMapper.selectAllPressureName(bizOrgCode);
+    }
 }

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

@@ -5880,6 +5880,26 @@
         <if test="bizOrgCode != null and bizOrgCode != ''" >
             AND es.biz_org_code like concat(#{bizOrgCode}, '%')
         </if>
+        <if test="id != null and id != ''" >
+            AND es.id = #{id}
+        </if>
+        GROUP BY
+        es.id
+    </select>
+
+    <select id="selectAllPressureName" resultType="java.util.Map">
+        SELECT
+        es.`name`,
+        es.id
+        FROM
+        wl_equipment_specific es
+        LEFT JOIN wl_equipment_detail ed ON es.equipment_detail_id = ed.id
+        WHERE
+        ed.`code` LIKE '92010800%'
+        AND es.iot_code IS NOT NULL
+        <if test="bizOrgCode != null and bizOrgCode != ''" >
+            AND es.biz_org_code like concat(#{bizOrgCode}, '%')
+        </if>
         GROUP BY
         es.id
     </select>