大屏使用登记接口提交

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

@@ -46,4 +46,6 @@ public interface JgScrapCancelMapper extends BaseMapper<JgScrapCancel> {
     Map<String, Object> queryEquipInformation(@Param("sequenceNbr") long sequenceNbr);
 
     List<EquipBizCountDto> queryScrappedDeviceStaticListData(DPFilterParamDto dpFilterParamDto);
+
+    Integer getScrappedDeviceCount(@Param("dpFilterParamDto") DPFilterParamDto dpFilterParamDto);
 }

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

@@ -79,4 +79,6 @@ public interface JgUseRegistrationMapper extends BaseMapper<JgUseRegistration> {
     String getEquCategoryNameByCode(String code);
 
     List<EquipBizCountDto> queryNewDeviceStaticListData(DPFilterParamDto dpFilterParamDto);
+
+    Integer getUseRegisterCount(@Param("dpFilterParamDto") DPFilterParamDto dpFilterParamDto);
 }

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

@@ -289,4 +289,33 @@
             c.equ_category,
             c.equ_define
     </select>
+    <select id="getScrappedDeviceCount" resultType="java.lang.Integer">
+        select
+            count(1) as num
+        from
+            (SELECT
+                 ri.equ_list,
+                 ri.equ_category,
+                 ri.equ_define,
+                 concat(u.PROVINCE,'#', u.CITY,'#', u.COUNTY) as areaCode
+             FROM
+                 "tzs_jg_scrap_cancel_eq" ae,
+                 tzs_jg_scrap_cancel a,
+                 "idx_biz_jg_use_info" u,
+                 idx_biz_jg_register_info ri
+             where
+                 a.sequence_nbr = ae.equip_transfer_id
+               AND ri.EQU_CATEGORY = '2300'
+               and ae.equ_id = u."RECORD"
+               and u."RECORD" = ri."RECORD"
+               and (a.audit_pass_date between #{dpFilterParamDto.beginDate} and #{dpFilterParamDto.endDate})
+               and a.cancel_type ='1'
+               and a.audit_status='已完成'
+            ) c
+        where
+            c.areaCode like concat('%',#{dpFilterParamDto.cityCode}, '%')
+        group by
+            c.equ_category
+
+    </select>
 </mapper>

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

@@ -592,4 +592,33 @@
             c.equ_category,
             c.equ_define
     </select>
+    <select id="getUseRegisterCount" resultType="java.lang.Integer">
+        SELECT COUNT(1) AS num
+        FROM
+            (
+                SELECT
+                    ri.equ_list,
+                    ri.equ_category,
+                    ri.equ_define,
+                    A.audit_pass_date,
+                    concat ( u.PROVINCE, '#', u.CITY, '#', u.COUNTY ) AS areaCode
+                FROM
+                    "tzs_jg_use_registration_eq" ae,
+                    tzs_jg_use_registration A,
+                    "idx_biz_jg_use_info" u,
+                    idx_biz_jg_register_info ri
+                WHERE
+                    ae.equ_id = u."RECORD"
+                  AND ri.EQU_CATEGORY = '2300'
+                  AND A.sequence_nbr = ae.equip_transfer_id
+                  AND u."RECORD" = ri."RECORD"
+                  and (a.audit_pass_date between #{dpFilterParamDto.beginDate} and #{dpFilterParamDto.endDate})
+
+                  AND A.status = '已完成'
+            ) C
+        WHERE
+            C.areaCode LIKE concat ( '%', #{dpFilterParamDto.cityCode}, '%' )
+        GROUP BY
+            C.equ_category
+    </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/DPStatisticsController.java

@@ -48,4 +48,15 @@ public class DPStatisticsController {
         }
         return ResponseHelper.buildResponse(statisticsService.useRegisterCountByEquList(dpFilterParamDto));
     }
+
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @ApiOperation(httpMethod = "POST", value = "大屏八大类左侧-使用登记统计", notes = "大屏八大类左侧-使用登记统计")
+    @PostMapping(value = "/useRegisterCount")
+    public ResponseModel<Map<String, Object>> useRegisterCount(@Validated @RequestBody DPFilterParamDto dpFilterParamDto, BindingResult result) {
+        List<FieldError> fieldErrors = result.getFieldErrors();
+        if (!fieldErrors.isEmpty()) {
+            throw new BadRequest(fieldErrors.get(0).getDefaultMessage());
+        }
+        return ResponseHelper.buildResponse(statisticsService.useRegisterCount(dpFilterParamDto));
+    }
 }

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/DPStatisticsServiceImpl.java

@@ -12,6 +12,12 @@ import com.yeejoin.amos.boot.module.ymt.api.mapper.EquipmentCategoryMapper;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Service;
 
+import java.sql.Date;
+import java.text.SimpleDateFormat;
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+import java.time.format.DateTimeFormatter;
+import java.time.temporal.TemporalAdjusters;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
@@ -139,4 +145,41 @@ public class DPStatisticsServiceImpl {
             dpFilterParamDto.setEndDate(DateUtil.today());
         }
     }
+
+    public Map<String, Object> useRegisterCount(DPFilterParamDto dpFilterParamDto) {
+        // 2.按照前端约定格式返回数据
+        Map<String, Object> result = new HashMap<>();
+
+        List legendDataList = new ArrayList();
+        Map<String,Object> newDeviceMap = new HashMap<>();
+        newDeviceMap.put("dataKey","newDevice");
+        newDeviceMap.put("value","新增登记设备");
+        legendDataList.add(newDeviceMap);
+        Map<String,Object> scrappedDeviceMap = new HashMap<>();
+        scrappedDeviceMap.put("dataKey","scrappedDevice");
+        scrappedDeviceMap.put("value","报废设备");
+        legendDataList.add(scrappedDeviceMap);
+        result.put("legendData",legendDataList);
+        LocalDate today = LocalDate.now();
+        List xDataList = new ArrayList();
+        List<Integer> newDeviceList = new ArrayList();
+        List<Integer> scrappedDeviceList = new ArrayList();
+        DateTimeFormatter sdf = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
+        for (int i = 2; i >= 0; i--) {
+            LocalDate firstDayOfPrevMonth = today.minusMonths(i).with(TemporalAdjusters.firstDayOfMonth());
+            LocalDate lastDayOfPrevMonth = today.minusMonths(i).with(TemporalAdjusters.lastDayOfMonth());
+            dpFilterParamDto.setBeginDate(LocalDateTime.of(firstDayOfPrevMonth, java.time.LocalTime.MIN).format(sdf));
+            dpFilterParamDto.setEndDate(LocalDateTime.of(lastDayOfPrevMonth, java.time.LocalTime.MAX).format(sdf));
+            Integer useRegisterCount = useRegistrationMapper.getUseRegisterCount(dpFilterParamDto);
+            Integer scrappedDeviceCount = scrapCancelMapper.getScrappedDeviceCount(dpFilterParamDto);
+            xDataList.add(firstDayOfPrevMonth.getMonthValue()+"月");
+            newDeviceList.add(null == useRegisterCount ? 0 : useRegisterCount);
+            scrappedDeviceList.add(null == scrappedDeviceCount ? 0 : scrappedDeviceCount);
+        }
+        result.put("xData",xDataList);
+        result.put("newDevice",newDeviceList);
+        result.put("scrappedDevice",scrappedDeviceList);
+        return result;
+
+    }
 }