Merge remote-tracking branch 'origin/develop_tzs_register_sxs' into develop_tzs_register_sxs

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

@@ -626,6 +626,7 @@
         WHERE
         ri."EQU_DEFINE" = '23T0'
         and ui."DATA_SOURCE" like 'jg%'
+        and ui."DATA_SOURCE" not like 'jg_his%'
         and ri.whether_vehicle_cylinder = 1
         -- 保证使用单位选择设备时（record为null） 能选择到本单位的设备 并且 监管单位在查看时（record 不为null）可以匹配到所有的设备
         <if test="jsonObject.useUnitCreditCode != null and jsonObject.useUnitCreditCode != '' and jsonObject.record == null">

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

@@ -22,12 +22,14 @@ 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 javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
 import java.net.URLEncoder;
 import java.util.*;
+import java.util.stream.Collectors;
 
 /**
  * 设备注册
@@ -39,6 +41,7 @@ import java.util.*;
 @RestController
 @Api(tags = "设备注册Api")
 @RequestMapping(value = "/equipment-register")
+@CrossOrigin("*")
 public class IdxBizJqEquipmentRegisterController extends BaseController {
     @Autowired
     IIdxBizJgRegisterInfoService idxBizJgRegisterInfoService;
@@ -117,7 +120,8 @@ public class IdxBizJqEquipmentRegisterController extends BaseController {
         JSONObject jsonObject = new JSONObject(map);
         return ResponseHelper.buildResponse(idxBizJgRegisterInfoService.queryForEquipmentRegisterPage(jsonObject));
     }
-//    /**
+
+    //    /**
 //     * 查询设备注册列表
 //     *
 //     * @param map
@@ -134,17 +138,23 @@ public class IdxBizJqEquipmentRegisterController extends BaseController {
     @GetMapping(value = "/category/list")
     @ApiOperation(httpMethod = "GET", value = "查询不同单位类型可新增的设备种类列表", notes = "查询不同单位类型可新增的设备种类列表")
     public ResponseModel<List<DictionarieValueModel>> equCategoryListByCompanyType() {
-        return ResponseHelper.buildResponse(idxBizJgRegisterInfoService.equCategoryListByCompanyType(getSelectedOrgInfo(), null, null,null, null));
+        return ResponseHelper.buildResponse(idxBizJgRegisterInfoService.equCategoryListByCompanyType(getSelectedOrgInfo(), null, null, null, null));
     }
 
     @TycloudOperation(ApiLevel = UserType.AGENCY)
     @GetMapping(value = "/equ-category/listByPersonAndEquList")
     @ApiOperation(httpMethod = "GET", value = "按照人员身份、设备种类查询设备类别", notes = "按照人员身份、设备种类查询设备类别")
     public ResponseModel<List<DictionarieValueModel>> equCategoryList(@RequestParam(value = "equList") String equList,
-                                                                      @RequestParam(value = "dataSource",required = false) String dataSource,
-                                                                      @RequestParam(value = "businessScenarios",required = false) String businessScenarios,
-                                                                      @RequestParam(value = "type",required = false) String type) {
-        return ResponseHelper.buildResponse(idxBizJgRegisterInfoService.equCategoryListByCompanyType(getSelectedOrgInfo(), equList, businessScenarios,dataSource, type));
+                                                                      @RequestParam(value = "dataSource", required = false) String dataSource,
+                                                                      @RequestParam(value = "businessScenarios", required = false) String businessScenarios,
+                                                                      @RequestParam(value = "type", required = false) String type) {
+
+        List<DictionarieValueModel> dictionarieValueModels = idxBizJgRegisterInfoService.equCategoryListByCompanyType(getSelectedOrgInfo(), equList, businessScenarios, dataSource, type);
+        //bug 24467 新增历史设备--有移动式压力容器，需禁用或者删除
+        if ("his".equals(dataSource) && "2000".equals(equList) && "SB_XZ".equals(type) && "0".equals(businessScenarios)) {
+            dictionarieValueModels = dictionarieValueModels.stream().filter(dictionarieValueModel -> !dictionarieValueModel.getDictDataValue().equals("移动式压力容器")).collect(Collectors.toList());
+        }
+        return ResponseHelper.buildResponse(dictionarieValueModels);
     }
 
     @TycloudOperation(ApiLevel = UserType.AGENCY)
@@ -163,6 +173,7 @@ public class IdxBizJqEquipmentRegisterController extends BaseController {
         JSONObject jsonObject = new JSONObject(queryMap);
         return ResponseHelper.buildResponse(idxBizJgRegisterInfoService.queryEquipCanUsedByVesselPage(jsonObject));
     }
+
     @TycloudOperation(ApiLevel = UserType.AGENCY)
     @GetMapping(value = "/equipCanUsedByVessel/pageHistory")
     @ApiOperation(httpMethod = "GET", value = "查询车用气瓶可进行选择的设备列表", notes = "查询车用气瓶可进行选择的设备列表")
@@ -170,6 +181,7 @@ public class IdxBizJqEquipmentRegisterController extends BaseController {
         JSONObject jsonObject = new JSONObject(queryMap);
         return ResponseHelper.buildResponse(idxBizJgRegisterInfoService.queryEquipCanUsedByVesselPageHistory(jsonObject));
     }
+
     /**
      * 压力容器设备批量导入
      */
