Merge branch '20220614_sun修正联合惩戒相关问题' of sckj/mz-cloud into master

ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/RemoteJobService.java

@@ -15,6 +15,6 @@ import org.springframework.web.bind.annotation.RequestHeader;
 @FeignClient(contextId = "RemoteJobService", value = ServiceNameConstants.BUSINESS_SERVICE, fallbackFactory = RemoteJobFallbackFactory.class)
 public interface RemoteJobService {
 
-    @PostMapping("/lhcjGs/job")
-    public AjaxResult checkJob();
+    @PostMapping("/lhcjGs/checkJob")
+    public AjaxResult checkJob(@RequestHeader(SecurityConstants.FROM_SOURCE) String source);
 }

ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/factory/RemoteJobFallbackFactory.java

@@ -22,7 +22,7 @@ public class RemoteJobFallbackFactory implements FallbackFactory<RemoteJobServic
         return new RemoteJobService()
         {
             @Override
-            public AjaxResult checkJob() {
+            public AjaxResult checkJob(String source) {
                 return null;
             }
         };

ruoyi-gateway/src/main/resources/bootstrap.yml

@@ -42,7 +42,7 @@ spring:
       datasource:
         ds1:
           nacos:
-            server-addr: 121.36.73.159:8848
+            server-addr: 10.16.4.12:8848
             dataId: sentinel-ruoyi-gateway
             groupId: @nacos.discovery.group@
             namespace: @nacos.discovery.namespace@

ruoyi-modules/mz-business/src/main/java/com/ruoyi/business/controller/ZwywLhcjSxgsController.java

@@ -224,7 +224,7 @@ public class ZwywLhcjSxgsController extends BaseController
         return toAjax(zwywLhcjSxgsService.deleteZwywLhcjSxgsByIds(ids));
     }
 
