fix(statistics):接口迁移

amos-boot-system-tzs/amos-boot-module-statistics/amos-boot-module-statistics-api/src/main/java/com/yeejoin/amos/boot/module/statistics/api/mapper/EnterpriseBizMapper.java

+package com.yeejoin.amos.boot.module.statistics.api.mapper;
+
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.Map;
+
+
+/**
+ *  Mapper 接口
+ *
+ * @author system_generator
+ * @date 2023-12-13
+ */
+@Mapper
+public interface EnterpriseBizMapper {
+
+    Map<String, Object> getProblemInfoBySourceId(@Param("sourceId")String sourceId);
+
+}

amos-boot-system-tzs/amos-boot-module-statistics/amos-boot-module-statistics-api/src/main/resources/mapper/EnterpriseBizMapper.xml

+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.yeejoin.amos.boot.module.statistics.api.mapper.EnterpriseBizMapper">
+
+    <select id="getProblemInfoBySourceId" resultType="java.util.Map">
+        select * from tzs_safety_problem_tracing where source_id = #{sourceId} order by rec_date desc limit 1
+    </select>
+    
+</mapper>

amos-boot-system-tzs/amos-boot-module-statistics/amos-boot-module-statistics-biz/src/main/java/com/yeejoin/amos/boot/module/statistcs/biz/controller/EnterpriseBizController.java

@@ -4,7 +4,6 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.yeejoin.amos.boot.module.statistcs.biz.service.impl.EnterpriseBizServiceImpl;
 import com.yeejoin.amos.boot.module.ymt.api.dto.TzBaseEnterpriseInfoDto;
 import com.yeejoin.amos.boot.module.ymt.api.entity.PageParam;