@@ -177,25 +189,24 @@ public class IdxBizJqEquipmentRegisterController extends BaseController {
     @TycloudOperation(ApiLevel = UserType.AGENCY)
     @ApiOperation(value = "压力容器设备批量导入")
     @RestEventTrigger(value = "operateLogRestEventHandler")
-    public ResponseModel<?> importPressureVesselData(@RequestBody Map<String, Object> paramMap,@RequestPart MultipartFile multipartFile) {
+    public ResponseModel<?> importPressureVesselData(@RequestBody Map<String, Object> paramMap, @RequestPart MultipartFile multipartFile) {
         return ResponseHelper.buildResponse(idxBizJgRegisterInfoService.importPressureVesselData(paramMap, multipartFile));
     }
 
     /**
-     *
      * 气瓶批量导入
-     * **/
+     **/
     @TycloudOperation(ApiLevel = UserType.AGENCY)
     @PostMapping(value = "/importData")
     @ApiOperation(httpMethod = "POST", value = "气瓶批量导入", notes = "气瓶批量导入")
     @RestEventTrigger(value = "operateLogRestEventHandler")
-    public ResponseModel<?> importPressureData (@RequestPart("file") MultipartFile multipartFile) throws Exception {
+    public ResponseModel<?> importPressureData(@RequestPart("file") MultipartFile multipartFile) throws Exception {
         return ResponseHelper.buildResponse(idxBizJgRegisterInfoService.importPressureData(multipartFile));
     }
 
     /**
      * 气瓶批量保存
-     * **/
+     **/
     @TycloudOperation(ApiLevel = UserType.AGENCY)
     @PostMapping(value = "/savePressureVesselData")
     @ApiOperation(httpMethod = "POST", value = "气瓶批量保存", notes = "气瓶批量保存")
@@ -264,24 +275,26 @@ public class IdxBizJqEquipmentRegisterController extends BaseController {
 
     /**
      * 根据时间范围查询电梯数据
-     * @param equCode 设备代码
+     *
+     * @param equCode   设备代码
      * @param startTime 开始时间
-     * @param endTime 结束时间
+     * @param endTime   结束时间
      * @return 电梯数据
      */
     @TycloudOperation(ApiLevel = UserType.AGENCY)
     @GetMapping(value = "/getElevatorInfo")
     @ApiOperation(httpMethod = "GET", value = "查询电梯信息列表", notes = "查询电梯信息列表")
-    public ResponseModel<IPage<Map<String, Object>>> getElevatorInfo(@RequestParam(value = "equCode",required = false) String equCode,
-                                                                 @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") Date startTime,
-                                                                 @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") Date endTime,
-                                                                 PageParam pageParam) {
+    public ResponseModel<IPage<Map<String, Object>>> getElevatorInfo(@RequestParam(value = "equCode", required = false) String equCode,
+                                                                     @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") Date startTime,
+                                                                     @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") Date endTime,
+                                                                     PageParam pageParam) {
 
         return ResponseHelper.buildResponse(idxBizJgRegisterInfoService.getElevatorInfo(equCode, startTime, endTime, pageParam));
     }
 
     /**
      * 查询气站信息
+     *
      * @return 查询气站信息
      */
     @TycloudOperation(ApiLevel = UserType.AGENCY)
@@ -293,26 +306,28 @@ public class IdxBizJqEquipmentRegisterController extends BaseController {
 
     /**
      * 车用气气瓶档案
+     *
      * @return 车用气气瓶档案
      */
     @TycloudOperation(ApiLevel = UserType.AGENCY)
     @GetMapping(value = "/getVehicleCylinderInfo")
     @ApiOperation(httpMethod = "GET", value = "车用气气瓶档案", notes = "车用气气瓶档案")
-    public ResponseModel<List<Map<String, Object>>> getVehicleCylinderInfo(@RequestParam(value = "useCode") String useCode){
+    public ResponseModel<List<Map<String, Object>>> getVehicleCylinderInfo(@RequestParam(value = "useCode") String useCode) {
         return ResponseHelper.buildResponse(idxBizJgRegisterInfoService.getVehicleCylinderInfo(useCode));
     }
 
     /**
      * 根据时间范围查询液化石油气瓶档案
-     * @param equCode 设备代码
+     *
+     * @param equCode   设备代码
      * @param startTime 开始时间
-     * @param endTime 结束时间
+     * @param endTime   结束时间
      * @return 电梯数据
      */
     @TycloudOperation(ApiLevel = UserType.AGENCY)
     @GetMapping(value = "/getCylinderInfo")
     @ApiOperation(httpMethod = "GET", value = "根据时间范围查询液化石油气瓶档案", notes = "根据时间范围查询液化石油气瓶档案")
-    public ResponseModel<IPage<Map<String, Object>>> getCylinderInfo(@RequestParam(value = "equCode",required = false) String equCode,
+    public ResponseModel<IPage<Map<String, Object>>> getCylinderInfo(@RequestParam(value = "equCode", required = false) String equCode,
                                                                      @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") Date startTime,
                                                                      @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") Date endTime,
                                                                      PageParam pageParam) {
@@ -330,7 +345,7 @@ public class IdxBizJqEquipmentRegisterController extends BaseController {
     @ApiOperation(httpMethod = "GET", value = "初始化接口，调用一次，企业许可到期提醒", notes = "初始化接口，调用一次，企业许可到期提醒")
     public ResponseModel<String> initEnterpriseLicenseExpirationOnce() {
         idxBizJgRegisterInfoService.initEnterpriseLicenseExpirationOnce();
-        return  ResponseHelper.buildResponse("ok");
+        return ResponseHelper.buildResponse("ok");
     }
 
     /**
@@ -343,7 +358,7 @@ public class IdxBizJqEquipmentRegisterController extends BaseController {
     @ApiOperation(httpMethod = "GET", value = "初始化接口，调用一次，人员资质过期提醒", notes = "初始化接口，调用一次，人员资质过期提醒")
     public ResponseModel<String> initUserExpirationReminderOnce() {
         idxBizJgRegisterInfoService.initUserExpirationReminderOnce();
-        return  ResponseHelper.buildResponse("ok");
+        return ResponseHelper.buildResponse("ok");
     }
 
     /**
@@ -356,6 +371,6 @@ public class IdxBizJqEquipmentRegisterController extends BaseController {
     @ApiOperation(httpMethod = "GET", value = "初始化接口，调用一次，检验有效期到期提醒", notes = "初始化接口，调用一次，检验有效期到期提醒")
     public ResponseModel<String> inspectionExpirationReminderOnce() {
         idxBizJgRegisterInfoService.inspectionExpirationReminderOnce();
-        return  ResponseHelper.buildResponse("ok");
+        return ResponseHelper.buildResponse("ok");
     }
 }

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

@@ -31,6 +31,9 @@ import com.yeejoin.amos.boot.module.ymt.api.entity.*;
 import com.yeejoin.amos.boot.module.ymt.api.enums.ApplicationFormTypeEnum;
 import com.yeejoin.amos.boot.module.ymt.api.enums.FlowStatusEnum;
 import com.yeejoin.amos.boot.module.ymt.api.mapper.*;
+import com.yeejoin.amos.component.feign.model.FeignClientResult;
+import com.yeejoin.amos.feign.privilege.Privilege;
+import com.yeejoin.amos.feign.privilege.model.AgencyUserModel;
 import com.yeejoin.amos.feign.systemctl.model.TaskV2Model;
 import com.yeejoin.amos.feign.workflow.Workflow;
 import com.yeejoin.amos.feign.workflow.model.*;
@@ -1218,9 +1221,10 @@ public class JgChangeRegistrationUnitServiceImpl extends BaseService<JgChangeReg
     }
 
     private String buildRecordContent(JgChangeRegistrationUnit obj) {
+        FeignClientResult<AgencyUserModel> agencyUserModelFeignClientResult = Privilege.agencyUserClient.queryByUserId(obj.getCreateUserId());
         //张三办理了【单位变更】 ，单号【DWBG202407050001】，原恒星电梯单位变更为新恒星电梯有限公司，办理日期2024-07-05
         SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy年MM月dd日");
-        return obj.getUseUnitName()+"的"+obj.getCreateUserName() + "办理了【单位变更登记】，单号【"
+        return obj.getUseUnitName()+"的"+agencyUserModelFeignClientResult.getResult().getRealName() + "办理了【单位变更登记】，单号【"
                 + obj.getApplyNo() + "】，原" + obj.getUseUnitName() + "变更为新"
                 + obj.getNewUseUnitName() + "，申请日期" + simpleDateFormat.format(obj.getCreateDate());
     }

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

@@ -50,8 +50,10 @@ import com.yeejoin.amos.boot.module.ymt.api.enums.ApplicationFormTypeEnum;
 import com.yeejoin.amos.boot.module.ymt.api.enums.EquCodeTypeEnum;
 import com.yeejoin.amos.boot.module.ymt.api.enums.FlowStatusEnum;
 import com.yeejoin.amos.boot.module.ymt.api.mapper.*;
+import com.yeejoin.amos.component.feign.model.FeignClientResult;
 import com.yeejoin.amos.component.robot.AmosRequestContext;
 import com.yeejoin.amos.feign.privilege.Privilege;
+import com.yeejoin.amos.feign.privilege.model.AgencyUserModel;
 import com.yeejoin.amos.feign.privilege.model.CompanyModel;
 import com.yeejoin.amos.feign.systemctl.model.TaskV2Model;
 import com.yeejoin.amos.feign.workflow.model.ActWorkflowBatchDTO;
@@ -1366,9 +1368,10 @@ public class JgInstallationNoticeServiceImpl extends BaseService<JgInstallationN
     }
 
     private String buildRecordContent(JgInstallationNotice obj) {
+        FeignClientResult<AgencyUserModel> agencyUserModelFeignClientResult = Privilege.agencyUserClient.queryByUserId(obj.getCreateUserId());
         //张三办理了【单位变更】 ，单号【DWBG202407050001】，办理日期2024-07-05
         SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy年MM月dd日");
-        return  obj.getUseUnitName()+"的"+obj.getCreateUserName() + "办理了【" + BusinessTypeEnum.JG_INSTALLATION_NOTIFICATION.getName() + "】，单号【"
+        return  obj.getUseUnitName()+"的"+agencyUserModelFeignClientResult.getResult().getRealName() + "办理了【" + BusinessTypeEnum.JG_INSTALLATION_NOTIFICATION.getName() + "】，单号【"
                 + obj.getApplyNo() + "】，申请日期" + simpleDateFormat.format(obj.getCreateDate());
     }
 

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

@@ -45,6 +45,7 @@ import com.yeejoin.amos.boot.module.ymt.api.common.StringUtil;
 import com.yeejoin.amos.boot.module.ymt.api.entity.*;
 import com.yeejoin.amos.boot.module.ymt.api.enums.*;
 import com.yeejoin.amos.boot.module.ymt.api.mapper.*;
+import com.yeejoin.amos.component.feign.model.FeignClientResult;
 import com.yeejoin.amos.feign.privilege.Privilege;
 import com.yeejoin.amos.feign.privilege.model.AgencyUserModel;
 import com.yeejoin.amos.feign.privilege.model.CompanyModel;
@@ -1368,9 +1369,11 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
     }
 
     private String buildRecordContent(JgUseRegistration obj, String businessName, Boolean flag) {
+        FeignClientResult<AgencyUserModel> agencyUserModelFeignClientResult = Privilege.agencyUserClient.queryByUserId(obj.getCreateUserId());
+
         //张三办理了【单位变更】 ，单号【DWBG202407050001】，办理日期2024-07-05
         SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy年MM月dd日");
-        return obj.getUseUnitName()+"的"+obj.getCreateUserName() + "办理了【" + businessName + (flag ? "设备增补" : "") + "】，" +
+        return obj.getUseUnitName()+"的"+agencyUserModelFeignClientResult.getResult().getRealName() + "办理了【" + businessName + (flag ? "设备增补" : "") + "】，" +
                 "单号【" + obj.getApplyNo() + "】，申请日期" + simpleDateFormat.format(obj.getRecDate());
     }
 

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

@@ -45,8 +45,10 @@ import com.yeejoin.amos.boot.module.ymt.api.enums.EquCodeTypeEnum;
 import com.yeejoin.amos.boot.module.ymt.api.enums.EquimentEnum;
 import com.yeejoin.amos.boot.module.ymt.api.enums.FlowStatusEnum;
 import com.yeejoin.amos.boot.module.ymt.api.mapper.*;
+import com.yeejoin.amos.component.feign.model.FeignClientResult;
 import com.yeejoin.amos.component.feign.utils.FeignUtil;
 import com.yeejoin.amos.feign.privilege.Privilege;
+import com.yeejoin.amos.feign.privilege.model.AgencyUserModel;
 import com.yeejoin.amos.feign.privilege.model.CompanyModel;
 import com.yeejoin.amos.feign.systemctl.Systemctl;
 import com.yeejoin.amos.feign.systemctl.model.DictionarieValueModel;
@@ -1650,9 +1652,10 @@ public class JgVehicleInformationServiceImpl extends BaseService<JgVehicleInform
     }
 
     private String buildRecordContent(JgVehicleInformation obj) {
+        FeignClientResult<AgencyUserModel> agencyUserModelFeignClientResult = Privilege.agencyUserClient.queryByUserId(obj.getCreateUserId());
         //张三办理了【单位变更】 ，单号【DWBG202407050001】，办理日期2024-07-05
         SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy年MM月dd日");
-        return obj.getUseUnitName()+"的"+ obj.getRecUserName() + "办理了【" + BusinessTypeEnum.JG_VEHICLE_GAS_APPLICATION.getName() + "】，" +
+        return obj.getUseUnitName()+"的"+ agencyUserModelFeignClientResult.getResult().getRealName() + "办理了【" + BusinessTypeEnum.JG_VEHICLE_GAS_APPLICATION.getName() + "】，" +
                 "单号【" + obj.getApplyNo() + "】，申请日期" + simpleDateFormat.format(obj.getRecDate());
     }