监管-部分公共接口修改

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/pom.xml

@@ -18,6 +18,11 @@
         </dependency>
         <dependency>
             <groupId>com.amosframework.boot</groupId>
+            <artifactId>amos-boot-module-ymt-api</artifactId>
+            <version>1.0.0</version>
+        </dependency>
+        <dependency>
+            <groupId>com.amosframework.boot</groupId>
             <artifactId>amos-boot-module-common-api</artifactId>
             <version>${amos-biz-boot.version}</version>
         </dependency>

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

@@ -13,7 +13,7 @@ import java.util.Map;
  * @author system_generator
  * @date 2021-10-20
  */
-public interface EquipmentCategoryMapper extends BaseMapper<EquipmentCategory> {
+public interface CommonMapper extends BaseMapper<EquipmentCategory> {
 
     List<Map<String, Object>> getUnitListByType(String type);
 }

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/resources/mapper/EquipmentCategoryMapper.xml → amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/resources/mapper/CommonMapper.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.jg.api.mapper.EquipmentCategoryMapper">
+<mapper namespace="com.yeejoin.amos.boot.module.jg.api.mapper.CommonMapper">
 
 <select id="getUnitListByType" resultType="java.util.Map">
     SELECT
-        *
+        sequence_nbr sequenceNbr,
+        use_code useCode,
+        use_unit useUnit,
+        use_contact useContact,
+        contact_phone contactPhone
     FROM
         tz_base_enterprise_info
     WHERE

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

@@ -2,7 +2,7 @@ package com.yeejoin.amos.boot.module.jg.biz.controller;
 
 
 import com.yeejoin.amos.boot.biz.common.controller.BaseController;
-import com.yeejoin.amos.boot.module.jg.biz.service.IEquipmentCategoryService;
+import com.yeejoin.amos.boot.module.jg.biz.service.ICommonService;
 import com.yeejoin.amos.boot.module.ymt.api.entity.EquipmentCategory;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -27,17 +27,17 @@ import java.util.Map;
  */
 @RestController
 @Api(tags = "装备分类Api")
-@RequestMapping(value = "/equipment-category")
-public class EquipmentCategoryController extends BaseController {
+@RequestMapping(value = "/common")
+public class CommonController extends BaseController {
 	@Autowired
-	IEquipmentCategoryService equipmentCategoryService;
+	ICommonService commonService;
 
 	@TycloudOperation(ApiLevel = UserType.AGENCY)
 	@GetMapping(value = "/getChildren")
 	@ApiOperation(httpMethod = "GET", value = "通过设备种类code获取设备类别", notes = "通过设备种类code获取设备类别")
 	public ResponseModel<List<EquipmentCategory>> getChildren(@RequestParam(value = "code") String code,
 															  @RequestParam(value = "type", required = false) String type) {
-		return ResponseHelper.buildResponse(equipmentCategoryService.getEquipmentCategoryList(code, type));
+		return ResponseHelper.buildResponse(commonService.getEquipmentCategoryList(code, type));
 	}
 
 	@TycloudOperation(ApiLevel = UserType.AGENCY)
@@ -45,7 +45,7 @@ public class EquipmentCategoryController extends BaseController {
 	@ApiOperation(httpMethod = "GET", value = "获取行政区划", notes = "获取行政区划")
 	public ResponseModel<Object> getRegion(@RequestParam(value = "level", required = false) String level,
 										   @RequestParam(value = "parentId", required = false) String parentId) {
-		return ResponseHelper.buildResponse(equipmentCategoryService.getRegion(level, parentId));
+		return ResponseHelper.buildResponse(commonService.getRegion(level, parentId));
 	}
 
 	/**
@@ -57,11 +57,11 @@ public class EquipmentCategoryController extends BaseController {
 	@GetMapping(value = "/creatTree")
 	@ApiOperation(httpMethod = "GET", value = "获取管辖分局树", notes = "获取管辖分局树")
 	public ResponseModel<Object> creatTree() {
-		return ResponseHelper.buildResponse(equipmentCategoryService.getTree());
+		return ResponseHelper.buildResponse(commonService.getTree());
 	}
 
 	/**
-	 * 获取管辖分局树
+	 * 通过单位类型获取单位列表
 	 *
 	 * @return
 	 */
@@ -69,6 +69,6 @@ public class EquipmentCategoryController extends BaseController {
 	@GetMapping(value = "/getUnitList")
 	@ApiOperation(httpMethod = "GET", value = "通过单位类型获取单位列表", notes = "通过单位类型获取单位列表")
 	public ResponseModel<List<Map<String,Object>>> getUnitList(@RequestParam(value = "type") String type) {
-		return ResponseHelper.buildResponse(equipmentCategoryService.getUnitListByType(type));
+		return ResponseHelper.buildResponse(commonService.getUnitListByType(type));
 	}
 }

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/service/IEquipmentCategoryService.java → amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/service/ICommonService.java

@@ -13,7 +13,7 @@ import java.util.Map;
  * @author system_generator
  * @date 2021-10-20
  */
-public interface IEquipmentCategoryService {
+public interface ICommonService {
 
     List<EquipmentCategory> getEquipmentCategoryList(String code, String type);
 

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/EquipmentCategoryServiceImpl.java → 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/CommonServiceImpl.java

@@ -2,11 +2,11 @@ package com.yeejoin.amos.boot.module.jg.biz.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.yeejoin.amos.boot.biz.common.utils.RedisUtils;
-import com.yeejoin.amos.boot.module.jg.biz.service.IEquipmentCategoryService;
+import com.yeejoin.amos.boot.module.jg.api.mapper.CommonMapper;
+import com.yeejoin.amos.boot.module.jg.biz.service.ICommonService;
 import com.yeejoin.amos.boot.module.jg.flc.api.fegin.PrivilegeFeginService;
-import com.yeejoin.amos.boot.module.ymt.api.dto.EquipmentCategoryDto;
 import com.yeejoin.amos.boot.module.ymt.api.entity.EquipmentCategory;
-import com.yeejoin.amos.boot.module.jg.api.mapper.EquipmentCategoryMapper;
+import com.yeejoin.amos.boot.module.ymt.api.mapper.EquipmentCategoryMapper;
 import com.yeejoin.amos.component.feign.model.FeignClientResult;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -14,7 +14,7 @@ import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 import org.springframework.util.ObjectUtils;
 import org.typroject.tyboot.core.foundation.context.RequestContext;
-import org.typroject.tyboot.core.rdbms.service.BaseService;
+
 import java.util.*;
 import java.util.stream.Collectors;
 
@@ -26,13 +26,16 @@ import java.util.stream.Collectors;
  */
 @Service
 @Slf4j
-public class EquipmentCategoryServiceImpl extends BaseService<EquipmentCategoryDto, EquipmentCategory, EquipmentCategoryMapper> implements IEquipmentCategoryService {
+public class CommonServiceImpl implements ICommonService {
 
     @Autowired
     EquipmentCategoryMapper equipmentCategoryMapper;
     @Autowired
     private RedisUtils redisUtils;
 
+    @Autowired
+    CommonMapper commonMapper;
+
     //行政区划redis缓存key
     private static final String PROVINCE = "PROVINCE";
     private static final String CITY = "CITY";
@@ -153,7 +156,7 @@ public class EquipmentCategoryServiceImpl extends BaseService<EquipmentCategoryD
             type = "维保单位";
         }
 
-        return equipmentCategoryMapper.getUnitListByType(type);
+        return commonMapper.getUnitListByType(type);
     }
 
     /**