refactor(大编辑)：代码重构

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/java/com/yeejoin/amos/boot/module/jg/api/dto/BizRelationDataDto.java

@@ -48,11 +48,6 @@ public class BizRelationDataDto {
     private String recUserName;
 
     /**
-     * 更新人id
-     */
-    private String recUserId;
-
-    /**
      * 单位名称
      */
     private String unitName;

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

@@ -2,6 +2,7 @@ package com.yeejoin.amos.boot.module.jg.biz.controller;
 
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.yeejoin.amos.boot.biz.common.controller.BaseController;
 import com.yeejoin.amos.boot.module.jg.api.dto.RequestChangeData;
 import com.yeejoin.amos.boot.module.jg.biz.edit.BizDataChangeServiceImpl;
 import com.yeejoin.amos.boot.module.jg.biz.edit.process.biz.strategy.IBizDataChangeHandleStrategy;
@@ -22,7 +23,7 @@ import java.util.Map;
 @RequestMapping(value = "/data-change")
 @Api(tags = "业务数据变化处理控制器")
 @RequiredArgsConstructor
-public class BizDataChangeController {
+public class BizDataChangeController extends BaseController {
 
     public enum DetailType {
         equip,
@@ -82,7 +83,7 @@ public class BizDataChangeController {
                                         @RequestBody RequestChangeData changeData) {
         // 基础数据校验
         changeData.validated();
-        bizDataChangeService.save(applyNo, bizType, modelType, changeData);
+        bizDataChangeService.save(applyNo, bizType, modelType, changeData, getSelectedOrgInfo());
         return ResponseHelper.buildResponse("success");
     }
 

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/edit/BizDataChangeServiceImpl.java

@@ -2,7 +2,7 @@ package com.yeejoin.amos.boot.module.jg.biz.edit;
 
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.yeejoin.amos.boot.biz.common.bo.ReginParams;
 import com.yeejoin.amos.boot.module.jg.api.dto.RequestChangeData;
 import com.yeejoin.amos.boot.module.jg.biz.context.BizDataHandleStrategyContext;
 import com.yeejoin.amos.boot.module.jg.biz.controller.BizDataChangeController;
@@ -23,13 +23,14 @@ public class BizDataChangeServiceImpl {
      * @param bizType         业务类型
      * @param modelType       处理器类型
      * @param changeData      变化后的数据
+     * @param selectedOrgInfo
      */
     @Transactional(rollbackFor = Exception.class)
     public void save(String applyNo,
                      String bizType,
-                     IBizDataChangeHandleStrategy.ModelType modelType, RequestChangeData changeData) {
+                     IBizDataChangeHandleStrategy.ModelType modelType, RequestChangeData changeData, ReginParams selectedOrgInfo) {
         IBizDataChangeHandleStrategy handleStrategy = BizDataHandleStrategyContext.getStrategy(bizType);
-        handleStrategy.doSave(applyNo, modelType, changeData);
+        handleStrategy.doSave(applyNo, modelType, changeData, selectedOrgInfo);
     }
 
     public IPage<?> queryDetail(String applyNo, String bizType, BizDataChangeController.DetailType type, JSONObject searchParams) {

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/edit/event/listener/ChangeLogInsertListener.java

@@ -142,7 +142,7 @@ public class ChangeLogInsertListener {
                 .approvalUnit(event.getBizRelationData().getUnitName())
                 .approvalUnitCode(event.getBizRelationData().getUnitCode())
                 .createUserName(event.getBizRelationData().getRecUserName())
-                .createUserId(event.getBizRelationData().getRecUserId())
+                .createUserId(event.getRequestContext().getExcutedUserId())
                 .status("正常")
                 .build());
         return changeLog;

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/edit/process/biz/DefaultBizDataChangeHandler.java

@@ -2,6 +2,7 @@ package com.yeejoin.amos.boot.module.jg.biz.edit.process.biz;
 
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.yeejoin.amos.boot.biz.common.bo.ReginParams;
 import com.yeejoin.amos.boot.module.jg.api.dto.BizRelationDataDto;
 import com.yeejoin.amos.boot.module.jg.api.dto.FieldChangeMeta;
 import com.yeejoin.amos.boot.module.jg.biz.context.EquipDataProcessStrategyContext;
@@ -33,7 +34,7 @@ public abstract class DefaultBizDataChangeHandler<U extends BaseBizDataChangeEve
 
 
     @Override
-    public final void doSave(String applyNo, ModelType model, Map<String, Object> changeData) {
+    public final void doSave(String applyNo, ModelType model, Map<String, Object> changeData, ReginParams selectedOrgInfo) {
         if (beforeCheck(applyNo, model, changeData)) {
             JSONObject oData = new JSONObject(changeData);
             // 删除原始提交的变更说明及附件放置后续存放到json
@@ -48,11 +49,11 @@ public abstract class DefaultBizDataChangeHandler<U extends BaseBizDataChangeEve
                 allChangeColumns.addAll(equipColumns);
             }
             // 发送数据变更消息
-            publish2OtherBiz(allChangeColumns, applyNo, oData);
+            publish2OtherBiz(allChangeColumns, applyNo, oData, selectedOrgInfo);
         }
     }
 
-    private void publish2OtherBiz(List<FieldChangeMeta> allChangeColumns, String applyNo, JSONObject changeData) {
+    private void publish2OtherBiz(List<FieldChangeMeta> allChangeColumns, String applyNo, JSONObject changeData, ReginParams selectedOrgInfo) {
         if (!allChangeColumns.isEmpty()) {
             BizRelationDataDto bizRelationDataDto = new BizRelationDataDto();
             bizRelationDataDto.setBizId(applyNo);
@@ -61,6 +62,9 @@ public abstract class DefaultBizDataChangeHandler<U extends BaseBizDataChangeEve
             bizRelationDataDto.setChangeReason(changeData.getString("changeReason"));
             bizRelationDataDto.setChangeAttachment(JSONObject.toJSONString(changeData.get("changeAttachment")));
             bizRelationDataDto.setProjectContraptionIds(getProjectContraptionIds(applyNo));
+            bizRelationDataDto.setRecUserName(selectedOrgInfo.getUserModel().getUserName());
+            bizRelationDataDto.setUnitCode(selectedOrgInfo.getCompany().getCompanyCode());
+            bizRelationDataDto.setUnitName(selectedOrgInfo.getCompany().getCompanyName());
             eventPublisher.publish(new BaseBizDataChangeEvent(this, bizRelationDataDto, allChangeColumns, RequestContext.cloneRequestContext()));
         }
     }

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/edit/process/biz/strategy/IBizDataChangeHandleStrategy.java

@@ -2,7 +2,7 @@ package com.yeejoin.amos.boot.module.jg.biz.edit.process.biz.strategy;
 
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.yeejoin.amos.boot.biz.common.bo.ReginParams;
 import com.yeejoin.amos.boot.module.jg.api.dto.FieldChangeMeta;
 import com.yeejoin.amos.boot.module.jg.biz.controller.BizDataChangeController;
 
@@ -66,7 +66,7 @@ public interface IBizDataChangeHandleStrategy {
         singleEquip
     }
 
-    void doSave(String applyNo, ModelType model, Map<String, Object> changeData);
+    void doSave(String applyNo, ModelType model, Map<String, Object> changeData, ReginParams selectedOrgInfo);
 
     /**
      * 获取子表的设备或者使用登记证