Merge branch 'developer' of http://39.98.45.134:8090/moa/amos-boot-biz into developer

amos-boot-data/amos-boot-data-openapi/src/main/java/com/yeejoin/amos/api/openapi/controller/SuperviseController.java

@@ -82,8 +82,7 @@ public class SuperviseController {
     @ApiOperation(value = "新增设计信息")
     @PostMapping(value = "/designInfo")
     @RestEventTrigger(value = "openapiLogEventHandler")
-    public ResponseModel<String> saveDesignInfo (@RequestBody List<DesignInfo> designInfo) throws Exception
-    {
+    public ResponseModel<String> saveDesignInfo(@RequestBody List<DesignInfo> designInfo) throws Exception {
         return ResponseHelper.buildResponse(designInfoService.saveDesignInfo(designInfo));
     }
 
@@ -91,8 +90,7 @@ public class SuperviseController {
     @ApiOperation(value = "新增制造信息")
     @PostMapping(value = "/produceInfo")
     @RestEventTrigger(value = "openapiLogEventHandler")
-    public ResponseModel<String> saveProduceInfo (@RequestBody List<ProduceInfoModel> produceInfo) throws Exception
-    {
+    public ResponseModel<String> saveProduceInfo(@RequestBody List<ProduceInfoModel> produceInfo) throws Exception {
         return ResponseHelper.buildResponse(produceInfoService.saveProduceInfo(produceInfo));
     }
 
@@ -100,8 +98,7 @@ public class SuperviseController {
     @ApiOperation(value = "新增施工信息")
     @PostMapping(value = "/constructionInfo")
     @RestEventTrigger(value = "openapiLogEventHandler")
-    public ResponseModel<String> saveConstructionInfo (@RequestBody List<ConstructionInfo> constructionInfo) throws Exception
-    {
+    public ResponseModel<String> saveConstructionInfo(@RequestBody List<ConstructionInfo> constructionInfo) throws Exception {
         return ResponseHelper.buildResponse(constructionInfoService.saveConstructionInfo(constructionInfo));
     }
 
@@ -109,8 +106,7 @@ public class SuperviseController {
     @ApiOperation(value = "新增注册等级信息")
     @PostMapping(value = "/registrationInfo")
     @RestEventTrigger(value = "openapiLogEventHandler")
-    public ResponseModel<String> saveRegistrationInfo (@RequestBody List<RegistrationInfoModel> registrationInfo) throws Exception
-    {
+    public ResponseModel<String> saveRegistrationInfo(@RequestBody List<RegistrationInfoModel> registrationInfo) throws Exception {
         return ResponseHelper.buildResponse(registrationInfoService.saveRegistrationInfo(registrationInfo));
     }
 
@@ -118,8 +114,7 @@ public class SuperviseController {
     @ApiOperation(value = "新增使用信息")
     @PostMapping(value = "/useInfo")
     @RestEventTrigger(value = "openapiLogEventHandler")
-    public ResponseModel<String> saveUseInfo (@RequestBody List<UseInfo> useInfo) throws Exception
-    {
+    public ResponseModel<String> saveUseInfo(@RequestBody List<UseInfo> useInfo) throws Exception {
         return ResponseHelper.buildResponse(useInfoService.saveUseInfo(useInfo));
     }
 
@@ -127,8 +122,7 @@ public class SuperviseController {
     @ApiOperation(value = "新增维保单位信息")
     @PostMapping(value = "/maintenanceInfo")
     @RestEventTrigger(value = "openapiLogEventHandler")
-    public ResponseModel<String> saveMaintenanceInfo (@RequestBody List<MaintenanceInfoModel> maintenanceInfo) throws Exception
-    {
+    public ResponseModel<String> saveMaintenanceInfo(@RequestBody List<MaintenanceInfoModel> maintenanceInfo) throws Exception {
         return ResponseHelper.buildResponse(maintenanceInfoService.saveMaintenanceInfo(maintenanceInfo));
     }
 
@@ -136,8 +130,7 @@ public class SuperviseController {
     @ApiOperation(value = "新增监督管理信息")
     @PostMapping(value = "/superviseInfo")
     @RestEventTrigger(value = "openapiLogEventHandler")
-    public ResponseModel<String> saveSuperviseInfo (@RequestBody List<SuperviseInfo> superviseInfo) throws Exception
-    {
+    public ResponseModel<String> saveSuperviseInfo(@RequestBody List<SuperviseInfo> superviseInfo) throws Exception {
         return ResponseHelper.buildResponse(superviseInfoService.saveSuperviseInfo(superviseInfo));
     }
 
@@ -145,8 +138,7 @@ public class SuperviseController {
     @ApiOperation(value = "新增其他信息")
     @PostMapping(value = "/otherInfo")
     @RestEventTrigger(value = "openapiLogEventHandler")
-    public ResponseModel<String> saveOtherInfo (@RequestBody List<OtherInfo> otherInfo) throws Exception
-    {
+    public ResponseModel<String> saveOtherInfo(@RequestBody List<OtherInfo> otherInfo) throws Exception {
         return ResponseHelper.buildResponse(otherInfoService.saveOtherInfo(otherInfo));
     }
 
@@ -154,8 +146,7 @@ public class SuperviseController {
     @ApiOperation(value = "新增电梯技术参数")
     @PostMapping(value = "/elevatorTechInfo")
     @RestEventTrigger(value = "openapiLogEventHandler")
-    public ResponseModel<String> saveElevatorTechInfo (@RequestBody List<ElevatorTechInfoModel> elevatorTechInfo) throws Exception
-    {
+    public ResponseModel<String> saveElevatorTechInfo(@RequestBody List<ElevatorTechInfoModel> elevatorTechInfo) throws Exception {
         return ResponseHelper.buildResponse(evatorTechInfoService.saveElevatorTechInfo(elevatorTechInfo));
     }
 
@@ -163,8 +154,7 @@ public class SuperviseController {
     @ApiOperation(value = "新增特种设备附件资料信息")
     @PostMapping(value = "/enclosureInfo")
     @RestEventTrigger(value = "openapiLogEventHandler")
-    public ResponseModel<String> saveEnclosureInfo (@RequestBody List<EnclosureInfo> enclosureInfo) throws Exception
-    {
+    public ResponseModel<String> saveEnclosureInfo(@RequestBody List<EnclosureInfo> enclosureInfo) throws Exception {
         return ResponseHelper.buildResponse(enclosureInfoService.saveEnclosureInfo(enclosureInfo));
     }
 
@@ -172,8 +162,7 @@ public class SuperviseController {
     @ApiOperation(value = "新增企业数据信息")
     @PostMapping(value = "/enterpriseInfo")
     @RestEventTrigger(value = "openapiLogEventHandler")
-    public ResponseModel<String> saveEnterpriseInfo (@RequestBody List<EnterpriseInfoModel> enterpriseInfo) throws Exception
-    {
+    public ResponseModel<String> saveEnterpriseInfo(@RequestBody List<EnterpriseInfoModel> enterpriseInfo) throws Exception {
         return ResponseHelper.buildResponse(enterpriseInfoService.saveEnterpriseInfo(enterpriseInfo));
     }
 
@@ -181,8 +170,7 @@ public class SuperviseController {
     @ApiOperation(value = "新增人员基本信息")
     @PostMapping(value = "/staffBaseInfo")
     @RestEventTrigger(value = "openapiLogEventHandler")
-    public ResponseModel<String> saveStaffBaseInfo (@RequestBody List<StaffBaseInfo> staffBaseInfo) throws Exception
-    {
+    public ResponseModel<String> saveStaffBaseInfo(@RequestBody List<StaffBaseInfo> staffBaseInfo) throws Exception {
         return ResponseHelper.buildResponse(staffBaseInfoService.saveStaffBaseInfo(staffBaseInfo));
     }
 
@@ -190,8 +178,7 @@ public class SuperviseController {
     @ApiOperation(value = "新增人员资质信息")
     @PostMapping(value = "/staffQualifInfo")
     @RestEventTrigger(value = "openapiLogEventHandler")
-    public ResponseModel<String> saveStaffQualifInfo (@RequestBody List<StaffQualifInfoModel> staffQualifInfo) throws Exception
-    {
+    public ResponseModel<String> saveStaffQualifInfo(@RequestBody List<StaffQualifInfoModel> staffQualifInfo) throws Exception {
         return ResponseHelper.buildResponse(staffQualifInfoService.saveStaffQualifInfo(staffQualifInfo));
     }
 
@@ -199,8 +186,7 @@ public class SuperviseController {
     @ApiOperation(value = "特种设备检验信息")
     @PostMapping(value = "/inspectionInfo")
     @RestEventTrigger(value = "openapiLogEventHandler")
-    public ResponseModel<String> saveInspectionInfo (@RequestBody List<InspectionInfoModel> inspectionInfo) throws Exception
-    {
+    public ResponseModel<String> saveInspectionInfo(@RequestBody List<InspectionInfoModel> inspectionInfo) throws Exception {
         return ResponseHelper.buildResponse(inspectionInfoService.saveInspectionInfo(inspectionInfo));
     }
 
@@ -208,7 +194,7 @@ public class SuperviseController {
     @ApiOperation(value = "查询许可信息")
     @GetMapping(value = "/licenceInfo")
     @RestEventTrigger(value = "openapiLogEventHandler")
-    public ResponseModel<List<UnitLicenceModel>> getLicenceInfo (@RequestParam String unitCode) {
+    public ResponseModel<List<UnitLicenceModel>> getLicenceInfo(@RequestParam String unitCode) {
         return ResponseHelper.buildResponse(unitLicenceService.getLicenceInfo(unitCode));
     }
 
@@ -216,8 +202,7 @@ public class SuperviseController {
     @ApiOperation(value = "新增特种设备附件资料信息")
     @PostMapping(value = "/techInfo")
     @RestEventTrigger(value = "openapiLogEventHandler")
-    public ResponseModel<String> saveTechInfo (@RequestBody List<JSONObject> techInfo)
-    {
+    public ResponseModel<String> saveTechInfo(@RequestBody List<JSONObject> techInfo) {
         return ResponseHelper.buildResponse(techInfoService.saveTechInfo(techInfo));
     }
 
@@ -226,7 +211,15 @@ public class SuperviseController {
     @ApiOperation(value = "赋码")
     @PostMapping(value = "/generation/code")
     @RestEventTrigger(value = "openapiLogEventHandler")
-    public ResponseModel<Map<String,Object>> createCode (@RequestBody Map<String,Object> map){
+    public ResponseModel<Map<String, Object>> createCode(@RequestBody Map<String, Object> map) {
         return ResponseHelper.buildResponse(createCodeService.createCode(map));
     }
+
+    @TycloudOperation(ApiLevel = UserType.AGENCY, needAuth = false)
+    @ApiOperation(value = "检验检测信息")
+    @GetMapping(value = "/inspectionInfo")
+    @RestEventTrigger(value = "openapiLogEventHandler")
+    public ResponseModel<InspectionDetectionInfoModel> selectInspect(@RequestParam String superviseCode) {
+        return ResponseHelper.buildResponse(inspectionInfoService.selectInspect(superviseCode));
+    }
 }

amos-boot-data/amos-boot-data-openapi/src/main/java/com/yeejoin/amos/api/openapi/enums/InspectionEnum.java

+package com.yeejoin.amos.api.openapi.enums;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+import java.util.*;
+
+@AllArgsConstructor
+@Getter
+public enum InspectionEnum {
+
+    HG("6040", "合格"),
+    BHG("6041", "不合格"),
+    FJHG("6042", "复检合格"),
+    FJBHG("6043", "复检不合格"),
+    QT("6044", "其他"),
+
+    JDJC("6038", "监督检查"),
+    DQJC("6039", "定期检查"),
+    ZXJC("6206", "自行检测(电梯)");
+
+    String code;
+    String value;
+    public static Map<String,String> codeValue = new HashMap<>();
+
+    static {
+        for(InspectionEnum e: InspectionEnum.values()){
+            codeValue.put(e.code, e.value);
+        }
+    }
+}

amos-boot-data/amos-boot-data-openapi/src/main/java/com/yeejoin/amos/api/openapi/face/service/InspectionInfoService.java

 package com.yeejoin.amos.api.openapi.face.service;
 
 import com.alibaba.fastjson.JSONObject;
+import com.yeejoin.amos.api.openapi.enums.InspectionEnum;
 import com.yeejoin.amos.api.openapi.enums.JgFileAttributeEnum;
 import com.yeejoin.amos.api.openapi.enums.JgFileObjectEnum;
+import com.yeejoin.amos.api.openapi.face.model.InspectionDetectionInfoModel;
 import com.yeejoin.amos.api.openapi.face.model.InspectionInfoModel;
 import com.yeejoin.amos.api.openapi.face.orm.dao.InspectionInfoMapper;
-import com.yeejoin.amos.api.openapi.face.orm.entity.JgFile;
 import com.yeejoin.amos.api.openapi.face.orm.entity.InspectionInfo;
+import com.yeejoin.amos.api.openapi.face.orm.entity.JgFile;
+import com.yeejoin.amos.api.openapi.feign.TzsServiceFeignClient;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 import org.springframework.transaction.annotation.Transactional;
@@ -29,6 +32,8 @@ public class InspectionInfoService extends AppBaseService<InspectionInfoModel, I
     @Autowired
     private JgFileService fileService;
 
+    @Autowired
+    TzsServiceFeignClient tzsServiceFeignClient;
     /**
      *
      * 新增特种设备检验信息
@@ -122,4 +127,11 @@ public class InspectionInfoService extends AppBaseService<InspectionInfoModel, I
             throw new BadRequest("设备标识码为："+models.getSequenceCode()+"的设备，"+"同步状态不能为空！");
         }
     }
+
+    public InspectionDetectionInfoModel selectInspect(String superviseCode){
+        InspectionDetectionInfoModel inspection = tzsServiceFeignClient.selectInspect(superviseCode).getResult();
+        inspection.setInspectType(InspectionEnum.codeValue.get(inspection.getInspectType()));
+        inspection.setInspectConclusion(InspectionEnum.codeValue.get(inspection.getInspectConclusion()));
+        return inspection;
+    }
 }

amos-boot-data/amos-boot-data-openapi/src/main/java/com/yeejoin/amos/api/openapi/feign/TzsServiceFeignClient.java

@@ -2,6 +2,7 @@ package com.yeejoin.amos.api.openapi.feign;
 
 
 import com.yeejoin.amos.api.openapi.config.MultipartSupportConfig;
+import com.yeejoin.amos.api.openapi.face.model.InspectionDetectionInfoModel;
 import com.yeejoin.amos.api.openapi.face.model.UnitLicenceModel;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -19,6 +20,7 @@ public interface TzsServiceFeignClient {
 
     /**
      * 根据企业名称查询许可信息
+     *
      * @param unitCode 企业唯一编码
      * @return
      */
@@ -28,9 +30,19 @@ public interface TzsServiceFeignClient {
 
     /**
      * 创建监管码及96333
+     *
      * @param map 请求体
      * @return
      */
     @RequestMapping(value = "/equipment-category/createSupervisorCode", method = RequestMethod.POST)
-    ResponseModel<Map<String,Object>> createCode(@RequestBody Map<String,Object> map);
+    ResponseModel<Map<String, Object>> createCode(@RequestBody Map<String, Object> map);
+
+    /**
+     * 检验检测信息（查询）
+     *
+     * @param superviseCode 监管码
+     * @return
+     */
+    @RequestMapping(value = "/api/inspectiondetectioninfo/selectInspect", method = RequestMethod.GET)
+    ResponseModel<InspectionDetectionInfoModel> selectInspect(@RequestParam String superviseCode);
 }

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

 package com.yeejoin.amos.boot.module.tzs.biz.controller;
 
-import java.util.Arrays;
-import java.util.Map;
-
+import com.yeejoin.amos.boot.biz.common.controller.BaseController;
 import com.yeejoin.amos.boot.module.tzs.api.dto.InspectionDetectionInfoDto;
-import com.yeejoin.amos.boot.module.tzs.api.dto.MaintainInfoDto;
-import com.yeejoin.amos.boot.module.tzs.api.entity.InspectionDetectionInfo;
 import com.yeejoin.amos.boot.module.tzs.biz.service.impl.InspectionDetectionInfoServiceImpl;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-
-import com.yeejoin.amos.boot.biz.common.controller.BaseController;
-
-
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 import org.typroject.tyboot.core.foundation.enumeration.UserType;
 import org.typroject.tyboot.core.restful.doc.TycloudOperation;
 import org.typroject.tyboot.core.restful.utils.ResponseHelper;
@@ -40,10 +34,10 @@ public class InspectionDetectionInfoController extends BaseController {
      * @return
      */
     @TycloudOperation(ApiLevel = UserType.AGENCY,needAuth = false)
-    @GetMapping(value = "/selectSpect")
+    @GetMapping(value = "/selectInspect")
     @ApiOperation(httpMethod = "GET", value = "检验检测信息（查询）", notes = "检验检测信息（查询）")
-    public ResponseModel<InspectionDetectionInfoDto> selectSpect(String superviseCode) {
-        return ResponseHelper.buildResponse(infoService.selectSpect(superviseCode));
+    public ResponseModel<InspectionDetectionInfoDto> selectInspect(String superviseCode) {
+        return ResponseHelper.buildResponse(infoService.selectInspect(superviseCode));
     }
 
 

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

@@ -22,7 +22,7 @@ public class InspectionDetectionInfoServiceImpl extends BaseService<InspectionDe
 
 @Autowired
 private InspectionDetectionInfoMapper inspectionDetectionInfo;
-    public InspectionDetectionInfoDto selectSpect(String superviseCode) {
+    public InspectionDetectionInfoDto selectInspect(String superviseCode) {
         InspectionDetectionInfoDto inspectionDetectionInfoDto = new InspectionDetectionInfoDto();
         if (ValidationUtil.isEmpty(superviseCode)) {
             return  inspectionDetectionInfoDto;