监管新增接口：

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

@@ -8,6 +8,8 @@ import com.yeejoin.amos.boot.module.jg.biz.service.ICommonService;
 import com.yeejoin.amos.boot.module.jg.biz.service.IPdfService;
 import com.yeejoin.amos.boot.module.ymt.api.entity.EquipmentCategory;
 import com.yeejoin.amos.boot.module.ymt.api.enums.FlowStatusEnum;
+import com.yeejoin.amos.feign.systemctl.Systemctl;
+import com.yeejoin.amos.feign.systemctl.model.DictionarieValueModel;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -18,17 +20,18 @@ import org.typroject.tyboot.core.foundation.enumeration.UserType;
 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.*;
 import java.util.stream.Collectors;
 
 /**
- * 装备分类
+ * 监管公共Api
  *
  * @author system_generator
  * @date 2021-10-20
  */
 @RestController
-@Api(tags = "装备分类Api")
+@Api(tags = "监管公共Api")
 @RequestMapping(value = "/common")
 public class CommonController extends BaseController {
     @Autowired
@@ -68,6 +71,7 @@ public class CommonController extends BaseController {
 
     /**
      * 工作台接收机构树
+     *
      * @param bizType 业务类型：notice-告知类， register-登记类
      * @return 树
      */
@@ -79,8 +83,6 @@ public class CommonController extends BaseController {
     }
 
 
-
-
     /**
      * 获取行政审批局树
      *
@@ -102,7 +104,7 @@ public class CommonController extends BaseController {
     @TycloudOperation(ApiLevel = UserType.AGENCY)
     @GetMapping(value = "/getUnitList")
     @ApiOperation(httpMethod = "GET", value = "通过单位类型获取单位列表", notes = "通过单位类型获取单位列表")
-	public ResponseModel<List<Map<String,Object>>> getUnitList(@RequestParam(value = "type") String type) {
+    public ResponseModel<List<Map<String, Object>>> getUnitList(@RequestParam(value = "type") String type) {
         return ResponseHelper.buildResponse(commonService.getUnitListByType(type));
     }
 
@@ -115,8 +117,8 @@ public class CommonController extends BaseController {
     @GetMapping(value = "/getSecurityAdmin")
     @ApiOperation(httpMethod = "GET", value = "查找当前公司下所属的安全管理员", notes = "查找当前公司下所属的安全管理员")
     public ResponseModel<List<Map<String, Object>>> getSecurityAdmin(@RequestParam(value = "type") String type,
-																	@RequestParam(value = "useUnitCode",required = false)String useUnitCode) {
-		return ResponseHelper.buildResponse(commonService.getSecurityAdmin(type,useUnitCode));
+                                                                     @RequestParam(value = "useUnitCode", required = false) String useUnitCode) {
+        return ResponseHelper.buildResponse(commonService.getSecurityAdmin(type, useUnitCode));
     }
 
 
@@ -128,9 +130,10 @@ public class CommonController extends BaseController {
     @TycloudOperation(ApiLevel = UserType.AGENCY)
     @GetMapping(value = "/getUserPhone")
     @ApiOperation(httpMethod = "GET", value = "查询用户对应联系方式", notes = "查询用户对应联系方式")
-	public ResponseModel<Map<String,Object>> getUserInfo(@RequestParam(value = "sequenceNbr") String sequenceNbr) {
+    public ResponseModel<Map<String, Object>> getUserInfo(@RequestParam(value = "sequenceNbr") String sequenceNbr) {
         return ResponseHelper.buildResponse(commonService.getUserInfo(sequenceNbr));
     }
+
     @TycloudOperation(ApiLevel = UserType.AGENCY)
     @GetMapping(value = "/getUserInfoSplit")
     @ApiOperation(httpMethod = "GET", value = "查询安全管理员的基本信息", notes = "查询安全管理员的基本信息")
@@ -140,6 +143,7 @@ public class CommonController extends BaseController {
         }
         return ResponseHelper.buildResponse(commonService.getUserInfo(sequenceNbr));
     }
+
     /**
      * 查询企业的基本信息
      *
@@ -148,7 +152,7 @@ public class CommonController extends BaseController {
     @TycloudOperation(ApiLevel = UserType.AGENCY)
     @GetMapping(value = "/getEnterpriseInfo")
     @ApiOperation(httpMethod = "GET", value = "查询企业的基本信息", notes = "查询企业的基本信息")
-	public ResponseModel<Map<String,Object>> getEnterpriseInfo(@RequestParam(value = "sequenceNbr") String sequenceNbr) {
+    public ResponseModel<Map<String, Object>> getEnterpriseInfo(@RequestParam(value = "sequenceNbr") String sequenceNbr) {
         return ResponseHelper.buildResponse(commonService.getEnterpriseInfo(sequenceNbr));
     }
 
@@ -160,14 +164,14 @@ public class CommonController extends BaseController {
     @TycloudOperation(ApiLevel = UserType.AGENCY)
     @GetMapping(value = "/getEnterpriseEmployee")
     @ApiOperation(httpMethod = "GET", value = "查询企业的下面的人员", notes = "查询企业的下面的人员")
-	public ResponseModel<List<Map<String,Object>>> getEnterpriseEmployee(@RequestParam String unitCode) {
+    public ResponseModel<List<Map<String, Object>>> getEnterpriseEmployee(@RequestParam String unitCode) {
         String companyCode = unitCode.split("_")[0];
         return ResponseHelper.buildResponse(commonService.getEnterpriseEmployee(companyCode));
     }
 
-	@TycloudOperation (ApiLevel = UserType.AGENCY)
-	@ApiOperation (httpMethod = "GET", value = "流程状态枚举列表", notes = "流程状态枚举列表")
-	@GetMapping (value = "/flow-status/list")
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @ApiOperation(httpMethod = "GET", value = "流程状态枚举列表", notes = "流程状态枚举列表")
+    @GetMapping(value = "/flow-status/list")
     public ResponseModel<List<Map<String, Object>>> selectForFlowStatusList() {
         return ResponseHelper.buildResponse(Arrays.stream(FlowStatusEnum.values()).map(this::mapPointTypeToMap).filter(Objects::nonNull).collect(Collectors.toList()));
     }
@@ -215,13 +219,12 @@ public class CommonController extends BaseController {
 
     /**
      * 根据公司id获取公司下人员
-	 *
      */
     @TycloudOperation(ApiLevel = UserType.AGENCY)
     @GetMapping(value = "/getCompanyUser")
     @ApiOperation(httpMethod = "get", value = "根据公司id获取公司下人员", notes = "根据公司id获取公司下人员")
-	public ResponseModel<Object> getCompanyUser(@RequestParam(value = "companyId",required = false) Long companyId) {
-		if(ObjectUtils.isEmpty(companyId)){
+    public ResponseModel<Object> getCompanyUser(@RequestParam(value = "companyId", required = false) Long companyId) {
+        if (ObjectUtils.isEmpty(companyId)) {
             return null;
         }
         Object result = commonService.getCompanyUser(companyId);
@@ -237,6 +240,7 @@ public class CommonController extends BaseController {
     public ResponseModel<Object> getCompanyType() {
         return ResponseHelper.buildResponse(iJgInstallationNoticeService.getCompanyType());
     }
+
     /**
      * 获取管辖分局树
      *
@@ -297,10 +301,11 @@ public class CommonController extends BaseController {
 
     /**
      * 校验EQUCODE的唯一性
+     *
      * @param equCode EQUCODE
      * @return
      */
-	@TycloudOperation(ApiLevel = UserType.AGENCY,needAuth = false)
+    @TycloudOperation(ApiLevel = UserType.AGENCY, needAuth = false)
     @GetMapping(value = "/checkUniquenessOfEQUCODE")
     @ApiOperation(httpMethod = "GET", value = "校验EQUCODE的唯一性", notes = "校验EQUCODE的唯一性")
     public ResponseModel<Object> checkUniquenessOfEQUCODE(String equCode) {
@@ -309,14 +314,14 @@ public class CommonController extends BaseController {
     }
 
 
-	@TycloudOperation(ApiLevel = UserType.AGENCY,needAuth = false)
+    @TycloudOperation(ApiLevel = UserType.AGENCY, needAuth = false)
     @GetMapping(value = "/test-file")
     @ApiOperation(httpMethod = "GET", value = "文件测试", notes = "文件测试")
     public ResponseModel<String> testFile() {
         return ResponseHelper.buildResponse(pdfService.signToPdf("upload/tzs/pdf/1708911268708_temp.pdf", "已作废"));
     }
 
-	@TycloudOperation(ApiLevel = UserType.AGENCY,needAuth = false)
+    @TycloudOperation(ApiLevel = UserType.AGENCY, needAuth = false)
     @GetMapping(value = "/water-print")
     @ApiOperation(httpMethod = "GET", value = "文件测试", notes = "文件测试")
     public ResponseModel<String> signToPdfWaterPrint() {
@@ -324,4 +329,25 @@ public class CommonController extends BaseController {
     }
 
 
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @GetMapping(value = "/equList")
+    @ApiOperation(httpMethod = "GET", value = "按照业务类型查询设备种类，工作台使用", notes = "按照业务类型查询设备种类，工作台使用")
+    public ResponseModel<List<DictionarieValueModel>> equList(@RequestParam(value = "type") String bizType) {
+        // 在平台字典配置的自定义业务的设备种类：格式{bizType}_SBZL,如BF_YZ_SBZL==》移装注销-设备种类
+        String suffix = "_SBZL";
+        String dictCode = bizType + suffix;
+        return ResponseHelper.buildResponse(Systemctl.dictionarieClient.dictValues(dictCode).getResult());
+    }
+
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @GetMapping(value = "/equ-category/{categoryCode}/list")
+    @ApiOperation(httpMethod = "GET", value = "按照业务类型、设备种类查询设备类别", notes = "按照业务类型、设备种类查询设备类别")
+    public ResponseModel<List<DictionarieValueModel>> equCategoryList(@RequestParam(value = "type") String bizType,
+                                                                      @PathVariable String categoryCode) {
+        // 在平台字典配置的自定义业务的设备种类：格式{bizType}_{categoryCode},如BF_YZ_1000==》移装注销-锅炉
+        String dictCode = String.format("%s_%s", bizType, categoryCode);
+        return ResponseHelper.buildResponse(Systemctl.dictionarieClient.dictValues(dictCode).getResult());
+    }
+
+
 }