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

safety-eval-adapter/src/main/java/org/qinan/safetyeval/adapter/web/AccountController.java

@@ -7,26 +7,18 @@ import com.jjb.saas.message.client.message.request.MessageTargetCmd;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
-import java.util.UUID;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.dubbo.config.annotation.DubboReference;
 import org.qinan.safetyeval.client.api.AccountApi;
 import org.qinan.safetyeval.client.co.AccountCO;
-import org.qinan.safetyeval.client.dto.AccountAddCmd;
-import org.qinan.safetyeval.client.dto.AccountModifyCmd;
-import org.qinan.safetyeval.client.dto.AccountPageQuery;
-import org.qinan.safetyeval.client.dto.PageResponse;
-import org.qinan.safetyeval.client.dto.SendMessageCmd;
-import org.qinan.safetyeval.client.dto.SingleResponse;
+import org.qinan.safetyeval.client.dto.*;
 import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.UUID;
 
 /**
  * 用户适配层（Controller）
@@ -83,13 +75,13 @@ public class AccountController {
         messageSendCmd.setBusinessId(UUID.randomUUID().toString().replace("-", ""));
 
         MessageTargetCmd messageTargetCmd = new MessageTargetCmd();
-        messageTargetCmd.setUserId(cmd.getUserId());
         messageTargetCmd.setMobile(cmd.getMobile());
         messageSendCmd.setTargetCmd(messageTargetCmd);
 
         messageSendCmd.setSourceCode("MS000146");
-        messageSendCmd.setNeedTokenEnum(false);
-        messageSendCmd.setParams(cmd.getParams());
+        Map<String, Object> codeMap = new HashMap<>();
+        codeMap.put("code", "512454");
+        messageSendCmd.setParams(codeMap);
 
         log.info("发送短信参数: messageSendCmd: {}", JSONUtil.toJsonStr(messageSendCmd));
         com.alibaba.cola.dto.SingleResponse<Boolean> result = messageFacade.send(messageSendCmd);

safety-eval-adapter/src/main/java/org/qinan/safetyeval/adapter/web/QualFilingChangeController.java

@@ -1,6 +1,5 @@
 package org.qinan.safetyeval.adapter.web;
 
-import com.jjb.saas.secure.context.AuthContext;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
@@ -9,7 +8,7 @@ import org.qinan.safetyeval.client.co.QualFilingChangeAggregationCO;
 import org.qinan.safetyeval.client.co.QualFilingChangeCO;
 import org.qinan.safetyeval.client.co.QualFilingChangeComplianceCheckResultCO;
 import org.qinan.safetyeval.client.dto.*;
-import org.qinan.safetyeval.infrastructure.adapter.ThreadLocalUserInfoAdapter;
+import org.qinan.safetyeval.infrastructure.utils.RequestHandlerUtil;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
@@ -45,7 +44,7 @@ public class QualFilingChangeController {
     @ApiOperation("分页查询备案变更-机构端")
     @GetMapping("/org/page")
     public PageResponse<QualFilingChangeCO> orgPage(@Validated QualFilingChangePageQuery query) {
-        Long orgId = ThreadLocalUserInfoAdapter.get();
+        Long orgId = RequestHandlerUtil.getOrgId();
         query.setOrgId(orgId);
         return qualFilingChangeApi.page(query);
     }

safety-eval-app/src/main/java/org/qinan/safetyeval/app/executor/QualFilingChangeExecutor.java

@@ -23,12 +23,14 @@ import org.qinan.safetyeval.domain.service.QualFilingChangeDomainService;
 import org.qinan.safetyeval.domain.service.QualFilingDomainService;
 import org.qinan.safetyeval.domain.service.QualFilingReviewDomainService;
 import org.qinan.safetyeval.infrastructure.adapter.auth.AuthUserContextAdapter;
+import org.qinan.safetyeval.infrastructure.utils.RequestHandlerUtil;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Lazy;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.CollectionUtils;
+import org.springframework.web.context.request.RequestContextHolder;
 
 import javax.annotation.Resource;
 import java.util.ArrayList;
@@ -214,6 +216,7 @@ public class QualFilingChangeExecutor implements QualFilingChangeApi {
 
         // 变更基本信息
         QualFilingChangeEntity entity = qualFilingChangeCmdConvertor.convertCmdToE(cmd.getQualFilingChangeAddCmd());
+        entity.setOrgId(RequestHandlerUtil.getOrgId());
 
         // 变更承诺书
         QualFilingCommitmentChangeE commitmentEntity = qualFilingCommitmentChangeCmdConvertor.convertCmdToE(cmd.getQualFilingCommitmentChangeAddCmd());

safety-eval-client/src/main/java/org/qinan/safetyeval/client/dto/AggregationSaveOrEditQualFilingChangeCmd.java

@@ -4,6 +4,7 @@ import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import org.qinan.safetyeval.client.change.request.*;
 
+import javax.validation.constraints.NotNull;
 import java.util.List;
 
 @Data
@@ -13,6 +14,7 @@ public class AggregationSaveOrEditQualFilingChangeCmd {
     private boolean add;
 
     @ApiModelProperty(value = "基本信息")
+    @NotNull
     private QualFilingChangeAddCmd qualFilingChangeAddCmd;
 
     @ApiModelProperty(value = "备案承诺书")

safety-eval-infrastructure/src/main/java/org/qinan/safetyeval/infrastructure/utils/RequestHandlerUtil.java

@@ -0,0 +1,20 @@
+package org.qinan.safetyeval.infrastructure.utils;
+
+import lombok.experimental.UtilityClass;
+import org.springframework.web.context.request.RequestContextHolder;
+import org.springframework.web.context.request.ServletRequestAttributes;
+
+@UtilityClass
+public class RequestHandlerUtil {
+
+
+    /**
+     * holder
+     *
+     * @return String
+     */
+    public static Long getOrgId() {
+        return Long.parseLong(((ServletRequestAttributes) RequestContextHolder
+                .getRequestAttributes()).getRequest().getHeader("orgInfoId"));
+    }
+}