Merge branch 'develop_tzs_register_to_0715' of…

amos-boot-system-tzs/amos-boot-module-96333/amos-boot-module-96333-api/src/main/java/com/yeejoin/amos/boot/module/elevator/api/mapper/AlertCalledMapper.java

@@ -3,6 +3,7 @@ package com.yeejoin.amos.boot.module.elevator.api.mapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.yeejoin.amos.boot.module.common.api.dto.DPFilterParamDto;
 import com.yeejoin.amos.boot.module.elevator.api.dto.AlertCalledQueryDto;
 import com.yeejoin.amos.boot.module.elevator.api.dto.AlertCalledRecordDto;
 import com.yeejoin.amos.boot.module.elevator.api.dto.AlertPaperInfoDto;
@@ -52,7 +53,7 @@ public interface AlertCalledMapper extends BaseMapper<AlertCalled> {
      *
      * @return
      */
-    List<Map<String, Object>> queryListByLocation(@Param("regionCode") String regionCode);
+    List<Map<String, Object>> queryListByLocation(@Param("regionCode") String regionCode, @Param("dto") DPFilterParamDto filterParamDto);
     /**
      * 接警情况统计
      *

amos-boot-system-tzs/amos-boot-module-96333/amos-boot-module-96333-api/src/main/resources/mapper/AlertCalledMapper.xml

@@ -147,11 +147,14 @@
 				LEFT JOIN idx_biz_jg_use_info ibjuj ON tac.equipment_id = ibjuj.RECORD
 				LEFT JOIN cb_data_dictionary cdd ON ibjuj.USE_PLACE = cdd.sequence_nbr
 		WHERE
-			biz_org_code LIKE concat(#{regionCode}, '%')
+			tac.biz_org_code LIKE concat(#{regionCode}, '%')
 		  AND (tac.alarm_type_code = '960' or tac.alarm_type_code = '961')
 		  AND
 			ibjuj.USE_PLACE is NOT NULL
-		  AND	cdd.NAME is NOT NULL
+		  AND cdd.NAME is NOT NULL
+			<if test="dto.beginDate !=null and dto.beginDate !='' and dto.endDate !=null and dto.endDate !=''">
+				AND tac.call_time BETWEEN #{dto.beginDate} AND #{dto.endDate}
+			</if>
 		GROUP BY
 			cdd.NAME
 		ORDER BY ibjuj.USE_PLACE ASC

amos-boot-system-tzs/amos-boot-module-96333/amos-boot-module-96333-biz/src/main/java/com/yeejoin/amos/boot/module/elevator/biz/service/impl/DPStatisticsServiceImpl.java

@@ -111,20 +111,20 @@ public class DPStatisticsServiceImpl {
     }
 
     public JSONObject elevatorCountStat(DPFilterParamDto dpFilterParamDto) throws Exception {
-        String regionCode = dpFilterParamDto.getCityCode();
         List<RegionModel> regionList = this.getRegionList(dpFilterParamDto);
         List<String> xdata = regionList.stream().map(r -> r.getRegionName().toString()).collect(Collectors.toList());
-        if (!regionCode.equals("610000")){
-            regionCode = "610000#" +  regionCode;
-        }
+
         List<Integer> ydata = new ArrayList<>();
-        String finalRegionCode = regionCode;
-        regionList.stream().forEach(x -> {
+        Map<String, Integer> map =  new HashMap<>();
+
+        regionList.parallelStream().forEach(x -> {
             LambdaQueryWrapper<Elevator> lambda = new QueryWrapper<Elevator>().lambda();
-            lambda.eq(Elevator::getRegionCode, finalRegionCode + "#" + x.getRegionCode());
-            ydata.add(elevatorMapper.selectCount(lambda));
+            lambda.like(Elevator::getRegionCode, x.getRegionCode());
+            map.put(x.getRegionName(), elevatorMapper.selectCount(lambda));
+        });
+        xdata.stream().forEach(x -> {
+            ydata.add(map.get(x));
         });
-
         JSONObject jsonObject = new JSONObject();
         jsonObject.put("xdata", xdata);
         jsonObject.put("ydata", ydata);
@@ -133,7 +133,10 @@ public class DPStatisticsServiceImpl {
 
     public JSONObject eventStatByLocation(DPFilterParamDto dpFilterParamDto) throws Exception {
         String orgCode = this.getAndSetOrgCode(dpFilterParamDto);
-        List<Map<String, Object>> maps = alertCalledMapper.queryListByLocation(orgCode);
+        dpFilterParamDto.setBeginDate(DateUtil.formatDate(DateTimeUtil.getMinValueOfOneDay(DateTimeUtil.addMonths(new Date(), -1)), DateUtil.Y_M_D_HMS));
+        dpFilterParamDto.setEndDate(DateUtil.formatDate(DateTimeUtil.getMaxValueOfOneDay(new Date()), DateUtil.Y_M_D_HMS));
+
+        List<Map<String, Object>> maps = alertCalledMapper.queryListByLocation(orgCode, dpFilterParamDto);
         List<Object> xdata = maps.stream().map(item -> item.get("name")).collect(Collectors.toList());
         List<Object> ydata = maps.stream().map(item -> item.get("majorAlertCount")).collect(Collectors.toList());
 

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/java/com/yeejoin/amos/boot/module/jg/api/entity/JgChangeRegistrationTransferEq.java

@@ -64,4 +64,10 @@ public class JgChangeRegistrationTransferEq extends BaseEntity {
     @TableField("device_info")
     private String deviceInfo;
 
+    /**
+     * 使用登记证
+     */
+    @TableField("use_registration_code")
+    private String useRegistrationCode;
+
 }

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/java/com/yeejoin/amos/boot/module/jg/api/mapper/JgChangeRegistrationTransferMapper.java