-import com.yeejoin.amos.boot.module.tcm.api.service.ITzBaseEnterpriseInfoService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -27,13 +26,10 @@ import java.util.Map;
 public class EnterpriseBizController {
 
     private final EnterpriseBizServiceImpl enterpriseBizService;
-    private final ITzBaseEnterpriseInfoService iTzBaseEnterpriseInfoService;
 
     @Autowired
-    public EnterpriseBizController(EnterpriseBizServiceImpl enterpriseBizService,
-                                   ITzBaseEnterpriseInfoService iTzBaseEnterpriseInfoService) {
+    public EnterpriseBizController(EnterpriseBizServiceImpl enterpriseBizService) {
         this.enterpriseBizService = enterpriseBizService;
-        this.iTzBaseEnterpriseInfoService = iTzBaseEnterpriseInfoService;
     }
 
     @TycloudOperation(ApiLevel = UserType.AGENCY, needAuth = false)
@@ -44,10 +40,10 @@ public class EnterpriseBizController {
         return ResponseHelper.buildResponse(enterpriseBizService.page(pageParam, tzBaseEnterpriseInfoDto));
     }
 
-    @TycloudOperation(ApiLevel = UserType.AGENCY, needAuth = false)
-    @RequestMapping(value = "/getInfoByUseCode/map", method = RequestMethod.GET)
-    @ApiOperation(httpMethod = "GET", value = "根据统一信用代码查询企业详情返回map", notes = "根据统一信用代码查询企业详情返回map")
-    public ResponseModel<Map<String, Object>> getInfoByUseCodeMap(String useCode) {
-        return ResponseHelper.buildResponse(iTzBaseEnterpriseInfoService.getInfoByUseCodeMap(useCode));
-    }
+    // @TycloudOperation(ApiLevel = UserType.AGENCY, needAuth = false)
+    // @RequestMapping(value = "/getInfoByUseCode/map", method = RequestMethod.GET)
+    // @ApiOperation(httpMethod = "GET", value = "根据统一信用代码查询企业详情返回map", notes = "根据统一信用代码查询企业详情返回map")
+    // public ResponseModel<Map<String, Object>> getInfoByUseCodeMap(String useCode) {
+    //     return ResponseHelper.buildResponse(enterpriseBizService.getInfoByUseCodeMap(useCode));
+    // }
 }

amos-boot-system-tzs/amos-boot-module-statistics/amos-boot-module-statistics-biz/src/main/java/com/yeejoin/amos/boot/module/statistcs/biz/controller/EquipmentBizController.java

@@ -2,7 +2,6 @@ package com.yeejoin.amos.boot.module.statistcs.biz.controller;
 
 import com.yeejoin.amos.boot.module.statistcs.biz.service.impl.EquipmentBizServiceImpl;
 import com.yeejoin.amos.boot.module.ymt.api.entity.EquipmentCategory;
-import com.yeejoin.amos.boot.module.ymt.api.service.IEquipmentCategoryService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -23,14 +22,12 @@ import java.util.Map;
 @Api(tags = "大屏-设备相关-业务API")
 public class EquipmentBizController {
 
-    private final IEquipmentCategoryService equipmentCategoryService;
 
     private final EquipmentBizServiceImpl equipmentBizServiceImpl;
 
 
     @Autowired
-    public EquipmentBizController(IEquipmentCategoryService equipmentCategoryService,EquipmentBizServiceImpl equipmentBizServiceImpl) {
-        this.equipmentCategoryService = equipmentCategoryService;
+    public EquipmentBizController(EquipmentBizServiceImpl equipmentBizServiceImpl) {
         this.equipmentBizServiceImpl = equipmentBizServiceImpl;
     }
 
@@ -38,7 +35,7 @@ public class EquipmentBizController {
     @RequestMapping(value = "/getFormRecordById/map", method = RequestMethod.GET)
     @ApiOperation(httpMethod = "GET", value = "表格查询详情", notes = "表格查询详情")
     public ResponseModel<Object> getFormRecordByIdMap(@RequestParam Map<String, Object> map) {
-        return ResponseHelper.buildResponse(equipmentCategoryService.getFormRecordByIdMap(map));
+        return ResponseHelper.buildResponse(equipmentBizServiceImpl.getFormRecordByIdMap(map));
     }
 
     @TycloudOperation(ApiLevel = UserType.AGENCY)
@@ -48,17 +45,4 @@ public class EquipmentBizController {
         return ResponseHelper.buildResponse(equipmentBizServiceImpl.getChildren(code));
     }
 
-
-    /**
-     * 获取管辖分局树
-     *
-     * @return
-     */
-    @TycloudOperation(ApiLevel = UserType.AGENCY)
-    @GetMapping(value = "/creatTree")
-    @ApiOperation(httpMethod = "GET", value = "获取管辖分局树", notes = "获取管辖分局树")
-    public ResponseModel<Object> creatTree() {
-        return ResponseHelper.buildResponse(equipmentCategoryService.getTree());
-    }
-
 }

amos-boot-system-tzs/amos-boot-module-statistics/amos-boot-module-statistics-biz/src/main/java/com/yeejoin/amos/boot/module/statistcs/biz/controller/StCommonController.java

@@ -4,7 +4,6 @@ import com.alibaba.fastjson.JSONArray;
 import com.yeejoin.amos.boot.biz.common.controller.BaseController;
 import com.yeejoin.amos.boot.module.common.api.dto.DPFilterParamForDetailDto;
 import com.yeejoin.amos.boot.module.statistcs.biz.service.impl.StCommonServiceImpl;
-import com.yeejoin.amos.boot.module.tcm.flc.api.service.IRegUnitInfoService;
 import com.yeejoin.amos.feign.systemctl.model.RegionModel;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -14,7 +13,6 @@ import org.typroject.tyboot.core.restful.doc.TycloudOperation;
 import org.typroject.tyboot.core.restful.utils.ResponseHelper;
 import org.typroject.tyboot.core.restful.utils.ResponseModel;
 
-import java.util.Collection;
 import java.util.List;
 
 @RestController
@@ -23,12 +21,9 @@ import java.util.List;
 public class StCommonController extends BaseController {
 
     private StCommonServiceImpl commonService;
-    private IRegUnitInfoService iregUnitInfoService;
 
-    public StCommonController(StCommonServiceImpl commonService,
-                              IRegUnitInfoService iregUnitInfoService) {
+    public StCommonController(StCommonServiceImpl commonService) {
         this.commonService = commonService;
-        this.iregUnitInfoService = iregUnitInfoService;
     }
 
     /**
@@ -54,13 +49,4 @@ public class StCommonController extends BaseController {
         objects.add(commonService.getEquCategoryTree(paramDto));
         return ResponseHelper.buildResponse(objects);
     }
-
-    @TycloudOperation(ApiLevel = UserType.AGENCY, needAuth = false)
-    @GetMapping(value = "/management-unit/tree")
-    @ApiOperation(httpMethod = "GET", value = "管辖机构树", notes = "管辖机构树")
-    public ResponseModel<Collection> managementUnitTree(@RequestParam(required = false) String orgCode) {
-        Collection result = iregUnitInfoService.getManagementUnitTree(orgCode);
-        return ResponseHelper.buildResponse(result);
-    }
-
 }

amos-boot-system-tzs/amos-boot-module-statistics/amos-boot-module-statistics-biz/src/main/java/com/yeejoin/amos/boot/module/statistcs/biz/service/impl/EnterpriseBizServiceImpl.java

@@ -7,6 +7,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.yeejoin.amos.boot.biz.common.bo.ReginParams;
 import com.yeejoin.amos.boot.biz.common.utils.RedisKey;
 import com.yeejoin.amos.boot.biz.common.utils.RedisUtils;
+import com.yeejoin.amos.boot.module.statistics.api.mapper.EnterpriseBizMapper;
 import com.yeejoin.amos.boot.module.ymt.api.dto.TzBaseEnterpriseInfoDto;
 import com.yeejoin.amos.boot.module.ymt.api.entity.PageParam;
 import com.yeejoin.amos.boot.module.ymt.api.mapper.TzBaseEnterpriseInfoMapper;
@@ -32,10 +33,15 @@ public class EnterpriseBizServiceImpl {
 
     private TzBaseEnterpriseInfoMapper tzBaseEnterpriseInfoMapper;
 
-    public EnterpriseBizServiceImpl(RedisUtils redisUtils, StCommonServiceImpl stCommonService, TzBaseEnterpriseInfoMapper tzBaseEnterpriseInfoMapper) {
+    private EnterpriseBizMapper enterpriseBizMapper;
+
+    public EnterpriseBizServiceImpl(RedisUtils redisUtils, StCommonServiceImpl stCommonService,
+                                    TzBaseEnterpriseInfoMapper tzBaseEnterpriseInfoMapper,
+                                    EnterpriseBizMapper enterpriseBizMapper) {
         this.redisUtils = redisUtils;
         this.stCommonService = stCommonService;
         this.tzBaseEnterpriseInfoMapper = tzBaseEnterpriseInfoMapper;
+        this.enterpriseBizMapper = enterpriseBizMapper;
     }
 
     public IPage<TzBaseEnterpriseInfoDto> page(PageParam pageParam, TzBaseEnterpriseInfoDto tzBaseEnterpriseInfoDto) {