-    @PostMapping(value = "/job")
+    @PostMapping(value = "/checkJob")
     public AjaxResult checkJob()
     {
         zwywLhcjSbServiceImpl.checkLhcjJob();

ruoyi-modules/mz-business/src/main/java/com/ruoyi/business/service/impl/ZwywLhcjSbServiceImpl.java

@@ -9,9 +9,15 @@ import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.bean.copier.CopyOptions;
 import com.ruoyi.business.domain.*;
 import com.ruoyi.business.mapper.*;
+import com.ruoyi.common.core.constant.SecurityConstants;
+import com.ruoyi.common.core.context.SecurityContextHolder;
+import com.ruoyi.common.core.domain.R;
 import com.ruoyi.common.core.exception.ServiceException;
 import com.ruoyi.common.core.utils.DateUtils;
+import com.ruoyi.common.core.utils.ServletUtils;
 import com.ruoyi.ext.api.enums.*;
+import com.ruoyi.system.api.RemoteUserService;
+import com.ruoyi.system.api.model.LoginUser;
 import org.apache.commons.lang3.ObjectUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
@@ -60,6 +66,9 @@ public class ZwywLhcjSbServiceImpl implements IZwywLhcjSbService
     @Autowired
     private ZwywLhcjGzsMapper zwywLhcjGzsMapper;
 
+    @Autowired
+    private RemoteUserService userService;
+
     /**
      * 查询联合惩戒申辩信息
      * 
@@ -271,6 +280,10 @@ public class ZwywLhcjSbServiceImpl implements IZwywLhcjSbService
         List<ZwywCyrySxxx> rySxxx = zwywCyrySxxxMapper.selectList(rySxxxLqw);
         for (ZwywYljgSxxx jg: jgSxxx) {
             try {
+                LoginUser user = userService.getUserInfo(jg.getCreateBy(), SecurityConstants.INNER).getData();
+                SecurityContextHolder.setUserId(String.valueOf(user.getUserid()));
+                SecurityContextHolder.setUserName(user.getUsername());
+                SecurityContextHolder.set(SecurityConstants.LOGIN_USER, user);
                 LambdaQueryWrapper<ZwywLhcjSxgs> lqw = new LambdaQueryWrapper<ZwywLhcjSxgs>()
                         .eq(ZwywLhcjSxgs::getSxxxId, jg.getId())
                         .eq(ZwywLhcjSxgs::getState, StateStatus.NORMAL.getCode());
@@ -308,6 +321,10 @@ public class ZwywLhcjSbServiceImpl implements IZwywLhcjSbService
         }
         for (ZwywCyrySxxx ry: rySxxx) {
             try {
+                LoginUser user = userService.getUserInfo(ry.getCreateBy(), SecurityConstants.INNER).getData();
+                SecurityContextHolder.setUserId(String.valueOf(user.getUserid()));
+                SecurityContextHolder.setUserName(user.getUsername());
+                SecurityContextHolder.set(SecurityConstants.LOGIN_USER, user);
                 LambdaQueryWrapper<ZwywLhcjSxgs> lqw = new LambdaQueryWrapper<ZwywLhcjSxgs>()
                         .eq(ZwywLhcjSxgs::getSxxxId, ry.getId())
                         .eq(ZwywLhcjSxgs::getState, StateStatus.NORMAL.getCode());
@@ -353,6 +370,12 @@ public class ZwywLhcjSbServiceImpl implements IZwywLhcjSbService
         List<ZwywCyryLhcjmd> ryMdList = zwywCyryLhcjmdMapper.selectList(ryMdLqw);
         Date now = new Date();
         jgMdList.forEach(j -> {
+            LoginUser user = userService.getUserInfo(j.getCreateBy(), SecurityConstants.INNER).getData();
+            if (ObjectUtils.isNotEmpty(user)) {
+                SecurityContextHolder.setUserId(String.valueOf(user.getUserid()));
+                SecurityContextHolder.setUserName(user.getUsername());
+                SecurityContextHolder.set(SecurityConstants.LOGIN_USER, user);
+            }
             LocalDate end = LocalDate.parse(j.getNrrq(), DateTimeFormatter.ofPattern("yyyyMMdd"));
             end = end.plusYears(2);
             Date endDate = DateUtils.toDate(end);
@@ -362,6 +385,12 @@ public class ZwywLhcjSbServiceImpl implements IZwywLhcjSbService
             }
         });
         ryMdList.forEach(r -> {
+            LoginUser user = userService.getUserInfo(r.getCreateBy(), SecurityConstants.INNER).getData();
+            if (ObjectUtils.isNotEmpty(user)) {
+                SecurityContextHolder.setUserId(String.valueOf(user.getUserid()));
+                SecurityContextHolder.setUserName(user.getUsername());
+                SecurityContextHolder.set(SecurityConstants.LOGIN_USER, user);
+            }
             LocalDate end = LocalDate.parse(r.getNrrq(), DateTimeFormatter.ofPattern("yyyyMMdd"));
             end = end.plusYears(2);
             Date endDate = DateUtils.toDate(end);

ruoyi-modules/ruoyi-job/src/main/java/com/ruoyi/job/service/SysJobServiceImpl.java

@@ -3,6 +3,7 @@ package com.ruoyi.job.service;
 import java.util.List;
 import javax.annotation.PostConstruct;
 
+import com.ruoyi.common.core.constant.SecurityConstants;
 import com.ruoyi.system.api.RemoteJobService;
 import org.quartz.JobDataMap;
 import org.quartz.JobKey;
@@ -258,6 +259,6 @@ public class SysJobServiceImpl implements ISysJobService
 
     @Override
     public void checkLhcjJob() {
-        remoteJobService.checkJob();
+        remoteJobService.checkJob(SecurityConstants.INNER);
     }
 }

ruoyi-ui/src/views/business/fwjggl/djpd/jbtjPd/index.vue

@@ -845,7 +845,7 @@ export default {
         if (valid) {
           this.submitFormLoading = true;
           if (this.addForm.sqId != null) {
-            this.addForm.id = this.addForm.sqId;
+            // this.addForm.id = this.addForm.sqId;
             updateDjpdJbpd(this.addForm)
               .then((response) => {
                 this.$modal.msgSuccess("基本条件评定成功");

ruoyi-ui/src/views/business/fwjggl/djpd/xzlr/index.vue

@@ -737,7 +737,7 @@
       submitForm() {
         this.$refs["addForm"].validate((valid) => {
           if (valid) {
-            this.addForm.id = this.addForm.sqId;
+            // this.addForm.id = this.addForm.sqId;
             let data = [];
             let data1 = [];
             this.topData.forEach((items, indexs) => {