@@ -29,4 +29,6 @@ public interface JgChangeRegistrationTransferMapper extends BaseMapper<JgChangeR
 
     @Select("select name from tz_equipment_category  where code=#{code}")
     String getEquiplistNameByEquiplist(String code);
+
+    List<String> queryForFlowingEquipList();
 }

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/resources/mapper/JgChangeRegistrationTransferMapper.xml

@@ -110,5 +110,7 @@
         </if>
         recDate desc
     </select>
-
+    <select id="queryForFlowingEquipList" resultType="java.lang.String">
+        select change_data from tzs_jg_registration_history WHERE registration_class = '移装变更登记'
+    </select>
 </mapper>

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/controller/JgChangeRegistrationTransferController.java

@@ -49,14 +49,6 @@ public class JgChangeRegistrationTransferController extends BaseController {
 	@ApiOperation(httpMethod = "POST", value = "新增移装变更登记登记", notes = "新增移装变更登记登记")
 	public ResponseModel<Object> save(@RequestParam(value = "submitType") String submitType,
 									   @RequestBody JSONObject map) {
-		Map<String, Object> tableData = (Map<String, Object>) map.get(TABLE_PAGE_ID);
-		if(ValidationUtil.isEmpty(tableData)){
-			throw new BadRequest("参数校验失败.");
-		}
-		String equId = (String) tableData.get("record");
-		if(ValidationUtil.isEmpty(equId)){
-			throw new BadRequest("参数校验失败.");
-		}
 		ReginParams reginParams = getSelectedOrgInfo();
 	    return ResponseHelper.buildResponse(jgChangeRegistrationTransferService.createTransfer(submitType, map, reginParams));
 	}
@@ -72,14 +64,6 @@ public class JgChangeRegistrationTransferController extends BaseController {
 	@ApiOperation(httpMethod = "PUT", value = "根据sequenceNbr更新移装变更登记登记", notes = "根据sequenceNbr更新移装变更登记登记")
 	public ResponseModel<Object> updateBySequenceNbr(@RequestParam(value = "submitType") String submitType,
 													 @RequestBody JSONObject map) {
-		Map<String, Object> tableData = (Map<String, Object>) map.get(TABLE_PAGE_ID);
-		if(ValidationUtil.isEmpty(tableData)){
-			throw new BadRequest("参数校验失败.");
-		}
-		String equId = (String) tableData.get("sequenceNbr");
-		if(ValidationUtil.isEmpty(equId)){
-			throw new BadRequest("参数校验失败.");
-		}
 		ReginParams reginParams = getSelectedOrgInfo();
 	    return ResponseHelper.buildResponse(jgChangeRegistrationTransferService.updateTransfer(submitType, map, reginParams));
 	}

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/service/impl/JgChangeRegistrationTransferUsedCheckImpl.java

+package com.yeejoin.amos.boot.module.jg.biz.service.impl;
+
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
+import com.yeejoin.amos.boot.module.jg.api.mapper.JgChangeRegistrationTransferMapper;
+import lombok.extern.slf4j.Slf4j;
+import org.redisson.api.RBucket;
+import org.redisson.api.RedissonClient;
+import org.springframework.stereotype.Component;
+import java.util.*;
+import java.util.stream.Collectors;
+
+/**
+ * @author Administrator
+ */
+@Component
+@Slf4j
+public class JgChangeRegistrationTransferUsedCheckImpl extends BaseEquipUsedCheckService {
+
+    private final RedissonClient redissonClient;
+
+    private final String bizType = "changeRegistrationTransfer";
+
+    private final JgChangeRegistrationTransferMapper mapper;
+
+    public JgChangeRegistrationTransferUsedCheckImpl(RedissonClient redissonClient, JgChangeRegistrationTransferMapper mapper) {
+        this.redissonClient = redissonClient;
+        this.mapper = mapper;
+    }
+
+
+    @Override
+    public RedissonClient getRedisClient() {
+        return redissonClient;
+    }
+
+    @Override
+    public String getApplyBizType() {
+        return bizType;
+    }
+
+    public void init() {
+        // 获取设备数据并处理
+        Map<String, Set<String>> resultMap = mapper.queryForFlowingEquipList().stream()
+                .filter(Objects::nonNull)
+                .flatMap(changeData -> {
+                    JSONObject changeDataJson = JSON.parseObject(changeData);
+                    return changeDataJson.getJSONArray("registrationList").stream()
+                            .filter(item -> item instanceof JSONObject)
+                            .map(item -> (JSONObject) item)
+                            .collect(Collectors.groupingBy(
+                                    reg -> reg.getString("useUnitCreditCode"),
+                                    Collectors.mapping(reg -> reg.getString("sequenceNbr"), Collectors.toSet())
+                            )).entrySet().stream();
+                })
+                .collect(Collectors.toMap(
+                        Map.Entry::getKey,
+                        Map.Entry::getValue,
+                        (existing, replacement) -> {
+                            existing.addAll(replacement);
+                            return existing;
+                        }
+                ));
+
+        // 将结果存储到 Redis
+        resultMap.forEach((companyCode, records) -> {
+            RBucket<Set<String>> rBucket = redissonClient.getBucket(getFlowingEquipRedisKey(companyCode, bizType));
+            rBucket.set(records);
+        });
+    }
+}