优化项目以及对接口

pom.xml

@@ -364,11 +364,6 @@
                 <version>${ruoyi-vue-plus.version}</version>
             </dependency>
 
-            <dependency>
-                <groupId>com.ruoyi</groupId>
-                <artifactId>ruoyi-rsaencrypt</artifactId>
-                <version>${ruoyi-vue-plus.version}</version>
-            </dependency>
 
             <dependency>
                 <groupId>com.ruoyi</groupId>
@@ -428,7 +423,6 @@
         <module>ruoyi-sms</module>
         <module>ruoyi-work</module>
         <module>ruoyi-file</module>
-        <module>ruoyi-rsaencrypt</module>
         <module>ruoyi-rabbitmq</module>
 
 

ruoyi-admin/pom.xml

@@ -94,14 +94,10 @@
             <artifactId>ruoyi-file</artifactId>
         </dependency>
 
-        <dependency>
+        <!--<dependency>
-            <groupId>com.ruoyi</groupId>
-            <artifactId>ruoyi-rsaencrypt</artifactId>
-        </dependency>
-        <dependency>
             <groupId>com.ruoyi</groupId>
             <artifactId>ruoyi-rabbitmq</artifactId>
-        </dependency>
+        </dependency>-->
 
         <!-- skywalking 整合 logback -->
 <!--        <dependency>-->

ruoyi-admin/src/main/java/com/ruoyi/web/controller/common/CaptchaController.java

@@ -15,7 +15,6 @@ import com.ruoyi.common.utils.redis.RedisUtils;
 import com.ruoyi.common.utils.reflect.ReflectUtils;
 import com.ruoyi.common.utils.spring.SpringUtils;
 import com.ruoyi.framework.config.properties.CaptchaProperties;
-import com.ruoyi.rsaencrypt.annotation.RsaSecurityParameter;
 import com.ruoyi.framework.config.properties.MailProperties;
 import com.ruoyi.sms.config.properties.SmsProperties;
 import com.ruoyi.sms.core.SmsTemplate;

ruoyi-admin/src/main/java/com/ruoyi/web/controller/common/SysFileController.java

@@ -3,7 +3,6 @@ package com.ruoyi.web.controller.common;
 import com.ruoyi.common.core.domain.R;
 import com.ruoyi.common.utils.file.FileUtils;
 import com.ruoyi.file.service.ISysFileService;
-import com.ruoyi.rsaencrypt.annotation.RsaSecurityParameter;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -31,7 +30,6 @@ public class SysFileController
  /*文件上传请求*/
 
 
-    @RsaSecurityParameter
     @PostMapping("upload")
     public R<Map> upload(MultipartFile file)
     {

ruoyi-admin/src/main/java/com/ruoyi/web/controller/house/BuyHousesController.java

@@ -5,7 +5,6 @@ import java.util.List;
 import java.util.Arrays;
 
 import com.ruoyi.common.constant.Constants;
-import com.ruoyi.rsaencrypt.annotation.RsaSecurityParameter;
 import com.ruoyi.system.domain.BuyHouses;
 import com.ruoyi.system.domain.dto.BuyHousesEvent;
 import lombok.RequiredArgsConstructor;
@@ -44,7 +43,6 @@ public class BuyHousesController extends BaseController {
      */
     @SaCheckPermission("system:houses:list")
     @GetMapping("/list")
-    @RsaSecurityParameter
     public TableDataInfo<BuyHousesVo> list(BuyHousesBo bo, PageQuery pageQuery) {
         return iBuyHousesService.queryPageList(bo, pageQuery);
     }
@@ -57,7 +55,6 @@ public class BuyHousesController extends BaseController {
      */
     @SaCheckPermission("system:houses:subscribeExport")
     @PostMapping("/subscribeExport")
-    @RsaSecurityParameter(inDecode = true)
     public R subscribeExport(@RequestBody BuyHousesEvent bo) throws IOException {
         return iBuyHousesService.subscribeExport(bo);
     }
@@ -66,7 +63,6 @@ public class BuyHousesController extends BaseController {
      */
     @SaCheckPermission("system:houses:exportExcel")
     @PostMapping("/exportExcel")
-    @RsaSecurityParameter(outEncode = false)
     public void exportExcel(BuyHousesBo bo,HttpServletResponse response){
         iBuyHousesService.exportExcel(bo,response);
     }
@@ -77,7 +73,6 @@ public class BuyHousesController extends BaseController {
     @SaCheckPermission("system:houses:export")
     @Log(title = "【请填写功能名称】", businessType = BusinessType.EXPORT)
     @PostMapping("一期导出列表")
-    @RsaSecurityParameter(inDecode = true,outEncode = false)
     public void export(BuyHousesBo bo, HttpServletResponse response) {
         List<BuyHousesVo> list = iBuyHousesService.queryList(bo);
         ExcelUtil.exportExcel(list, "一期导出列表", BuyHousesVo.class, response);
@@ -90,7 +85,6 @@ public class BuyHousesController extends BaseController {
      */
     @SaCheckPermission("system:houses:query")
     @GetMapping
-    @RsaSecurityParameter
     public R<BuyHousesVo> getInfo(Long id) {
         return R.ok(iBuyHousesService.queryById(id));
     }
@@ -104,7 +98,6 @@ public class BuyHousesController extends BaseController {
     @SaCheckPermission("system:houses:remove")
     @Log(title = "【请填写功能名称】", businessType = BusinessType.DELETE)
     @DeleteMapping
-    @RsaSecurityParameter
     public R<Void> remove(@NotEmpty(message = "主键不能为空")Long[] ids) {
         return toAjax(iBuyHousesService.deleteWithValidByIds(Arrays.asList(ids), true));
     }
@@ -114,7 +107,6 @@ public class BuyHousesController extends BaseController {
      */
     @Log(title = "获取申报材料",businessType = BusinessType.OTHER)
     @PostMapping("/review/material")
-    @RsaSecurityParameter(inDecode = true)
     public R<?> getMaterialInfo(@RequestBody BuyHousesBo bo){
         return iBuyHousesService.getMaterialInfo(bo);
     }
@@ -127,7 +119,6 @@ public class BuyHousesController extends BaseController {
      */
     @SaCheckPermission("system:houses:edit")
     @PutMapping
-    @RsaSecurityParameter(inDecode = true)
     public R<?>updateBuyHouses(@RequestBody BuyHouses buyHouses){
         return iBuyHousesService.updateBuyHouses(buyHouses);
     }

ruoyi-admin/src/main/java/com/ruoyi/web/controller/house/HousesReviewController.java

@@ -16,7 +16,6 @@ import com.ruoyi.common.enums.BusinessType;
 import com.ruoyi.common.excel.ExcelResult;
 import com.ruoyi.common.helper.LoginHelper;
 import com.ruoyi.common.utils.poi.ExcelUtil;
-import com.ruoyi.rsaencrypt.annotation.RsaSecurityParameter;
 import com.ruoyi.system.domain.BuyHouses;
 import com.ruoyi.system.domain.HousesReview;
 import com.ruoyi.system.domain.bo.HousesReviewBo;
@@ -62,7 +61,6 @@ public class HousesReviewController extends BaseController {
      */
     @SaCheckPermission("system:review:reviewList")
     @GetMapping("/review/list")
-    @RsaSecurityParameter
     public TableDataInfo<HousesReview> reviewList(HousesReviewBo bo, PageQuery pageQuery) {
         return iHousesReviewService.queryPageList(bo, pageQuery);
     }
@@ -76,7 +74,6 @@ public class HousesReviewController extends BaseController {
      */
     @SaCheckPermission("system:manager:reviewList")
     @GetMapping("/manager/list")
-    @RsaSecurityParameter
     public TableDataInfo<HousesReview> managerReviewList(HousesReviewBo bo, PageQuery pageQuery) {
         return iHousesReviewService.managerQueryPageList(bo, pageQuery);
     }
@@ -98,7 +95,6 @@ public class HousesReviewController extends BaseController {
      */
     @SaCheckPermission("system:houses:exportExcel")
     @PostMapping("/exportExcel")
-    @RsaSecurityParameter(inDecode = true,outEncode = false)
     public void exportExcel(HousesReviewBo bo,HttpServletResponse response){
         iHousesReviewService.exportExcel(bo,response);
     }
@@ -108,7 +104,6 @@ public class HousesReviewController extends BaseController {
      */
     @SaCheckPermission("system:review:list")
     @GetMapping("/registrationManagement/list")
-    @RsaSecurityParameter
     public TableDataInfo<HousesReview> list(HousesReviewBo bo, PageQuery pageQuery) {
         boolean admin = LoginHelper.isAdmin();
         if (!admin){
@@ -123,7 +118,6 @@ public class HousesReviewController extends BaseController {
     @SaCheckPermission("system:review:export")
     @Log(title = "购房复审登记", businessType = BusinessType.EXPORT)
     @PostMapping("/registrationManagement/export")
-    @RsaSecurityParameter(inDecode = true,outEncode = false)
     public void export(HousesReviewBo bo, HttpServletResponse response) {
         List<HousesReviewVo> list = iHousesReviewService.queryList(bo);
         ExcelUtil.exportExcel(list, "购房复审登记", HousesReviewVo.class, response);
@@ -136,7 +130,6 @@ public class HousesReviewController extends BaseController {
      */
     @SaCheckPermission("system:review:edit")
     @GetMapping("/registrationManagement")
-    @RsaSecurityParameter
     public R<HousesReviewVo> getInfo(Long id) {
         return R.ok(iHousesReviewService.queryById(id));
     }
@@ -148,7 +141,6 @@ public class HousesReviewController extends BaseController {
     @Log(title = "购房复审登记", businessType = BusinessType.INSERT)
     @RepeatSubmit()
     @PostMapping("/registrationManagement")
-    @RsaSecurityParameter(inDecode = true)
     public R<Void> add(@Validated(AddGroup.class) @RequestBody HousesReviewBo bo) {
         return toAjax(iHousesReviewService.insertByBo(bo));
     }
@@ -171,7 +163,6 @@ public class HousesReviewController extends BaseController {
     @SaCheckPermission("system:review:remove")
     @Log(title = "购房复审登记", businessType = BusinessType.DELETE)
     @DeleteMapping("/review")
-    @RsaSecurityParameter
     public R<Void> remove(Long[] ids) {
         return toAjax(iHousesReviewService.deleteWithValidByIds(Arrays.asList(ids), true));
     }
@@ -184,7 +175,6 @@ public class HousesReviewController extends BaseController {
      */
     @Log(title = "购房复审导入", businessType = BusinessType.IMPORT)
     @SaCheckPermission("system:review:import")
-    @RsaSecurityParameter
     @PostMapping(value = "/review/importData", consumes = MediaType.MULTIPART_FORM_DATA_VALUE)
     public R<Void> importData(@RequestPart("file") MultipartFile file) throws Exception {
         ExcelResult<HousesReviewVo> result = ExcelUtil.importExcel(file.getInputStream(), HousesReviewVo.class, true);
@@ -225,7 +215,6 @@ public class HousesReviewController extends BaseController {
      */
     @Log(title = "获取申报材料",businessType = BusinessType.OTHER)
     @PostMapping("/review/material")
-    @RsaSecurityParameter(inDecode = true)
     public R<?> getMaterialInfo(@RequestBody HousesReviewBo bo){
         return iHousesReviewService.getMaterialInfo(bo);
     }
@@ -235,7 +224,6 @@ public class HousesReviewController extends BaseController {
      */
     @Log(title = "审核时返回当前人材料",businessType = BusinessType.OTHER)
     @GetMapping("/getMaterial")
-    @RsaSecurityParameter
     public R<?> getMaterialByBusinessId(Long id){
         return iHousesReviewService.getMaterialByBusinessId(id);
     }

ruoyi-admin/src/main/java/com/ruoyi/web/controller/material/MaterialModuleController.java

@@ -11,7 +11,6 @@ import com.ruoyi.common.core.validate.AddGroup;
 import com.ruoyi.common.core.validate.EditGroup;
 import com.ruoyi.common.enums.BusinessType;
 import com.ruoyi.common.utils.poi.ExcelUtil;
-import com.ruoyi.rsaencrypt.annotation.RsaSecurityParameter;
 import com.ruoyi.system.domain.bo.MaterialModuleBo;
 import com.ruoyi.system.domain.vo.MaterialModuleVo;
 import com.ruoyi.system.service.IMaterialModuleService;
@@ -44,14 +43,12 @@ public class MaterialModuleController extends BaseController {
      */
     @SaCheckPermission("material:module:list")
     @GetMapping("/list")
-    @RsaSecurityParameter
     public TableDataInfo<MaterialModuleVo> list(MaterialModuleBo bo, PageQuery pageQuery) {
         return iMaterialModuleService.queryPageList(bo, pageQuery);
     }
 
     @SaCheckPermission("material:materialList:list")
     @GetMapping("/materialList")
-    @RsaSecurityParameter
     public R<?> materialList(MaterialModuleBo bo) {
         return iMaterialModuleService.selectMaterialList(bo);
     }
@@ -74,7 +71,6 @@ public class MaterialModuleController extends BaseController {
      */
     @SaCheckPermission("material:module:query")
     @GetMapping
-    @RsaSecurityParameter
     public R<MaterialModuleVo> getInfo(Long id) {
         return R.ok(iMaterialModuleService.queryById(id));
     }
@@ -86,7 +82,6 @@ public class MaterialModuleController extends BaseController {
     @Log(title = "材料模块", businessType = BusinessType.INSERT)
     @RepeatSubmit()
     @PostMapping()
-    @RsaSecurityParameter(inDecode = true)
     public R<Void> add(@Validated(AddGroup.class) @RequestBody MaterialModuleBo bo) {
         return toAjax(iMaterialModuleService.insertByBo(bo));
     }
@@ -97,7 +92,6 @@ public class MaterialModuleController extends BaseController {
     @SaCheckPermission("material:module:edit")
     @Log(title = "材料模块", businessType = BusinessType.UPDATE)
     @RepeatSubmit()
-    @RsaSecurityParameter(inDecode = true)
     @PutMapping()
     public R<Void> edit(@Validated(EditGroup.class) @RequestBody MaterialModuleBo bo) {
         return toAjax(iMaterialModuleService.updateByBo(bo));
@@ -111,7 +105,6 @@ public class MaterialModuleController extends BaseController {
     @SaCheckPermission("material:module:remove")
     @Log(title = "材料模块", businessType = BusinessType.DELETE)
     @DeleteMapping
-    @RsaSecurityParameter
     public R<Void> remove(Long[] ids) {
         return toAjax(iMaterialModuleService.deleteWithValidByIds(Arrays.asList(ids), true));
     }

ruoyi-admin/src/main/java/com/ruoyi/web/controller/material/MaterialTalentsController.java

@@ -9,7 +9,6 @@ import com.ruoyi.common.core.validate.AddGroup;
 import com.ruoyi.common.core.validate.EditGroup;
 import com.ruoyi.common.enums.BusinessType;
 import com.ruoyi.common.utils.poi.ExcelUtil;
-import com.ruoyi.rsaencrypt.annotation.RsaSecurityParameter;
 import com.ruoyi.system.domain.bo.MaterialTalentsBo;
 import com.ruoyi.system.domain.vo.MaterialTalentsVo;
 import com.ruoyi.system.service.IMaterialTalentsService;
@@ -42,7 +41,6 @@ public class MaterialTalentsController extends BaseController {
      */
     @SaCheckPermission("material:talents:list")
     @GetMapping("/list")
-    @RsaSecurityParameter
     public R<List<MaterialTalentsVo>> list(MaterialTalentsBo bo) {
         List<MaterialTalentsVo> list = iMaterialTalentsService.queryList(bo);
         return R.ok(list);
@@ -66,7 +64,6 @@ public class MaterialTalentsController extends BaseController {
      */
     @SaCheckPermission("material:talents:query")
     @GetMapping
-    @RsaSecurityParameter
     public R<MaterialTalentsVo> getInfo(Long id) {
         return R.ok(iMaterialTalentsService.queryById(id));
     }
@@ -78,7 +75,6 @@ public class MaterialTalentsController extends BaseController {
     @Log(title = "材料关系", businessType = BusinessType.INSERT)
     @RepeatSubmit()
     @PostMapping()
-    @RsaSecurityParameter(inDecode = true)
     public R<Void> add(@Validated(AddGroup.class) @RequestBody MaterialTalentsBo bo) {
         return toAjax(iMaterialTalentsService.insertByBo(bo));
     }
@@ -90,7 +86,6 @@ public class MaterialTalentsController extends BaseController {
     @Log(title = "材料关系", businessType = BusinessType.UPDATE)
     @RepeatSubmit()
     @PutMapping()
-    @RsaSecurityParameter(inDecode = true)
     public R<Void> edit(@Validated(EditGroup.class) @RequestBody MaterialTalentsBo bo) {
         return toAjax(iMaterialTalentsService.updateByBo(bo));
     }
@@ -103,7 +98,6 @@ public class MaterialTalentsController extends BaseController {
     @SaCheckPermission("material:talents:remove")
     @Log(title = "材料关系", businessType = BusinessType.DELETE)
     @DeleteMapping
-    @RsaSecurityParameter
     public R<Void> remove(Long[] ids) {
         return toAjax(iMaterialTalentsService.deleteWithValidByIds(Arrays.asList(ids), true));
     }

ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/RsaSecurityController.java

@@ -4,7 +4,6 @@ import java.util.List;
 import java.util.Arrays;
 import java.util.concurrent.TimeUnit;
 
-import com.ruoyi.rsaencrypt.annotation.RsaSecurityParameter;
 import lombok.RequiredArgsConstructor;
 import javax.servlet.http.HttpServletResponse;
 import javax.validation.constraints.*;

ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SubscribeExportController.java

@@ -4,7 +4,6 @@ import java.util.List;
 import java.util.Arrays;
 import java.util.concurrent.TimeUnit;
 
-import com.ruoyi.rsaencrypt.annotation.RsaSecurityParameter;
 import lombok.RequiredArgsConstructor;
 import javax.servlet.http.HttpServletResponse;
 import javax.validation.constraints.*;
@@ -45,7 +44,6 @@ public class SubscribeExportController extends BaseController {
      */
     @SaCheckPermission("system:export:list")
     @GetMapping("/list")
-    @RsaSecurityParameter
     public TableDataInfo<SubscribeExportVo> list(SubscribeExportBo bo, PageQuery pageQuery) {
         return iSubscribeExportService.queryPageList(bo, pageQuery);
     }
@@ -79,7 +77,6 @@ public class SubscribeExportController extends BaseController {
     @Log(title = "预约导出", businessType = BusinessType.INSERT)
     @RepeatSubmit()
     @PostMapping()
-    @RsaSecurityParameter(inDecode = true)
     public R<Void> add(@Validated(AddGroup.class) @RequestBody SubscribeExportBo bo) {
         return toAjax(iSubscribeExportService.insertByBo(bo));
     }
@@ -91,7 +88,6 @@ public class SubscribeExportController extends BaseController {
     @Log(title = "预约导出", businessType = BusinessType.UPDATE)
     @RepeatSubmit()
     @PutMapping()
-    @RsaSecurityParameter(inDecode = true)
     public R<Void> edit(@Validated(EditGroup.class) @RequestBody SubscribeExportBo bo) {
         return toAjax(iSubscribeExportService.updateByBo(bo));
     }

ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysConfigController.java

@@ -8,7 +8,6 @@ import com.ruoyi.common.core.domain.R;
 import com.ruoyi.common.core.page.TableDataInfo;
 import com.ruoyi.common.enums.BusinessType;
 import com.ruoyi.common.utils.poi.ExcelUtil;
-import com.ruoyi.rsaencrypt.annotation.RsaSecurityParameter;
 import com.ruoyi.system.domain.SysConfig;
 import com.ruoyi.system.service.ISysConfigService;
 import lombok.RequiredArgsConstructor;
@@ -35,7 +34,6 @@ public class SysConfigController extends BaseController {
      */
     @SaCheckPermission("system:config:list")
     @GetMapping("/list")
-    @RsaSecurityParameter
     public TableDataInfo<SysConfig> list(SysConfig config, PageQuery pageQuery) {
         return configService.selectPageConfigList(config, pageQuery);
     }
@@ -58,7 +56,6 @@ public class SysConfigController extends BaseController {
      */
     @SaCheckPermission("system:config:query")
     @GetMapping
-    @RsaSecurityParameter
     public R<SysConfig> getInfo(Long configId) {
         return R.ok(configService.selectConfigById(configId));
     }
@@ -69,7 +66,6 @@ public class SysConfigController extends BaseController {
      * @param configKey 参数Key
      */
     @GetMapping(value = "/configKey")
-    @RsaSecurityParameter
     public R<Void> getConfigKey(String configKey) {
         return R.ok(configService.selectConfigByKey(configKey));
     }
@@ -80,7 +76,6 @@ public class SysConfigController extends BaseController {
     @SaCheckPermission("system:config:add")
     @Log(title = "参数管理", businessType = BusinessType.INSERT)
     @PostMapping
-    @RsaSecurityParameter(inDecode = true)
     public R<Void> add(@Validated @RequestBody SysConfig config) {
         if (!configService.checkConfigKeyUnique(config)) {
             return R.fail("新增参数'" + config.getConfigName() + "'失败，参数键名已存在");
@@ -95,7 +90,6 @@ public class SysConfigController extends BaseController {
     @SaCheckPermission("system:config:edit")
     @Log(title = "参数管理", businessType = BusinessType.UPDATE)
     @PutMapping
-    @RsaSecurityParameter(inDecode = true)
     public R<Void> edit(@Validated @RequestBody SysConfig config) {
         if (!configService.checkConfigKeyUnique(config)) {
             return R.fail("修改参数'" + config.getConfigName() + "'失败，参数键名已存在");
@@ -110,7 +104,6 @@ public class SysConfigController extends BaseController {
     @SaCheckPermission("system:config:edit")
     @Log(title = "参数管理", businessType = BusinessType.UPDATE)
     @PutMapping("/updateByKey")
-    @RsaSecurityParameter(inDecode = true)
     public R<Void> updateByKey(@RequestBody SysConfig config) {
         configService.updateConfig(config);
         return R.ok();
@@ -124,7 +117,6 @@ public class SysConfigController extends BaseController {
     @SaCheckPermission("system:config:remove")
     @Log(title = "参数管理", businessType = BusinessType.DELETE)
     @DeleteMapping
-    @RsaSecurityParameter
     public R<Void> remove(Long[] configIds) {
         configService.deleteConfigByIds(configIds);
         return R.ok();
@@ -136,7 +128,6 @@ public class SysConfigController extends BaseController {
     @SaCheckPermission("system:config:remove")
     @Log(title = "参数管理", businessType = BusinessType.CLEAN)
     @DeleteMapping("/refreshCache")
-    @RsaSecurityParameter
     public R<Void> refreshCache() {
         configService.resetConfigCache();
         return R.ok();

ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDeptController.java

@@ -9,7 +9,6 @@ import com.ruoyi.common.core.domain.R;
 import com.ruoyi.common.core.domain.entity.SysDept;
 import com.ruoyi.common.enums.BusinessType;
 import com.ruoyi.common.utils.StringUtils;
-import com.ruoyi.rsaencrypt.annotation.RsaSecurityParameter;
 import com.ruoyi.system.service.ISysDeptService;
 import lombok.RequiredArgsConstructor;
 import org.springframework.validation.annotation.Validated;
@@ -47,7 +46,6 @@ public class SysDeptController extends BaseController {
      */
     @SaCheckPermission("system:dept:list")
     @GetMapping("/list/exclude")
-    @RsaSecurityParameter
     public R<List<SysDept>> excludeChild(Long deptId) {
         List<SysDept> depts = deptService.selectDeptList(new SysDept());
         depts.removeIf(d -> d.getDeptId().equals(deptId)
@@ -62,7 +60,6 @@ public class SysDeptController extends BaseController {
      */
     @SaCheckPermission("system:dept:query")
     @GetMapping
-    @RsaSecurityParameter
     public R<SysDept> getInfo(Long deptId) {
         deptService.checkDeptDataScope(deptId);
         return R.ok(deptService.selectDeptById(deptId));
@@ -74,7 +71,6 @@ public class SysDeptController extends BaseController {
     @SaCheckPermission("system:dept:add")
     @Log(title = "部门管理", businessType = BusinessType.INSERT)
     @PostMapping
-    @RsaSecurityParameter(inDecode = true)
     public R<Void> add(@Validated @RequestBody SysDept dept) {
         if (!deptService.checkDeptNameUnique(dept)) {
             return R.fail("新增部门'" + dept.getDeptName() + "'失败，部门名称已存在");
@@ -88,7 +84,6 @@ public class SysDeptController extends BaseController {
     @SaCheckPermission("system:dept:edit")
     @Log(title = "部门管理", businessType = BusinessType.UPDATE)
     @PutMapping
-    @RsaSecurityParameter(inDecode = true)
     public R<Void> edit(@Validated @RequestBody SysDept dept) {
         Long deptId = dept.getDeptId();
         deptService.checkDeptDataScope(deptId);

ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDictDataController.java

@@ -10,7 +10,6 @@ import com.ruoyi.common.core.domain.entity.SysDictData;
 import com.ruoyi.common.core.page.TableDataInfo;
 import com.ruoyi.common.enums.BusinessType;
 import com.ruoyi.common.utils.poi.ExcelUtil;
-import com.ruoyi.rsaencrypt.annotation.RsaSecurityParameter;
 import com.ruoyi.system.service.ISysDictDataService;
 import com.ruoyi.system.service.ISysDictTypeService;
 import lombok.RequiredArgsConstructor;
@@ -40,7 +39,6 @@ public class SysDictDataController extends BaseController {
      */
     @SaCheckPermission("system:dict:list")
     @GetMapping("/list")
-    @RsaSecurityParameter
     public TableDataInfo<SysDictData> list(SysDictData dictData, PageQuery pageQuery) {
         return dictDataService.selectPageDictDataList(dictData, pageQuery);
     }
@@ -63,7 +61,6 @@ public class SysDictDataController extends BaseController {
      */
     @SaCheckPermission("system:dict:query")
     @GetMapping
-    @RsaSecurityParameter
     public R<SysDictData> getInfo(Long dictCode) {
         return R.ok(dictDataService.selectDictDataById(dictCode));
     }
@@ -74,7 +71,6 @@ public class SysDictDataController extends BaseController {
      * @param dictType 字典类型
      */
     @GetMapping(value = "/type")
-//    @RsaSecurityParameter
     public R<List<SysDictData>> dictType(String dictType) {
         List<SysDictData> data = dictTypeService.selectDictDataByType(dictType);
         if (ObjectUtil.isNull(data)) {
@@ -89,7 +85,6 @@ public class SysDictDataController extends BaseController {
     @SaCheckPermission("system:dict:add")
     @Log(title = "字典数据", businessType = BusinessType.INSERT)
     @PostMapping
-    @RsaSecurityParameter(inDecode = true)
     public R<Void> add(@Validated @RequestBody SysDictData dict) {
         dictDataService.insertDictData(dict);
         return R.ok();
@@ -101,7 +96,6 @@ public class SysDictDataController extends BaseController {
     @SaCheckPermission("system:dict:edit")
     @Log(title = "字典数据", businessType = BusinessType.UPDATE)
     @PutMapping
-    @RsaSecurityParameter(inDecode = true)
     public R<Void> edit(@Validated @RequestBody SysDictData dict) {
         dictDataService.updateDictData(dict);
         return R.ok();
@@ -115,7 +109,6 @@ public class SysDictDataController extends BaseController {
     @SaCheckPermission("system:dict:remove")
     @Log(title = "字典类型", businessType = BusinessType.DELETE)
     @DeleteMapping
-    @RsaSecurityParameter
     public R<Void> remove(Long[] dictCodes) {
         dictDataService.deleteDictDataByIds(dictCodes);
         return R.ok();

ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDictTypeController.java

@@ -9,7 +9,6 @@ import com.ruoyi.common.core.domain.entity.SysDictType;
 import com.ruoyi.common.core.page.TableDataInfo;
 import com.ruoyi.common.enums.BusinessType;
 import com.ruoyi.common.utils.poi.ExcelUtil;
-import com.ruoyi.rsaencrypt.annotation.RsaSecurityParameter;
 import com.ruoyi.system.service.ISysDictTypeService;
 import lombok.RequiredArgsConstructor;
 import org.springframework.validation.annotation.Validated;
@@ -45,7 +44,6 @@ public class SysDictTypeController extends BaseController {
     @Log(title = "字典类型", businessType = BusinessType.EXPORT)
     @SaCheckPermission("system:dict:export")
     @PostMapping("/export")
-    @RsaSecurityParameter(inDecode = true)
     public void export(SysDictType dictType, HttpServletResponse response) {
         List<SysDictType> list = dictTypeService.selectDictTypeList(dictType);
         ExcelUtil.exportExcel(list, "字典类型", SysDictType.class, response);
@@ -58,7 +56,6 @@ public class SysDictTypeController extends BaseController {
      */
     @SaCheckPermission("system:dict:query")
     @GetMapping
-    @RsaSecurityParameter
     public R<SysDictType> getInfo(Long dictId) {
         return R.ok(dictTypeService.selectDictTypeById(dictId));
     }
@@ -69,7 +66,6 @@ public class SysDictTypeController extends BaseController {
     @SaCheckPermission("system:dict:add")
     @Log(title = "字典类型", businessType = BusinessType.INSERT)
     @PostMapping
-    @RsaSecurityParameter(inDecode = true)
     public R<Void> add(@Validated @RequestBody SysDictType dict) {
         if (!dictTypeService.checkDictTypeUnique(dict)) {
             return R.fail("新增字典'" + dict.getDictName() + "'失败，字典类型已存在");
@@ -84,7 +80,6 @@ public class SysDictTypeController extends BaseController {
     @SaCheckPermission("system:dict:edit")
     @Log(title = "字典类型", businessType = BusinessType.UPDATE)
     @PutMapping
-    @RsaSecurityParameter(inDecode = true)
     public R<Void> edit(@Validated @RequestBody SysDictType dict) {
         if (!dictTypeService.checkDictTypeUnique(dict)) {
             return R.fail("修改字典'" + dict.getDictName() + "'失败，字典类型已存在");
@@ -101,7 +96,6 @@ public class SysDictTypeController extends BaseController {
     @SaCheckPermission("system:dict:remove")
     @Log(title = "字典类型", businessType = BusinessType.DELETE)
     @DeleteMapping
-    @RsaSecurityParameter
     public R<Void> remove(Long[] dictIds) {
         dictTypeService.deleteDictTypeByIds(dictIds);
         return R.ok();
@@ -113,7 +107,6 @@ public class SysDictTypeController extends BaseController {
     @SaCheckPermission("system:dict:remove")
     @Log(title = "字典类型", businessType = BusinessType.CLEAN)
     @DeleteMapping("/refreshCache")
-    @RsaSecurityParameter
     public R<Void> refreshCache() {
         dictTypeService.resetDictCache();
         return R.ok();
@@ -123,7 +116,6 @@ public class SysDictTypeController extends BaseController {
      * 获取字典选择框列表
      */
     @GetMapping("/optionselect")
-    @RsaSecurityParameter
     public R<List<SysDictType>> optionselect() {
         List<SysDictType> dictTypes = dictTypeService.selectDictTypeAll();
         return R.ok(dictTypes);

ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysLoginController.java

@@ -15,7 +15,6 @@ import com.ruoyi.common.helper.LoginHelper;
 import com.ruoyi.common.utils.StrUtils;
 import com.ruoyi.common.utils.redis.RedisUtils;
 import com.ruoyi.common.utils.spring.SpringUtils;
-import com.ruoyi.rsaencrypt.annotation.RsaSecurityParameter;
 import com.ruoyi.sms.core.SmsTemplate;
 import com.ruoyi.sms.entity.SmsResult;
 import com.ruoyi.system.domain.vo.RouterVo;
@@ -53,7 +52,6 @@ public class SysLoginController {
      */
     @SaIgnore
     @PostMapping("/login")
-    @RsaSecurityParameter(inDecode = true)
     public R<Map<String, Object>> login(
 //        @Validated({LoginBody.passwordLogin.class})
         @RequestBody LoginBody loginBody) {
@@ -74,7 +72,6 @@ public class SysLoginController {
      */
     @SaIgnore
     @PostMapping("/smsLogin")
-    @RsaSecurityParameter(inDecode = true)
     public R<Map<String, Object>> smsLogin(
         @Validated({LoginBody.smgLogin.class})
         @RequestBody SmsLoginBody smsLoginBody) {
@@ -120,7 +117,6 @@ public class SysLoginController {
      * 退出登录
      */
     @SaIgnore
-    @RsaSecurityParameter
     @PostMapping("/logout")
     public R<Void> logout() {
         loginService.logout();
@@ -132,7 +128,6 @@ public class SysLoginController {
      * @return 用户信息
      */
     @GetMapping("getInfo")
-    @RsaSecurityParameter
     public R<Map<String, Object>> getInfo() {
         LoginUser loginUser = LoginHelper.getLoginUser();
         SysUser user = userService.selectUserById(loginUser.getUserId());
@@ -163,7 +158,6 @@ public class SysLoginController {
      */
     @SaIgnore
     @RateLimiter(count = 2, time = 10)
-    @RsaSecurityParameter(inDecode = true)
     @PostMapping("/userLogin")
     public R userLogin(
 //        @Validated({LoginBody.passwordLogin.class})
@@ -180,7 +174,6 @@ public class SysLoginController {
      */
     @SaIgnore
 //    @RateLimiter(count = 2, time = 10)
-    @RsaSecurityParameter(inDecode = true)
     @PostMapping("/userSmsLogin")
     public R<Map<String, Object>> userSmsLogin(@Validated(LoginBody.smgLogin.class) @RequestBody LoginBody loginBody) {
         Map<String, Object> ajax = new HashMap<>();
@@ -197,7 +190,6 @@ public class SysLoginController {
      */
     @SaIgnore
     @RateLimiter(count = 1, time = 10)
-    @RsaSecurityParameter(inDecode = true)
     @PostMapping("/userUpdatePwd")
     public R<?> userUpdatePwd(@Validated(LoginBody.forgetPasswordLogin.class) @RequestBody LoginBody loginBody) {
         return loginService.userUpdatePwd(loginBody.getUsername(), loginBody.getPassword(), loginBody.getCode());
@@ -211,7 +203,6 @@ public class SysLoginController {
     @SaIgnore
     @RateLimiter(count = 1, time = 10)
     @PostMapping("/userRegister")
-    @RsaSecurityParameter(inDecode = true)
     public R<?> userRegister(@Validated(LoginBody.registerUser.class) @RequestBody LoginBody loginBody) {
         return  loginService.userRegister(loginBody.getUsername(), loginBody.getPassword(), loginBody.getCode());
     }
@@ -223,7 +214,6 @@ public class SysLoginController {
      */
 //    @RateLimiter(count = 1)
     @SaIgnore
-    @RsaSecurityParameter()
     @GetMapping("/forgotSendAliYun")
     public R<?> forgotSendAliYun(String phones) {
         boolean matches = phones.matches("^1(3\\d|4[5-9]|5[0-35-9]|6[567]|7[0-8]|8\\d|9[0-35-9])\\d{8}$");
@@ -240,7 +230,6 @@ public class SysLoginController {
      */
 //    @RateLimiter(count = 1,time = 20)
     @SaIgnore
-    @RsaSecurityParameter
     @GetMapping("/registerSendAliYun")
     public R<?> registerSendAliYun(String phones) {
         boolean matches = phones.matches("^1(3\\d|4[5-9]|5[0-35-9]|6[567]|7[0-8]|8\\d|9[0-35-9])\\d{8}$");
@@ -258,7 +247,6 @@ public class SysLoginController {
 //    @RateLimiter(count = 1,time = 20)
     @SaIgnore
     @GetMapping("/smsLoginSendAliYun")
-    @RsaSecurityParameter
     public R<?> smsLoginSendAliYun(String phones) {
         boolean matches = phones.matches("^1(3\\d|4[5-9]|5[0-35-9]|6[567]|7[0-8]|8\\d|9[0-35-9])\\d{8}$");
         if (!matches) {

ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysMenuController.java

@@ -9,7 +9,6 @@ import com.ruoyi.common.core.domain.R;
 import com.ruoyi.common.core.domain.entity.SysMenu;
 import com.ruoyi.common.enums.BusinessType;
 import com.ruoyi.common.utils.StringUtils;
-import com.ruoyi.rsaencrypt.annotation.RsaSecurityParameter;
 import com.ruoyi.system.service.ISysMenuService;
 import lombok.RequiredArgsConstructor;
 import org.springframework.validation.annotation.Validated;

ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysNoticeController.java

@@ -7,7 +7,6 @@ import com.ruoyi.common.core.domain.PageQuery;
 import com.ruoyi.common.core.domain.R;
 import com.ruoyi.common.core.page.TableDataInfo;
 import com.ruoyi.common.enums.BusinessType;
-import com.ruoyi.rsaencrypt.annotation.RsaSecurityParameter;
 import com.ruoyi.system.domain.SysNotice;
 import com.ruoyi.system.service.ISysNoticeService;
 import lombok.RequiredArgsConstructor;

ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysOssConfigController.java

@@ -11,7 +11,6 @@ import com.ruoyi.common.core.validate.AddGroup;
 import com.ruoyi.common.core.validate.EditGroup;
 import com.ruoyi.common.core.validate.QueryGroup;
 import com.ruoyi.common.enums.BusinessType;
-import com.ruoyi.rsaencrypt.annotation.RsaSecurityParameter;
 import com.ruoyi.system.domain.bo.SysOssConfigBo;
 import com.ruoyi.system.domain.vo.SysOssConfigVo;
 import com.ruoyi.system.service.ISysOssConfigService;

ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysOssController.java

@@ -11,7 +11,6 @@ import com.ruoyi.common.core.page.TableDataInfo;
 import com.ruoyi.common.core.validate.QueryGroup;
 import com.ruoyi.common.enums.BusinessType;
 import com.ruoyi.common.exception.ServiceException;
-import com.ruoyi.rsaencrypt.annotation.RsaSecurityParameter;
 import com.ruoyi.system.domain.bo.SysOssBo;
 import com.ruoyi.system.domain.vo.SysOssVo;
 import com.ruoyi.system.service.ISysOssService;

ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysPostController.java

@@ -8,7 +8,6 @@ import com.ruoyi.common.core.domain.R;
 import com.ruoyi.common.core.page.TableDataInfo;
 import com.ruoyi.common.enums.BusinessType;
 import com.ruoyi.common.utils.poi.ExcelUtil;
-import com.ruoyi.rsaencrypt.annotation.RsaSecurityParameter;
 import com.ruoyi.system.domain.SysPost;
 import com.ruoyi.system.service.ISysPostService;
 import lombok.RequiredArgsConstructor;

ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysProfileController.java

@@ -10,7 +10,6 @@ import com.ruoyi.common.enums.BusinessType;
 import com.ruoyi.common.helper.LoginHelper;
 import com.ruoyi.common.utils.StringUtils;
 import com.ruoyi.common.utils.file.MimeTypeUtils;
-import com.ruoyi.rsaencrypt.annotation.RsaSecurityParameter;
 import com.ruoyi.system.domain.vo.SysOssVo;
 import com.ruoyi.system.service.ISysOssService;
 import com.ruoyi.system.service.ISysUserService;

ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysRegisterController.java

@@ -4,7 +4,6 @@ import cn.dev33.satoken.annotation.SaIgnore;
 import com.ruoyi.common.core.controller.BaseController;
 import com.ruoyi.common.core.domain.R;
 import com.ruoyi.common.core.domain.model.RegisterBody;
-import com.ruoyi.rsaencrypt.annotation.RsaSecurityParameter;
 import com.ruoyi.system.service.ISysConfigService;
 import com.ruoyi.system.service.SysRegisterService;
 import lombok.RequiredArgsConstructor;

ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysRoleController.java

@@ -16,7 +16,6 @@ import com.ruoyi.common.core.domain.entity.SysUser;
 import com.ruoyi.common.core.page.TableDataInfo;
 import com.ruoyi.common.enums.BusinessType;
 import com.ruoyi.common.utils.poi.ExcelUtil;
-import com.ruoyi.rsaencrypt.annotation.RsaSecurityParameter;
 import com.ruoyi.system.domain.SysUserRole;
 import com.ruoyi.system.service.ISysDeptService;
 import com.ruoyi.system.service.ISysRoleService;

ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java

@@ -20,7 +20,6 @@ import com.ruoyi.common.helper.LoginHelper;
 import com.ruoyi.common.utils.StreamUtils;
 import com.ruoyi.common.utils.StringUtils;
 import com.ruoyi.common.utils.poi.ExcelUtil;
-import com.ruoyi.rsaencrypt.annotation.RsaSecurityParameter;
 import com.ruoyi.system.domain.vo.SysUserExportVo;
 import com.ruoyi.system.domain.vo.SysUserImportVo;
 import com.ruoyi.system.listener.SysUserImportListener;

ruoyi-admin/src/main/java/com/ruoyi/web/controller/user/HouseController.java

@@ -1,6 +1,7 @@
 package com.ruoyi.web.controller.user;
 
 import cn.dev33.satoken.annotation.SaCheckPermission;
+import cn.hutool.core.util.IdcardUtil;
 import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.http.HttpUtil;
 import cn.hutool.json.JSONObject;
@@ -14,7 +15,6 @@ import com.ruoyi.common.core.validate.AddGroup;
 import com.ruoyi.common.core.validate.DownloadGroup;
 import com.ruoyi.common.core.validate.EditGroup;
 import com.ruoyi.common.enums.BusinessType;
-import com.ruoyi.rsaencrypt.annotation.RsaSecurityParameter;
 import com.ruoyi.system.domain.BuyHouses;
 import com.ruoyi.system.domain.bo.BuyHousesBo;
 import com.ruoyi.system.service.IBuyHousesService;
@@ -95,7 +95,6 @@ public class HouseController extends BaseController {
      * 通过调用高新人才判断该身份证是否具备人才资格
      */
     @PostMapping("/CandidatesInfo")
-    @RsaSecurityParameter(inDecode = true)
     public R getGaoXinCandidateInfoByCardId(@RequestBody BuyHouses buyHouses){
         String cardId = buyHouses.getCardId();
         if (ObjectUtil.isNull(cardId) || ObjectUtil.isEmpty(cardId)){
@@ -103,8 +102,9 @@ public class HouseController extends BaseController {
         }
         return iBuyHousesService.getGaoXinCandidateInfoByCardId(cardId);
     }
+
+
     @GetMapping("/checkStatus")
-    @RsaSecurityParameter
     public R checkStatus(){
         return iBuyHousesService.checkStatus();
     }
@@ -114,30 +114,21 @@ public class HouseController extends BaseController {
      * @return
      */
     @GetMapping("/buyHouseLogs")
-    @RsaSecurityParameter
     public R getBuyHouseLog(){
         return iBuyHousesService.getBuyHousesLogsByUserId();
     }
 
     /**
      * 外部推送接口
-     * @param buyHouse
+     * @param bo
      * @return
      * @throws InterruptedException
      */
     @Log(title = "【外部推送接口】", businessType = BusinessType.OTHER)
     @RepeatSubmit()
     @PostMapping("/insertOpenBuyHouses")
-    public R<?> insertOpenBuyHouses(@RequestBody BuyHouses buyHouse){
+    public R<?> insertOpenBuyHouses(@Validated(EditGroup.class)@RequestBody BuyHousesBo bo){
-        /*CCSMessageDigest wxDigest = CCSMessageDigest.getInstance();
+        bo.setApiKey("gaoxingongyuanchengshiju");
-        R r = wxDigest.checkSign(httpRequestBody);
+        return  iBuyHousesService.insertOpenBuyHouses(bo);
-        if (r.getCode()==200){
-            BuyHouses buyHouses = (BuyHouses)r.getData();
-            buyHouses.setApiKey(httpRequestBody.getApiKey());
-            return  iBuyHousesService.insertOpenBuyHouses(buyHouses);
-        }
-        return R.fail(r.getMsg());*/
-        buyHouse.setApiKey("gxgycsj");
-        return  iBuyHousesService.insertOpenBuyHouses(buyHouse);
     }
 }

ruoyi-admin/src/main/java/com/ruoyi/web/controller/user/UserController.java

@@ -9,11 +9,8 @@ import java.util.concurrent.TimeUnit;
 import cn.dev33.satoken.annotation.SaIgnore;
 import cn.hutool.core.util.ObjectUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.ruoyi.common.constant.Constants;
 import com.ruoyi.common.exception.ServiceException;
-import com.ruoyi.rsaencrypt.annotation.RsaSecurityParameter;
 import com.ruoyi.work.domain.ActProcess;
-import com.ruoyi.work.domain.HisProcess;
 import com.ruoyi.work.domain.TProcess;
 import com.ruoyi.work.domain.vo.ProcessVo;
 import com.ruoyi.work.dto.ProcessVoResultDto;
@@ -131,7 +128,6 @@ public class UserController extends BaseController {
     @SaIgnore
     @Log(title = "获取当前业务运行到那一步",businessType = BusinessType.OTHER)
     @PostMapping("/processPlan")
-    @RsaSecurityParameter(inDecode = true,outEncode = false)
     public R<?> processPlan(@RequestBody ActProcess actProcess){
         List<TProcess> tProcesses = processMapper.selectList(new LambdaQueryWrapper<TProcess>()
             .eq(TProcess::getProcessKey, actProcess.getProcessKey()));
@@ -151,14 +147,11 @@ public class UserController extends BaseController {
 
     @Log(title = "对外提供步骤接口",businessType = BusinessType.OTHER)
     @PostMapping("/stepProcessPlan")
-    @RsaSecurityParameter(inDecode = true,outEncode = false)
     public R<?> stepProcessPlan(@RequestBody ActProcess actProcess){
+        actProcess.setProcessKey("apply_house");
         if (ObjectUtil.isNull(actProcess.getBusinessId())){
             return R.fail("必要参数不可为空");
         }
-        if (ObjectUtil.isNull(actProcess.getProcessKey())){
-            return R.fail("必要参数不可为空");
-        }
         if (ObjectUtil.isNull(actProcess.getApiKey())){
             return R.fail("必要参数不可为空");
         }

ruoyi-admin/src/main/resources/application-prod.yml

@@ -106,7 +106,8 @@ spring:
 spring:
   redis:
     # 地址
-    host: 182.42.81.18
+#    host: 182.42.81.18
+    host: 172.12.9.2
     #    host: 127.0.0.1
     # 端口，默认为6379
     port: 6379
@@ -188,8 +189,8 @@ sms:
 
 #Linux dev
 file:
-  domain: https://mihuatang.xyz
+  domain: https://rcaj.cdhtgycs.cn
-  path: /home/taxi/images
+  path: /usr/local/images
   prefix: /images
   size: 10
   template: /usr/local/template/

ruoyi-admin/src/main/resources/spy.properties

@@ -7,7 +7,7 @@ appender=com.baomidou.mybatisplus.extension.p6spy.StdoutLogger
 # 使用日志系统记录 sql
 #appender=com.p6spy.engine.spy.appender.Slf4JLogger
 # 设置 p6spy driver 代理
-#deregisterdrivers=true
+deregisterdrivers=true
 # 取消JDBC URL前缀
 useprefix=true
 # 配置记录 Log 例外,可去掉的结果集有error,info,batch,debug,statement,commit,rollback,result,resultset.

ruoyi-admin/src/test/java/com/ruoyi/test/DemoUnitTest.java

@@ -2,8 +2,8 @@ package com.ruoyi.test;
 
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.codec.Base64;
-import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.io.resource.ClassPathResource;
+import cn.hutool.core.util.IdcardUtil;
 import cn.hutool.core.util.NumberUtil;
 import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.crypto.SecureUtil;
@@ -29,8 +29,6 @@ import com.ruoyi.common.utils.AesUtil;
 import com.ruoyi.common.utils.DateUtils;
 import com.ruoyi.common.utils.spring.SpringUtils;
 import com.ruoyi.demo.domain.ImageDemoData;
-import com.ruoyi.mq.service.OrderService;
-import com.ruoyi.mq.service.Produceras;
 import com.ruoyi.system.domain.*;
 import com.ruoyi.system.domain.vo.HousesReviewVo;
 import com.ruoyi.system.domain.vo.MaterialTalentsVo;
@@ -53,9 +51,6 @@ import com.ruoyi.work.utils.WorkComplyUtils;
 import org.apache.commons.text.CaseUtils;
 import org.bouncycastle.crypto.engines.SM2Engine;
 import org.junit.jupiter.api.*;
-import org.springframework.amqp.core.Message;
-import org.springframework.amqp.core.MessageProperties;
-import org.springframework.amqp.rabbit.core.RabbitTemplate;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.util.ReflectionUtils;
@@ -125,14 +120,14 @@ public class DemoUnitTest {
     @Autowired
     private HousingConstructionBureauPushDto housingConstructionBureauPushDto;
 
-    @Autowired
+    /*@Autowired
     private Produceras providerCustomer;
 
     @Autowired
     private OrderService orderService;
 
     @Autowired
-    private RabbitTemplate amqpTemplate;
+    private RabbitTemplate amqpTemplate;*/
 
 
     @DisplayName("测试 @SpringBootTest @Test @DisplayName 注解")
@@ -206,15 +201,16 @@ public class DemoUnitTest {
     @Test
     public void test002(){
         ProcessVo processVo = new ProcessVo();
-        processVo.setProcessKey("apply_jn");
+        processVo.setProcessKey("apply_house");
         processVo.setStep("1");
-        BuyHouses buyHouses = buyHousesMapper.selectById("10");
+        BuyHouses buyHouses = buyHousesMapper.selectById("12");
         buyHouses.setUpdateTime(DateUtils.getNowDate());
-        buyHouses.setCompanyId("100");
         Map<String, Object> map = BeanUtil.beanToMap(buyHouses);
         processVo.setParams(map);
-        processVo.setBusinessId("10");
+        processVo.setBusinessId(buyHouses.getId().toString());
         processVo.setStartUser(buyHouses.getUserName());
+        processVo.setCardId(buyHouses.getCardId());
+        processVo.setCompanyName(buyHouses.getCompanyName());
         WorkComplyUtils.comply(processVo);
     }
 
@@ -228,19 +224,22 @@ public class DemoUnitTest {
         hisProcess.setParams(map);
         hisProcess.setProcessKey(buyHouses.getProcessKey());
         hisProcess.setStartUser(buyHouses.getUserName());
-        String s = WorkComplyUtils.batchDeleted(hisProcess,null);
+        Map map1 = WorkComplyUtils.batchDeleted(hisProcess, null);
-        System.out.println("s = " + s);
+        System.out.println("s = " + map1);
     }
 
     @Test
     public void  test004(){
-        BusinessDTO businessDTO = new BusinessDTO();
+        /*BusinessDTO businessDTO = new BusinessDTO();
 //        BuyHouses buyHouses = buyHousesMapper.selectById("1011");
         HousesReview housesReview = housesReviewMapper.selectById("1633344911078064130");
         Map<String, Object> map = BeanUtil.beanToMap(housesReview);
         businessDTO.setParams(map);
         businessDTO.setBusinessId(housesReview.getId().toString());
-        WorkComplyUtils.getStep(businessDTO);
+        WorkComplyUtils.getStep(businessDTO);*/
+
+        boolean validCard = IdcardUtil.isValidCard("51050319960221405X");
+        System.out.println("validCard = " + validCard);
     }
 
     @Test
@@ -362,10 +361,10 @@ public class DemoUnitTest {
 //        System.out.println("processPlan = " +processPlan) ;
     }
 
-    @Test
+//    @Test
-    public void test00000(){
+//    public void test00000(){
-        processMapper.updateCommonByBusinessId("buy_houses", Constants.FAILD,"2");
+//        processMapper.updateCommonByBusinessId("buy_houses", Constants.FAILD,"2");
-    }
+//    }
 
     @Test
     public void tests1245545(){
@@ -464,6 +463,8 @@ public class DemoUnitTest {
     @Test
     public void test4454545() throws Exception {
         Keypair keypair = Sm2.generateKeyPairHex();
+        String publicKey1 = keypair.getPublicKey();
+
         String privateKey = "9cefdfcb925a32e10206d3a693ba204632c59e5f9a171faebb814885191dd35e";
         System.out.println("privateKey = " + privateKey);
         String publicKey = "0435661bb2d13bba88f47af0bbe243fcded8f27ac298932661787f88ea283c2b31fe427e1aa8410826a963e9114fe5ffab4ad278aeeb7f1f161e735d1f50570e78";
@@ -579,7 +580,7 @@ public class DemoUnitTest {
             .header("Referer","http://192.168.0.54:8084")
             .header("path","/user/house/insertOpenBuyHouses")
             .header("method","POST")
-            .body(doDecrypt,"application/json")
+            .body(doEncrypt,"application/json")
             .execute().body();
         System.out.println("result2 = " + result2);
     }
@@ -604,25 +605,27 @@ public class DemoUnitTest {
     }
 
     /**
-     * 登录接口
+     * 查看日志接口
      */
     @Test
     public void test0002(){
         String publicKey="0435661bb2d13bba88f47af0bbe243fcded8f27ac298932661787f88ea283c2b31fe427e1aa8410826a963e9114fe5ffab4ad278aeeb7f1f161e735d1f50570e78";
+//        String publicKey="04eea960591fff39b445b289faf56f755a1c895de57dfa3ca6ab2c84d2b5429cad1444809d941e4a0ed168bd226d0bf28a016389f26ea8506039da5db6a93a79f6";
         HashMap<String, Object> map = new HashMap<>();
-        map.put("businessId","15808234569");//用户标识符
+        map.put("businessId","2819");//用户标识符
-        map.put("processKey","apply_house");//使用方唯一key
         map.put("apiKey","gaoxingongyuanchengshiju");//使用方唯一key
         String s = JSONUtil.toJsonPrettyStr(map);
         String doEncrypt = Sm2.doEncrypt(s, publicKey);
-        String result2 = HttpRequest.post("http://192.168.0.54:8084/user/house/stepProcessPlan")
+//        String result2 = HttpRequest.post("https://dbxqtalents.cn/gx-api/user/stepProcessPlan")
-            .header("Referer","http://192.168.0.54:8084")
+        String result2 = HttpRequest.post("http://127.0.0.1:8084/user/stepProcessPlan")
-            .header("path","/user/house/stepProcessPlan")
+            .header("Referer","https://dbxqtalents.cn/gx-api")
+            .header("path","/user/stepProcessPlan")
             .header("targe","weixin")
-            .header("Authorization","Bearer eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJsb2dpblR5cGUiOiJsb2dpbiIsImxvZ2luSWQiOiJhcHBfdXNlcjo0Mzc4OSIsInJuU3RyIjoiV05XZFFnaHpHYlRRRU5ObVpwbmhaaFp6MmtKaWtSR0MiLCJ1c2VySWQiOjQzNzg5fQ.QCsN3iIFk38dzTvXITGx2wV5c9kdPdvWZs7gjf6dFzc")
+            .header("Authorization","Bearer eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJsb2dpblR5cGUiOiJsb2dpbiIsImxvZ2luSWQiOiJzeXNfdXNlcjoxIiwicm5TdHIiOiJUNjZNSjBIckwzcjF1YkFsQlFTem4yNTdjdDhTc2l2cyIsInVzZXJJZCI6MX0.qbEbSQ7ZElegj_1-BKs3xzDfBuZHBItQzJkNaMv0Lrs")
             .header("method","POST")
             .body(doEncrypt,"application/json")
             .execute().body();
+        System.out.println("result2 = " + result2);
     }
 
     /**
@@ -634,17 +637,19 @@ public class DemoUnitTest {
         HashMap<String, Object> map = new HashMap<>();
         map.put("username","15808234569");
         map.put("apiKey","gaoxingongyuanchengshiju");
-        BuyHouses buyHouses = buyHousesMapper.selectById("3");
         String s = JSONUtil.toJsonPrettyStr(map);
         String doEncrypt = Sm2.doEncrypt(s, publicKey);
-        String result2 = HttpRequest.post("http://192.168.0.54:8084/userOpenLogin")
+//        String result2 = HttpRequest.post("https://dbxqtalents.cn/gx-api/userOpenLogin")
-            .header("Referer","http://192.168.0.54:8084")
+//        String result2 = HttpRequest.post("http://192.168.0.54:8084/userOpenLogin")
+        String result2 = HttpRequest.post("http://ljlcom.gnway.cc/userOpenLogin")
+            .header("Referer","https://dbxqtalents.cn/gx-api")
             .header("path","/userOpenLogin")
             .header("targe","weixin")
             .header("Authorization","Bearer eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJsb2dpblR5cGUiOiJsb2dpbiIsImxvZ2luSWQiOiJhcHBfdXNlcjo0Mzc4OSIsInJuU3RyIjoiV05XZFFnaHpHYlRRRU5ObVpwbmhaaFp6MmtKaWtSR0MiLCJ1c2VySWQiOjQzNzg5fQ.QCsN3iIFk38dzTvXITGx2wV5c9kdPdvWZs7gjf6dFzc")
             .header("method","POST")
             .body(doEncrypt,"application/json")
             .execute().body();
+        System.out.println("result2 = " + result2);
     }
 
     /**
@@ -741,12 +746,12 @@ public class DemoUnitTest {
     public void test15234523(){
 //        providerCustomer.sendDelayMsg("延迟队列测试",3);
         String msg ="我来了";
-        MessageProperties messageProperties = new MessageProperties();
+       /* MessageProperties messageProperties = new MessageProperties();
         messageProperties.setHeader("x-delay",5000);//延迟5秒被删除
         Message message = new Message(msg.getBytes(), messageProperties);
         amqpTemplate.convertAndSend("PLUGIN_DELAY_EXCHANGE","delay","123132");//交换机和路由键必须和配置文件类中保持一致
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
-        System.out.println("消息发送成功【" + sdf.format(new Date()) + "】");
+        System.out.println("消息发送成功【" + sdf.format(new Date()) + "】");*/
 //        orderService.makeOrder();
     }
 
@@ -772,4 +777,18 @@ public class DemoUnitTest {
 //        List<HousesReview> collect = housesReviewList.stream().filter(h -> h.getPassTime().getMonth() == month).collect(Collectors.toList());
 //        System.out.println("collect = " + collect);
     }
+
+    /**
+     * 获取公钥和私钥
+     */
+    @Test
+    public void test0004(){
+        Keypair keypair = Sm2.generateKeyPairHex();
+        String publicKey = keypair.getPublicKey();
+        System.out.println("publicKey = " + publicKey);
+
+        String privateKey = keypair.getPrivateKey();
+        System.out.println("privateKey = " + privateKey);
     }
+}
+

ruoyi-common/pom.xml

@@ -182,6 +182,13 @@
             <artifactId>poi-tl</artifactId>
             <version>1.12.1</version>
         </dependency>
+
+<!--        rsa加密-->
+        <dependency>
+            <groupId>com.antherd</groupId>
+            <artifactId>sm-crypto</artifactId>
+            <version>0.3.2</version>
+        </dependency>
         <!--<dependency>
             <groupId>org.apache.poi</groupId>
             <artifactId>poi-excelant</artifactId>

ruoyi-common/src/main/java/com/ruoyi/common/advice/DecodeRequestBodyAdvice.java

@@ -1,10 +1,11 @@
-package com.ruoyi.rsaencrypt.advice;
+package com.ruoyi.common.advice;
+
 import cn.hutool.core.io.IoUtil;
 import cn.hutool.core.util.ObjectUtil;
 import com.ruoyi.common.core.domain.RsaSecurity;
+import com.ruoyi.common.core.service.IRsaSecurityService2;
+import com.ruoyi.common.utils.RSAUtil;
 import com.ruoyi.common.utils.spring.SpringUtils;
-import com.ruoyi.rsaencrypt.service.IRsaSecurityService2;
-import com.ruoyi.rsaencrypt.utls.RSAUtil;
 import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -14,6 +15,7 @@ import org.springframework.http.HttpInputMessage;
 import org.springframework.http.converter.HttpMessageConverter;
 import org.springframework.web.bind.annotation.ControllerAdvice;
 import org.springframework.web.servlet.mvc.method.annotation.RequestBodyAdvice;
+
 import java.io.IOException;
 import java.io.InputStream;
 import java.lang.reflect.Type;
@@ -26,7 +28,6 @@ import java.util.List;
  * @date 2018/10/29 20:17
  */
 @ControllerAdvice
-//@RsaSecurityParameter()
 public class DecodeRequestBodyAdvice implements RequestBodyAdvice {
 
     private static final Logger logger = LoggerFactory.getLogger(DecodeRequestBodyAdvice.class);

ruoyi-common/src/main/java/com/ruoyi/common/advice/EncodeResponseBodyAdvice.java

@@ -1,11 +1,11 @@
-package com.ruoyi.rsaencrypt.advice;
+package com.ruoyi.common.advice;
 import cn.hutool.core.util.ObjectUtil;
 import com.ruoyi.common.core.domain.R;
 import com.ruoyi.common.core.domain.RsaSecurity;
+import com.ruoyi.common.core.service.IRsaSecurityService2;
 import com.ruoyi.common.utils.JsonUtils;
+import com.ruoyi.common.utils.RSAUtil;
 import com.ruoyi.common.utils.spring.SpringUtils;
-import com.ruoyi.rsaencrypt.service.IRsaSecurityService2;
-import com.ruoyi.rsaencrypt.utls.RSAUtil;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.core.MethodParameter;
@@ -15,8 +15,6 @@ import org.springframework.http.server.ServerHttpResponse;
 import org.springframework.web.bind.annotation.ControllerAdvice;
 import org.springframework.web.servlet.mvc.method.annotation.ResponseBodyAdvice;
 
-import java.rmi.ServerException;
-
 /**
  * @author monkey
  * @desc 返回数据加密

ruoyi-common/src/main/java/com/ruoyi/common/core/service/IRsaSecurityService2.java

@@ -1,8 +1,9 @@
-package com.ruoyi.rsaencrypt.service;
+package com.ruoyi.common.core.service;
 
 
 import com.ruoyi.common.core.domain.RsaSecurity;
 
 public interface IRsaSecurityService2 {
+
     RsaSecurity getInfo(String path,String method);
 }

ruoyi-common/src/main/java/com/ruoyi/common/utils/RSAUtil.java

@@ -1,7 +1,7 @@
-package com.ruoyi.rsaencrypt.utls;
+package com.ruoyi.common.utils;
+
 import cn.hutool.core.util.ObjectUtil;
 import com.antherd.smcrypto.sm2.Sm2;
-import com.ruoyi.rsaencrypt.annotation.RsaSecurityParameter;
 
 /**
  * RSA加解密工具类

ruoyi-generator/pom.xml

@@ -28,10 +28,6 @@
             <groupId>com.ruoyi</groupId>
             <artifactId>ruoyi-common</artifactId>
         </dependency>
-        <dependency>
-            <groupId>com.ruoyi</groupId>
-            <artifactId>ruoyi-rsaencrypt</artifactId>
-        </dependency>
 
     </dependencies>
 

ruoyi-generator/src/main/java/com/ruoyi/generator/controller/GenController.java

@@ -12,7 +12,6 @@ import com.ruoyi.common.enums.BusinessType;
 import com.ruoyi.generator.domain.GenTable;
 import com.ruoyi.generator.domain.GenTableColumn;
 import com.ruoyi.generator.service.IGenTableService;
-import com.ruoyi.rsaencrypt.annotation.RsaSecurityParameter;
 import lombok.RequiredArgsConstructor;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
@@ -109,7 +108,6 @@ public class GenController extends BaseController {
     @SaCheckPermission("tool:gen:edit")
     @Log(title = "代码生成", businessType = BusinessType.UPDATE)
     @PutMapping
-    @RsaSecurityParameter(inDecode = true)
     public R<Void> editSave(@Validated @RequestBody GenTable genTable) {
         genTableService.validateEdit(genTable);
         genTableService.updateGenTable(genTable);

ruoyi-rsaencrypt/pom.xml

@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <parent>
-        <artifactId>ruoyi-vue-plus</artifactId>
-        <groupId>com.ruoyi</groupId>
-        <version>4.7.0</version>
-    </parent>
-    <modelVersion>4.0.0</modelVersion>
-
-    <artifactId>ruoyi-rsaencrypt</artifactId>
-
-    <description>
-        数据加密模块
-    </description>
-
-    <dependencies>
-        <dependency>
-            <groupId>com.ruoyi</groupId>
-            <artifactId>ruoyi-common</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>com.antherd</groupId>
-            <artifactId>sm-crypto</artifactId>
-            <version>0.3.2</version>
-        </dependency>
-    </dependencies>
-
-
-</project>

ruoyi-rsaencrypt/src/main/java/com/ruoyi/rsaencrypt/annotation/RsaSecurityParameter.java

@@ -1,40 +0,0 @@
-package com.ruoyi.rsaencrypt.annotation;
-
-import org.springframework.core.annotation.Order;
-import org.springframework.web.bind.annotation.Mapping;
-
-import java.lang.annotation.*;
-
-
-/**
- * @author monkey
- * @desc 请求RSA数据解密
- * @date 2018/10/25 20:17
- */
-@Target({ElementType.METHOD,ElementType.TYPE})
-@Retention(RetentionPolicy.RUNTIME)
-@Mapping
-@Documented
-@Order(0)
-public @interface RsaSecurityParameter {
-
-    /**
-     * 入参是否解密，默认不解密
-     */
-    boolean inDecode() default false;
-
-    /**
-     * 出参是否加密，默认加密
-     */
-    boolean outEncode() default true;
-
-
-    /**
-     * 出参公钥
-     * @return
-     */
-    String outPublicKey() default "" ;
-
-
-
-}

ruoyi-rsaencrypt/src/main/resources/META-INF/spring.factories

@@ -1,3 +0,0 @@
-org.springframework.boot.autoconfigure.EnableAutoConfiguration=\
-com.ruoyi.rsaencrypt.advice.DecodeRequestBodyAdvice,\
-com.ruoyi.rsaencrypt.advice.EncodeResponseBodyAdvice

ruoyi-system/src/main/java/com/ruoyi/system/common/WorkBusinessRule.java

@@ -28,11 +28,12 @@ public class WorkBusinessRule {
     private static final HousesReviewMapper housesReviewMapper = SpringUtils.getBean(HousesReviewMapper.class);
     private static final MaterialModuleServiceImpl materialModuleService = SpringUtils.getBean(MaterialModuleServiceImpl.class);
 
-    public String getDistrict(String district){
+    public String getDistrict(String district,String step){
         //先获取业务数据
         QueryWrapper<BuyHouseCheck> qw = new QueryWrapper<>();
         qw.eq("crux_key","buy_house_audit");
         qw.eq("other_key",district);
+        qw.eq("step",step);
         BuyHouseCheckVo buyHouseCheckVo = buyHouseCheckMapper.selectVoOne(qw);
         return buyHouseCheckVo.getPerson();
     }
@@ -41,7 +42,8 @@ public class WorkBusinessRule {
         HousesReview housesReview = housesReviewMapper.selectById(id);
         Map<String, Object> map = BeanUtil.beanToMap(housesReview);
         List<MaterialModuleVo> materialInfo = materialModuleService.getMaterialInfo(map);
-        List<String> collect = materialInfo.stream().map(MaterialModuleVo::getAuditDept).filter(c -> ObjectUtil.isNotNull(c) && ObjectUtil.isNotEmpty(c)).collect(Collectors.toList());
+        List<String> collect = materialInfo.stream().map(MaterialModuleVo::getAuditDept)
+            .filter(c -> ObjectUtil.isNotNull(c) && ObjectUtil.isNotEmpty(c)).collect(Collectors.toList());
         return collect;
     }
 }

ruoyi-system/src/main/java/com/ruoyi/system/domain/BuyHouseCheck.java

@@ -40,4 +40,6 @@ public class BuyHouseCheck{
      */
     private String cruxKey;
 
+    private String step;
+
 }

ruoyi-system/src/main/java/com/ruoyi/system/domain/BuyHouses.java

@@ -177,5 +177,6 @@ public class BuyHouses extends BaseEntity {
     @TableField(exist = false)
     private String reply;
 
+    private String step;
 
 }

ruoyi-system/src/main/java/com/ruoyi/system/domain/HousesReview.java

@@ -33,6 +33,8 @@ public class HousesReview extends BaseEntity {
      * 证件类型
      */
     private String cardType;
+
+    private String step;
     /**
      * 身份证号码
      */

ruoyi-system/src/main/java/com/ruoyi/system/domain/bo/BuyHousesBo.java

@@ -28,7 +28,7 @@ public class BuyHousesBo extends BaseEntity {
     /**
      *
      */
-    @NotNull(message = "不能为空", groups = { EditGroup.class })
+//    @NotNull(message = "不能为空", groups = { EditGroup.class })
     private Long id;
 
     /**
@@ -196,7 +196,7 @@ public class BuyHousesBo extends BaseEntity {
     /**
      * 用户id
      */
-    @NotNull(message = "用户id不能为空", groups = { AddGroup.class, EditGroup.class })
+//    @NotNull(message = "用户id不能为空", groups = { AddGroup.class, EditGroup.class })
     private Long userId;
 
     /**
@@ -231,6 +231,7 @@ public class BuyHousesBo extends BaseEntity {
     /**
      * 流程状态
      */
+    @NotBlank(message = "状态不能为空", groups = { AddGroup.class, EditGroup.class })
     private String processStatus;
 
     @TableField(exist = false)
@@ -246,4 +247,6 @@ public class BuyHousesBo extends BaseEntity {
 
     private String apiKey;
 
+    private String step;
+
 }

ruoyi-system/src/main/java/com/ruoyi/system/domain/bo/HousesReviewBo.java

@@ -40,6 +40,8 @@ public class HousesReviewBo extends BaseEntity {
     @NotBlank(message = "证件类型不能为空", groups = { AddGroup.class, EditGroup.class })
     private String cardType;
 
+
+    private String step;
     /**
      * 身份证号码
      */

ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/BuyHouseCheckVo.java

@@ -48,5 +48,7 @@ public class BuyHouseCheckVo {
     @ExcelProperty(value = "关键key")
     private String cruxKey;
 
+    private String step;
+
 
 }

ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/BuyHousesVo.java

@@ -252,4 +252,6 @@ public class BuyHousesVo {
 
     private String apiKey;
 
+    private String step;
+
 }

ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/HousesReviewVo.java

@@ -37,6 +37,7 @@ public class HousesReviewVo implements Serializable {
 //    @JsonSerialize(using = MySerializerUtils.class)
     private Long id;
 
+    private String step;
     /**
      * 证件类型
      */

ruoyi-system/src/main/java/com/ruoyi/system/service/IBuyHousesService.java

@@ -110,7 +110,7 @@ public interface IBuyHousesService {
      * @param buyHouses
      * @return
      */
-    R<?> insertOpenBuyHouses(BuyHouses buyHouses);
+    R<?> insertOpenBuyHouses(BuyHousesBo buyHouses);
 
     R<?> getIndexType();
 

ruoyi-system/src/main/java/com/ruoyi/system/service/impl/BuyHousesServiceImpl.java

@@ -2,7 +2,6 @@ package com.ruoyi.system.service.impl;
 
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.date.DateUtil;
-import cn.hutool.core.date.Month;
 import cn.hutool.core.util.NumberUtil;
 import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.http.HttpUtil;
@@ -68,6 +67,7 @@ import java.util.stream.Stream;
  */
 @RequiredArgsConstructor
 @Service
+@Transactional(rollbackFor = Exception.class)
 public class BuyHousesServiceImpl implements IBuyHousesService {
 
     @Value("${file.template}")
@@ -112,6 +112,9 @@ public class BuyHousesServiceImpl implements IBuyHousesService {
     @Override
     public BuyHousesVo queryById(Long id){
         BuyHousesVo buyHousesVo = baseMapper.selectVoById(id);
+        if (ObjectUtil.isNull(buyHousesVo)){
+            throw new ServiceException("数据查询为空");
+        }
         LambdaQueryWrapper<MaterialProof> wrapper = new LambdaQueryWrapper<MaterialProof>()
             .eq(MaterialProof::getHouseId, buyHousesVo.getId())
             .eq(MaterialProof::getProcessKey, buyHousesVo.getProcessKey());
@@ -265,6 +268,8 @@ public class BuyHousesServiceImpl implements IBuyHousesService {
             processVo.setParams(map);
             processVo.setBusinessId(bo.getId().toString());
             processVo.setStartUser(bo.getUserName());
+            processVo.setCardId(bo.getCardId());
+            processVo.setCompanyName(bo.getCompanyName());
             WorkComplyUtils.comply(processVo);
         }
         return flag;
@@ -277,10 +282,15 @@ public class BuyHousesServiceImpl implements IBuyHousesService {
     @Transactional(rollbackFor = Exception.class)
     public Boolean updateByBo(BuyHousesBo bo) {
         Long userId = LoginHelper.getUserId();
+        BuyHouses buyHouses = baseMapper.selectOne(new LambdaQueryWrapper<>(BuyHouses.class).eq(BuyHouses::getUserId, userId));
+        if (ObjectUtil.isNull(buyHouses)){
+            throw new ServiceException("请先下载申请表");
+        }
         bo.setUserId(userId);
         BuyHouses update = BeanUtil.toBean(bo, BuyHouses.class);
         validEntityBeforeSave(update);
         update.setProcessStatus(Constants.WAIT);
+        update.setStep("1");
         Boolean flag =  baseMapper.updateById(update) > 0;
         if (flag){
             //将数据添加到流程中
@@ -291,6 +301,8 @@ public class BuyHousesServiceImpl implements IBuyHousesService {
             processVo.setParams(map);
             processVo.setBusinessId(bo.getId().toString());
             processVo.setStartUser(bo.getUserName());
+            processVo.setCardId(bo.getCardId());
+            processVo.setCompanyName(bo.getCompanyName());
             WorkComplyUtils.comply(processVo);
         }
         return flag;
@@ -306,11 +318,12 @@ public class BuyHousesServiceImpl implements IBuyHousesService {
         Long userId = LoginHelper.getUserId();
         BuyHouses buyHouses = baseMapper.selectOne(new LambdaQueryWrapper<>(BuyHouses.class).eq(BuyHouses::getUserId, userId));
         if (ObjectUtil.isNotNull(buyHouses)) {
-            if (!Constants.SUBMIT.equals(buyHouses.getProcessStatus()) && !Constants.FAILD.equals(buyHouses.getProcessStatus())) {
+            if (!Constants.SUBMIT.equals(buyHouses.getProcessStatus())
+                && !Constants.FAILD.equals(buyHouses.getProcessStatus())
+//                && !Constants.CANCEL.equals(buyHouses.getProcessStatus())
+            ) {
                 throw new ServiceException("当前用户不可修改");
             }
-            //删除家庭情况信息
-//            buyHousesMemberMapper.delete(new LambdaQueryWrapper<>(BuyHousesMember.class).eq(BuyHousesMember::getBuyHousesId, buyHouses.getId()));
             //先删除家庭信息表
             if (entity.getBuyHousesMemberList().size() > 0) {
                 buyHousesMemberMapper.delete(new LambdaQueryWrapper<>(BuyHousesMember.class).eq(BuyHousesMember::getBuyHousesId, entity.getId()));
@@ -367,6 +380,7 @@ public class BuyHousesServiceImpl implements IBuyHousesService {
     public R downloadWord(BuyHousesBo bo) {
         bo.setUserId(LoginHelper.getUserId());
         BuyHouses buyHousesBo = BeanUtil.toBean(bo, BuyHouses.class);
+        buyHousesBo.setStep("1");
         validEntityBeforeSave(buyHousesBo);
         LinkedHashMap<String, Object> map = new LinkedHashMap<>();
         //判断数据库中是否存在该人才通过身份证去验证
@@ -385,6 +399,7 @@ public class BuyHousesServiceImpl implements IBuyHousesService {
             if (Constants.SUBMIT.equals(buyHouses.getProcessStatus()) || Constants.FAILD.equals(buyHouses.getProcessStatus())){
                 //执行修改操作
                 buyHousesBo.setUpdateTime(new Date());
+                buyHousesBo.setId(buyHouses.getId());
                 BuyHouses toBean = BeanUtil.toBean(buyHousesBo, BuyHouses.class);
                 baseMapper.updateById(toBean);
                 map.put("buyHouses",toBean);
@@ -569,54 +584,73 @@ public class BuyHousesServiceImpl implements IBuyHousesService {
     @Override
     public R getBuyHousesLogsByUserId() {
         Long userId = LoginHelper.getUserId();
+        HashMap<String, Object> map = new HashMap<>();
         BuyHouses buyHouses = baseMapper.selectOne(new LambdaQueryWrapper<>(BuyHouses.class).eq(BuyHouses::getUserId, userId));
+        if (ObjectUtil.isNotNull(buyHouses)) {
             List<AuditLog> auditLogList = auditLogMapper.selectList(new LambdaQueryWrapper<>(AuditLog.class).eq(AuditLog::getOtherId, buyHouses.getId()).orderByAsc(AuditLog::getCreateTime));
             if (auditLogList.size() > 0) {
                 auditLogList.stream().forEach(a -> {
                     if (ObjectUtil.isNull(a.getProcessKey())) {
 //                    1.待提交 2.受理中 3.受理退件 4.受理驳回 5.初审中 6.初审不通过 7.初审退件 8.审定中 9.审定不通过 10.审定通过  11.审定退件,12.资格取消
                         switch (a.getStatus()) {
-                        case "1":a.setStatus("待提交");
+                            case "1":
+                                a.setStatus("待提交");
                                 break;
-                        case "2":a.setStatus("受理中");
+                            case "2":
+                                a.setStatus("受理中");
                                 break;
-                        case "3":a.setStatus("受理退件");
+                            case "3":
+                                a.setStatus("受理退件");
                                 break;
-                        case "4":a.setStatus("受理驳回");
+                            case "4":
+                                a.setStatus("受理驳回");
                                 break;
-                        case "5":a.setStatus("初审中");
+                            case "5":
+                                a.setStatus("初审中");
                                 break;
-                        case "6":a.setStatus("初审不通过");
+                            case "6":
+                                a.setStatus("初审不通过");
                                 break;
-                        case "7":a.setStatus("初审退件");
+                            case "7":
+                                a.setStatus("初审退件");
                                 break;
-                        case "8":a.setStatus("审定中");
+                            case "8":
+                                a.setStatus("审定中");
                                 break;
-                        case "9":a.setStatus("审定不通过");
+                            case "9":
+                                a.setStatus("审定不通过");
                                 break;
-                        case "10":a.setStatus("审定通过");
+                            case "10":
+                                a.setStatus("审定通过");
                                 break;
-                        case "11":a.setStatus("审定退件");
+                            case "11":
+                                a.setStatus("审定退件");
                                 break;
-                        case "12":a.setStatus("资格取消");
+                            case "12":
+                                a.setStatus("资格取消");
                                 break;
                         }
                     } else {
                         switch (a.getStatus()) {
-                        case "1":a.setStatus("审核失败");
+                            case "1":
+                                a.setStatus("审核失败");
                                 break;
-                        case "2":a.setStatus("审核成功");
+                            case "2":
+                                a.setStatus("审核成功");
                                 break;
                         }
                     }
                 });
             }
-        HashMap<String, Object> map = new HashMap<>();
+
             map.put("auditLog", auditLogList);
             map.put("status", buyHouses.getProcessStatus());
             map.put("id", buyHouses.getId());
             return R.ok("查询成功",map);
         }
+        return R.fail("当前身份证与登录信息不匹配");
+
+    }
 
     @Override
     public R downloadInform() {
@@ -687,17 +721,17 @@ public class BuyHousesServiceImpl implements IBuyHousesService {
 
     /**
      * 对外推送接口
-     * @param buyHouses
+     * @param bo
      * @return
      */
     @Override
-    public R<?> insertOpenBuyHouses(BuyHouses buyHouses) {
+    public R<?> insertOpenBuyHouses(BuyHousesBo bo) {
+        BuyHouses buyHouses = BeanUtil.toBean(bo, BuyHouses.class);
+        buyHouses.setStep("1");
         BuyHouses buyHouses1 = baseMapper.selectOne(new LambdaQueryWrapper<>(BuyHouses.class).eq(BuyHouses::getCardId, buyHouses.getCardId()));
         if (ObjectUtil.isNull(buyHouses1)){
             //新增
-            if (ObjectUtil.isNull(buyHouses.getProcessStatus())){
+            buyHouses.setProcessStatus(Constants.WAIT);
-                return R.fail("状态不可为空");
-            }
             buyHouses.setProcessKey("apply_house");
             buyHouses.setCreateTime(new Date());
             buyHouses.setUpdateTime(new Date());
@@ -715,8 +749,15 @@ public class BuyHousesServiceImpl implements IBuyHousesService {
             buyHousesMemberMapper.insertBatch(buyHousesMemberList);
 
         }else {
+            //判断状态是否在可执行范围
+            if (!Constants.WAIT.equals(buyHouses.getProcessStatus())
+                && !Constants.SUBMIT.equals(buyHouses.getProcessStatus())
+                && ! Constants.FAILD.equals(buyHouses.getProcessStatus())){
+                return R.fail("当前状态不在修改范围");
+            }
+            buyHouses.setId(buyHouses1.getId());
             //判断该人才是否存在
-            if (ObjectUtil.isEmpty(buyHouses1.getApiKey()) || !buyHouses.getUserId().equals(buyHouses1.getUserId())){
+            if (ObjectUtil.isEmpty(buyHouses1.getApiKey()) || !buyHouses1.getUserId().equals(buyHouses.getUserId())){
                 return R.fail("当前用户已在系统存在");
             }
             //判断当前是否可以提交
@@ -742,7 +783,7 @@ public class BuyHousesServiceImpl implements IBuyHousesService {
             }
             buyHousesMemberMapper.insertBatch(buyHousesMemberList);
         }
-        if (Constants.WAIT.equals(buyHouses1.getProcessStatus())){
+        if (Constants.WAIT.equals(buyHouses.getProcessStatus())){
             //创建流程
             //将数据添加到流程中
             ProcessVo processVo = new ProcessVo();
@@ -752,9 +793,11 @@ public class BuyHousesServiceImpl implements IBuyHousesService {
             processVo.setParams(map);
             processVo.setBusinessId(buyHouses.getId().toString());
             processVo.setStartUser(buyHouses.getUserName());
+            processVo.setCardId(buyHouses.getCardId());
+            processVo.setCompanyName(buyHouses.getCompanyName());
             WorkComplyUtils.comply(processVo);
         }
-        return R.ok();
+        return R.ok(buyHouses.getId());
     }
 
     @Override

ruoyi-system/src/main/java/com/ruoyi/system/service/impl/HousesReviewServiceImpl.java

@@ -52,6 +52,7 @@ import java.util.stream.Collectors;
  */
 @RequiredArgsConstructor
 @Service
+@Transactional(rollbackFor = Exception.class)
 public class HousesReviewServiceImpl implements IHousesReviewService {
 
     private final HousesReviewMapper baseMapper;
@@ -312,6 +313,8 @@ public class HousesReviewServiceImpl implements IHousesReviewService {
             processVo.setParams(map);
             processVo.setBusinessId(bo.getId().toString());
             processVo.setStartUser(bo.getName());
+            processVo.setCompanyName(bo.getCompanyName());
+            processVo.setCardId(bo.getCard());
             WorkComplyUtils.comply(processVo);
         }
         return i>0;
@@ -322,13 +325,13 @@ public class HousesReviewServiceImpl implements IHousesReviewService {
      */
     private void validEntityBeforeSave(HousesReview entity){
         if (!"D".equals(entity.getTalentsType())){
-            entity.setTypeExtend(null);
+            entity.setTypeExtend("");
         }
         //如果是区级没有企业类型且D类不区分学历和技能
         if (entity.getSourceBy().equals("1")){
-            entity.setCompanyType(null);
+            entity.setCompanyType("");
             if (entity.getTalentsType().equals("D")){
-                entity.setTypeExtend(null);
+                entity.setTypeExtend("");
             }
         }
     }
@@ -370,15 +373,6 @@ public class HousesReviewServiceImpl implements IHousesReviewService {
         }else {
             HousesReview update = BeanUtil.toBean(bo, HousesReview.class);
             validEntityBeforeSave(update);
-            //家庭信息修改,先删除,再增加
-            /*buyHousesReviewMemberMapper.delete(new LambdaQueryWrapper<>(BuyHousesReviewMember.class).eq(BuyHousesReviewMember::getBuyHousesId,bo.getId()));
-            if (bo.getBuyHousesMemberList().size()>0){
-                bo.getBuyHousesMemberList().forEach(t ->{
-                    t.setId(null);
-                    t.setBuyHousesId(String.valueOf(bo.getId()));
-                });
-                buyHousesReviewMemberMapper.insertBatch(bo.getBuyHousesMemberList());
-            }*/
             baseMapper.updateById(update);
             Map<String, Object> map = BeanUtil.beanToMap(update);
             List<MaterialModuleVo> materialInfo = materialModuleService.getMaterialInfo(map);

ruoyi-system/src/main/java/com/ruoyi/system/service/impl/RsaSecurityServiceImpl.java

@@ -5,6 +5,7 @@ import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.json.JSONUtil;
 import com.ruoyi.common.constant.CacheConstants;
 import com.ruoyi.common.constant.CacheNames;
+import com.ruoyi.common.core.service.IRsaSecurityService2;
 import com.ruoyi.common.exception.ServiceException;
 import com.ruoyi.common.utils.JsonUtils;
 import com.ruoyi.common.utils.StringUtils;
@@ -14,7 +15,6 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.ruoyi.common.utils.redis.CacheUtils;
-import com.ruoyi.rsaencrypt.service.IRsaSecurityService2;
 import lombok.RequiredArgsConstructor;
 import org.springframework.cache.annotation.CachePut;
 import org.springframework.cache.annotation.Cacheable;
@@ -71,7 +71,7 @@ public class RsaSecurityServiceImpl implements IRsaSecurityService, IRsaSecurity
     private LambdaQueryWrapper<RsaSecurity> buildQueryWrapper(RsaSecurityBo bo) {
         Map<String, Object> params = bo.getParams();
         LambdaQueryWrapper<RsaSecurity> lqw = Wrappers.lambdaQuery();
-        lqw.eq(StringUtils.isNotBlank(bo.getPath()), RsaSecurity::getPath, bo.getPath());
+        lqw.like(StringUtils.isNotBlank(bo.getPath()), RsaSecurity::getPath, bo.getPath());
         lqw.eq(bo.getInDecode() != null, RsaSecurity::getInDecode, bo.getInDecode());
         lqw.eq(bo.getOutEncode() != null, RsaSecurity::getOutEncode, bo.getOutEncode());
         lqw.eq(StringUtils.isNotBlank(bo.getPublicKey()), RsaSecurity::getPublicKey, bo.getPublicKey());

ruoyi-system/src/main/java/com/ruoyi/system/service/impl/UserServiceImpl.java

@@ -19,6 +19,7 @@ import com.ruoyi.system.domain.vo.UserVo;
 import com.ruoyi.system.domain.User;
 import com.ruoyi.system.mapper.UserMapper;
 import com.ruoyi.system.service.IUserService;
+import org.springframework.transaction.annotation.Transactional;
 
 import java.util.LinkedHashMap;
 import java.util.List;
@@ -33,6 +34,7 @@ import java.util.Collection;
  */
 @RequiredArgsConstructor
 @Service
+@Transactional(rollbackFor = Exception.class)
 public class UserServiceImpl implements IUserService {
 
     private final UserMapper baseMapper;

ruoyi-system/src/main/resources/mapper/system/BuyHouseCheckMapper.xml

@@ -10,6 +10,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="person" column="person"/>
         <result property="otherKey" column="other_key"/>
         <result property="cruxKey" column="crux_key"/>
+        <result property="step" column="step"/>
     </resultMap>
 
 

ruoyi-system/src/main/resources/mapper/system/BuyHousesMapper.xml

@@ -43,6 +43,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="processStatus" column="process_status"/>
         <result property="version" column="version"/>
         <result property="apiKey" column="api_key"/>
+        <result property="step" column="step"/>
 
     </resultMap>
     <select id="getIndexType" resultType="java.util.Map">

ruoyi-system/src/main/resources/mapper/system/HousesReviewMapper.xml

@@ -37,6 +37,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="companyAddressArea" column="company_address_area"/>
         <result property="typeExtend" column="type_extend"/>
         <result property="passTime" column="pass_time"/>
+        <result property="step" column="step"/>
     </resultMap>
 
 

ruoyi-work/pom.xml

@@ -28,10 +28,6 @@
             <groupId>org.apache.commons</groupId>
             <artifactId>commons-text</artifactId>
         </dependency>
-        <dependency>
-            <groupId>com.ruoyi</groupId>
-            <artifactId>ruoyi-rsaencrypt</artifactId>
-        </dependency>
         <!--<dependency>
             <groupId>com.ruoyi</groupId>
             <artifactId>ruoyi-sms</artifactId>

ruoyi-work/src/main/java/com/ruoyi/work/controller/WorkController.java

@@ -10,7 +10,7 @@ import com.ruoyi.common.core.domain.R;
 import com.ruoyi.common.core.page.TableDataInfo;
 import com.ruoyi.common.enums.BusinessType;
 import com.ruoyi.common.exception.ServiceException;
-import com.ruoyi.rsaencrypt.annotation.RsaSecurityParameter;
+import com.ruoyi.common.helper.LoginHelper;
 import com.ruoyi.work.domain.ActProcess;
 import com.ruoyi.work.domain.HisProcess;
 import com.ruoyi.work.domain.RollBackLog;
@@ -41,7 +41,7 @@ import java.util.stream.Collectors;
 @RequiredArgsConstructor
 @RestController
 @RequestMapping("/work")
-@Transactional
+@Transactional(rollbackFor = Exception.class)
 public class WorkController extends BaseController {
     private final ProcessMapper processMapper;
     private  final HousingConstructionBureauPushDto housingConstructionBureauPushDto;
@@ -52,7 +52,6 @@ public class WorkController extends BaseController {
     @Log(title = "获取待办数据",businessType = BusinessType.OTHER)
     @SaCheckPermission("work:task:taskList")
     @GetMapping("/getWaitTaskList")
-    @RsaSecurityParameter
     public TableDataInfo<ActProcess> getWaitTaskList(ActProcess actProcess, PageQuery pageQuery){
         return WorkComplyUtils.getWaitTaskList(actProcess,pageQuery);
     }
@@ -63,7 +62,6 @@ public class WorkController extends BaseController {
     @Log(title = "获取已办数据",businessType = BusinessType.OTHER)
     @SaCheckPermission("work:task:historyList")
     @GetMapping("/getHistoryList")
-    @RsaSecurityParameter
     public TableDataInfo<HisProcess> getHistoryList(HisProcess hisProcess, PageQuery pageQuery){
         return WorkComplyUtils.getHistoryList(hisProcess,pageQuery);
     }
@@ -74,7 +72,6 @@ public class WorkController extends BaseController {
     @Log(title = "获取当前业务运行到那一步",businessType = BusinessType.OTHER)
     @SaCheckPermission("work:task:processPlan")
     @PostMapping("/processPlan")
-    @RsaSecurityParameter(inDecode = true,outEncode = false)
     public R<?> processPlan(@RequestBody ActProcess actProcess){
         if (ObjectUtil.isNull(actProcess.getBusinessId())){
             return R.fail("businessId不可为空");
@@ -100,7 +97,6 @@ public class WorkController extends BaseController {
      */
     @Log(title = "获取可退回步骤",businessType = BusinessType.OTHER)
     @PostMapping("/getStep")
-    @RsaSecurityParameter(inDecode = true)
     public R<?> getStep(@RequestBody BusinessDTO businessDTO){
         LambdaQueryWrapper<TProcess> wrapper = new LambdaQueryWrapper<TProcess>()
             .eq(TProcess::getProcessKey, businessDTO.getProcessKey());
@@ -119,7 +115,6 @@ public class WorkController extends BaseController {
     @Log(title = "流程办理",businessType = BusinessType.OTHER)
 //    @SaCheckPermission("work:task:batchDeleted")
     @PostMapping("/batchDeleted")
-    @RsaSecurityParameter(inDecode = true)
     public R<?> batchDeleted(@RequestBody HisProcess hisProcess){
         if (ObjectUtil.isNull(hisProcess.getStatus())){
             return R.fail("状态不可为空");
@@ -137,15 +132,21 @@ public class WorkController extends BaseController {
         }
         Map<String, Object> map = WorkUtils.getInfoToMap(tProcesses.get(0).getBean(),hisProcess.getBusinessId());
         hisProcess.setParams(map);
-        String s = WorkComplyUtils.batchDeleted(hisProcess,tProcesses.stream().map(TProcess::getId).collect(Collectors.toList()));
+        Map map1 = WorkComplyUtils.batchDeleted(hisProcess,tProcesses.stream().map(TProcess::getId).collect(Collectors.toList()));
+        String s = String.valueOf(map1.get("status"));
         HashMap<String, Object> hashMap = new HashMap<>();
         hashMap.put("id", String.valueOf(map.get("id")));
+        String deptName = LoginHelper.getLoginUser().getDeptName();
+        if (ObjectUtil.isNotNull(deptName)){
+            hashMap.put("auditDepartName",deptName);
+        }
         if (s.equals(Constants.NONENTITY)){
             return R.fail("暂无审核");
         }else{
-           /* if (Constants.SUCCEED.equals(s)){//审核成功推送数据
+            if ("apply_house".equals(hisProcess.getProcessKey())) {
+                if (Constants.SUCCEED.equals(s)) {//审核成功推送数据
                     //公园城市局推送
-                String virtualcode = String.valueOf(map.get("virtualcode"));
+                    /*String virtualcode = String.valueOf(map.get("virtualcode"));
                     map.put("virtualcode", virtualcode == "3" ? "010" : "009");
                     String cardType = String.valueOf(map.get("cardType"));
                     map.put("cardType", "中国籍".equals(cardType) ? 1 : 4);
@@ -155,7 +156,7 @@ public class WorkController extends BaseController {
                     map.put("buyHousesMemberList", "null");
                     map.put("buyHousesLogList", "null");
                     map.put("buyHousesLogList", "null");
-                housingConstructionBureauPushDto.openUrl("https://jcfw.cdzjryb.com//CCSRegistryCenter/rest",map,"253");
+                    housingConstructionBureauPushDto.openUrl("https://jcfw.cdzjryb.com//CCSRegistryCenter/rest",map,"253");*/
                     //人才通推送
                     hashMap.put("status", "00T");
                 } else if (Constants.FAILD.equals(s)) {
@@ -164,8 +165,14 @@ public class WorkController extends BaseController {
                 } else {
                     hashMap.put("status", "00D");
                 }
-            housingConstructionBureauPushDto.openUrl("https://www.cdhtrct.com/route/open/api/anju/openBuyHousesCallback",hashMap,"");*/
+                Object apiKey = map.get("apiKey");
-            processMapper.updateCommonByBusinessId(tProcesses.get(0).getBean(),s, hisProcess.getBusinessId());
+                if (ObjectUtil.isNotNull(apiKey) && String.valueOf(apiKey).equals("gaoxingongyuanchengshiju")) {
+                    housingConstructionBureauPushDto.send3(hashMap, "http://218.89.220.30:9200/rctopen/api/anju/openBuyHousesCallback");
+                }
+            }
+
+            Object step = map1.get("step");
+            processMapper.updateCommonByBusinessId(tProcesses.get(0).getBean(),s, hisProcess.getBusinessId(),step);
         }
         System.out.println("s = " + s);
         return R.ok();
@@ -179,7 +186,6 @@ public class WorkController extends BaseController {
     @Log(title = "获取业务id详情数据",businessType = BusinessType.OTHER)
     @SaCheckPermission("work:task:taskInfo")
     @PostMapping("/taskInfo")
-    @RsaSecurityParameter(inDecode = true)
     public R<?> getInfoById(@RequestBody ActProcess actProcess){
         if (ObjectUtil.isNull(actProcess.getProcessKey())){
             return R.fail("key不可为空");
@@ -197,7 +203,6 @@ public class WorkController extends BaseController {
 
     @Log(title = "获取审核日志",businessType = BusinessType.OTHER)
     @PostMapping("/auditLogList")
-    @RsaSecurityParameter(inDecode = true)
     public R<?> getAuditLogListByOtherId(@RequestBody BusinessDTO businessDTO){
         return WorkComplyUtils.getAuditLogListByOtherId(businessDTO);
     }
@@ -209,7 +214,6 @@ public class WorkController extends BaseController {
      */
     @Log(title = "回退",businessType = BusinessType.OTHER)
     @PostMapping("/rollBackLog")
-    @RsaSecurityParameter(inDecode = true)
     public R<?> rollBackLog(@RequestBody RollBackLog rollBackLog){
         LambdaQueryWrapper<TProcess> wrapper = new LambdaQueryWrapper<TProcess>()
             .eq(TProcess::getProcessKey, rollBackLog.getProcessKey());

ruoyi-work/src/main/java/com/ruoyi/work/domain/vo/ProcessVo.java

@@ -126,6 +126,10 @@ public class ProcessVo {
 
     private Date createTime;
 
+    private String companyName;
+
+    private String cardId;
+
 
 
 

ruoyi-work/src/main/java/com/ruoyi/work/mapper/ProcessMapper.java

@@ -13,6 +13,6 @@ import org.apache.ibatis.annotations.Param;
  */
 public interface ProcessMapper extends BaseMapperPlus<ProcessMapper, TProcess, ProcessVo> {
 
-    boolean updateCommonByBusinessId(@Param("bean") String bean, @Param("processStatus") String processStatus, @Param("businessId") String businessId);
+    boolean updateCommonByBusinessId(@Param("bean") String bean, @Param("processStatus") String processStatus, @Param("businessId") String businessId, @Param("step") Object step);
 
 }

ruoyi-work/src/main/java/com/ruoyi/work/service/impl/ProcessServiceImpl.java

@@ -14,6 +14,7 @@ import com.ruoyi.work.mapper.ProcessMapper;
 import com.ruoyi.work.service.IProcessService;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 
 import java.util.Collection;
 import java.util.List;
@@ -26,6 +27,7 @@ import java.util.List;
  */
 @RequiredArgsConstructor
 @Service
+@Transactional(rollbackFor = Exception.class)
 public class ProcessServiceImpl implements IProcessService {
 
     private final ProcessMapper baseMapper;

ruoyi-work/src/main/java/com/ruoyi/work/utils/WorkComplyUtils.java

@@ -101,6 +101,8 @@ public class WorkComplyUtils {
             actProcessVo.setCardId(String.valueOf(card));
         }
         actProcessVo.setUserId(String.valueOf(LoginHelper.getUserId()));
+        actProcessVo.setCardId(processVo.getCardId());
+        actProcessVo.setCompanyName(processVo.getCompanyName());
         actProcessVo.setCreateTime(DateUtils.getNowDate());
         actProcessVo.setCheckType(tProcessByKey.getCheckType());
         actProcessVo.setStep(tProcessByKey.getStep());
@@ -176,14 +178,15 @@ public class WorkComplyUtils {
      * 2.根据businessId删除actProcess
      */
 
-    public static  String batchDeleted(HisProcess hisProcess,List<Long> ids){
+    public static  Map batchDeleted(HisProcess hisProcess,List<Long> ids){
+        HashMap<String, Object> map = new HashMap<>();
         hisProcess.setEndTime(DateUtils.getNowDate());
         //获取当前购房信息
         //1.得到当前这条运行任务
         LambdaQueryWrapper<ActProcess> lqw = new LambdaQueryWrapper<>();
         lqw.eq(ActProcess::getBusinessId,hisProcess.getBusinessId());
-        lqw.eq(ActProcess::getProcessId,ids);
+        lqw.eq(ObjectUtil.isNotNull(hisProcess.getStep()) && ObjectUtil.isNotEmpty(hisProcess.getStep()),ActProcess::getStep,hisProcess.getStep());
-
+        lqw.in(ActProcess::getProcessId,ids);
         List<ActProcessVo> actProcessVos = actProcessMapper.selectVoList(lqw);
         LoginUser loginUser = LoginHelper.getLoginUser();
         if (actProcessVos.size()>0){
@@ -261,7 +264,8 @@ public class WorkComplyUtils {
                     //删除当前业务的数据
                     List<Long> collect1 = actProcessVos.stream().map(ActProcessVo::getId).collect(Collectors.toList());
                     actProcessMapper.deleteBatchIds(collect1);
-                    return Constants.FAILD;
+                    map.put("status",Constants.FAILD);
+                    return map;
                 } else if ("2".equals(hisProcess.getStatus())) {//审核成功
                     //修改业务表的状态,0保持,1提交,审核中,2成功,3失败
                     //判断是否只剩最后一条记录
@@ -277,20 +281,28 @@ public class WorkComplyUtils {
                             processVo.setParams(hisProcess.getParams());
                             processVo.setBusinessId(hisProcess.getBusinessId());
                             processVo.setStartUser(actProcessVo.getStartUser());
+                            processVo.setCompanyName(actProcessVo.getCompanyName());
+                            processVo.setCardId(actProcessVo.getCardId());
                             comply(processVo);
-                            return Constants.WAIT;
+                            map.put("status",Constants.WAIT);
+                            map.put("step",step);
+                            return map;
                         } else {
                             //业务办结
-                            return Constants.SUCCEED;
+                            map.put("status",Constants.SUCCEED);
+                            return map;
+
                         }
                     }
-                    return Constants.WAIT;
+                    map.put("status",Constants.WAIT);
+                    return map;
                 }
             }else {
                 throw new ServiceException("当前不具备审核资格");
             }
         }
-        return Constants.NONENTITY;
+        map.put("status",Constants.NONENTITY);
+        return map;
     }
 
     /**
@@ -627,6 +639,7 @@ public class WorkComplyUtils {
             e.setAuditLogList1(auditLogs);
             e.setActProcessVoList(actProcessVoList);
             e.setBusinessId(businessId);
+            params.put("step",e.getStep());
             e.setParams(params);
             //遍历出他每一步所需要的审核人
             if ("1".equals(e.getType())){//普通流程,只需查出将人员设置到运行流程中即可
@@ -710,6 +723,20 @@ public class WorkComplyUtils {
             e.setBean(null);
             e.setAudit1(null);
             e.setActProcessVoList(null);
+            List<AuditLog> auditLogList = e.getAuditLogList();
+            auditLogList.forEach(a ->{
+                a.setCreateBy(null);
+                a.setUpdateBy(null);
+                a.setId(null);
+                a.setAuditId(null);
+                a.setOtherId(null);
+                a.setRoleName(null);
+                a.setPushLog(null);
+                a.setProcessKey(null);
+                a.setAudit(null);
+                a.setStep(null);
+                a.setAuditType(null);
+            });
         });
         Map<String, List<ProcessVo>> collect = list1.stream().collect(Collectors.groupingBy(ProcessVo::getStep));
         List<ProcessVoResultDto> collect1 = collect.entrySet()
@@ -759,14 +786,14 @@ public class WorkComplyUtils {
             String o = params.get(e.getParamName()).toString();
             e.setAudit1(params.get(e.getParam()).toString());
             e.setAudit(o);
-        }else if("1".equals(e.getCheckType())) {
+        }else if("1".equals(e.getCheckType()) || "5".equals(e.getChecked())) {
             //根据id获取人员信息
             SysUser sysUser = sysUserMapper.selectUserById(Long.valueOf(e.getAudit()));
             if(ObjectUtil.isNull(sysUser)){
                 throw new ServiceException("根据id获取人员信息失败");
             }
             e.setAudit1(e.getAudit());
-            e.setAudit(sysUser.getUserName());
+            e.setAudit(sysUser.getNickName());
         }else if ("2".equals(e.getCheckType())){
             SysDept sysDept = sysDeptMapper.selectDeptById(Long.valueOf(e.getAudit()));
             if(ObjectUtil.isNull(sysDept)){
@@ -782,7 +809,6 @@ public class WorkComplyUtils {
             e.setAudit1(e.getAudit());
             e.setAudit(sysRole.getRoleName());
         }
-
         List<ActProcessVo> actProcessVoList =e.getActProcessVoList();
         List<AuditLog> auditLogs = e.getAuditLogList1();
         List<ActProcessVo> collect1 = actProcessVoList.stream().filter(a -> a.getAudit().equals(e.getAudit1()) && a.getCheckType().equals(e.getCheckType()) && a.getStep().equals(e.getStep()) && a.getType().equals(e.getType())).collect(Collectors.toList());
@@ -810,7 +836,7 @@ public class WorkComplyUtils {
                     if (auditLogs.size()>0){
                         AuditLog auditLog = auditLogs.get(auditLogs.size()-1);
                         if (auditLog.getAudit().equals(e.getAudit1()) && auditLog.getStep().equals(e.getStep()) && auditLog.getAuditType().equals(e.getCheckType())){
-                            e.setChecked("2");
+                            e.setChecked("4");
                         }
                     }
                 }else if (Constants.CANCEL.equals(process_status.toString())){
@@ -835,14 +861,14 @@ public class WorkComplyUtils {
             List<AuditLog> collect = auditLogs.stream().filter(a -> e.getStep().equals(a.getStep()) && e.getAudit1().equals(a.getAudit())).collect(Collectors.toList());
             if (e.getProcessKey().equals("apply_house") && collect.size()==0 ) {
                 if ("1".equals(e.getStep())) {
-                    collect = auditLogs.stream().filter(a -> e.getAudit1().equals(a.getAuditId()) &&
+                    collect = auditLogs.stream().filter(a -> e.getAudit1().equals(a.getAudit()) &&
                         (a.getStatus().equals("1") || a.getStatus().equals("2") || a.getStatus().equals("3")
                             || a.getStatus().equals("4") || a.getStatus().equals("5")) ).collect(Collectors.toList());
                 }else if ("2".equals(e.getStep())){
-                    collect = auditLogs.stream().filter(a -> e.getAudit1().equals(a.getAuditId()) &&
+                    collect = auditLogs.stream().filter(a -> e.getAudit1().equals(a.getAudit()) &&
                         (a.getStatus().equals("6") || a.getStatus().equals("7") || a.getStatus().equals("8"))).collect(Collectors.toList());
                 }else if ("3".equals(e.getStep())){
-                    collect = auditLogs.stream().filter(a -> e.getAudit1().equals(a.getAuditId()) &&
+                    collect = auditLogs.stream().filter(a -> e.getAudit1().equals(a.getAudit()) &&
                         (a.getStatus().equals("9") || a.getStatus().equals("10") || a.getStatus().equals("11") || a.getStatus().equals("12"))).collect(Collectors.toList());
                 }
 
@@ -890,17 +916,6 @@ public class WorkComplyUtils {
                                 break;
                         }
                     }
-                    a.setCreateBy(null);
-                    a.setUpdateBy(null);
-                    a.setId(null);
-                    a.setAuditId(null);
-                    a.setOtherId(null);
-                    a.setRoleName(null);
-                    a.setPushLog(null);
-                    a.setProcessKey(null);
-                    a.setAudit(null);
-                    a.setStep(null);
-                    a.setAuditType(null);
                 });
             }else {
                 collect.stream().forEach(a -> {
@@ -917,17 +932,6 @@ public class WorkComplyUtils {
                                 break;
                         }
                     }
-                    a.setCreateBy(null);
-                    a.setUpdateBy(null);
-                    a.setId(null);
-                    a.setAuditId(null);
-                    a.setOtherId(null);
-                    a.setRoleName(null);
-                    a.setPushLog(null);
-                    a.setProcessKey(null);
-                    a.setAudit(null);
-                    a.setStep(null);
-                    a.setAuditType(null);
                 });
             }
 

ruoyi-work/src/main/resources/mapper/work/ActProcessMapper.xml

@@ -58,7 +58,7 @@
               FROM act_process
               WHERE process_id IN
                     (SELECT id FROM `process` WHERE FIND_IN_SET(#{actProcess.userId},cc))
-              GROUP BY business_id  ) AS a
+              GROUP BY business_id,process_id  ) AS a
                 INNER JOIN process p ON p.id = a.process_id
         <where>
             <if test="actProcess.processKey != null and actProcess.processKey != ''"> and p.process_key =#{actProcess.processKey}</if>

ruoyi-work/src/main/resources/mapper/work/ProcessMapper.xml

@@ -24,7 +24,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     </resultMap>
     <update id="updateCommonByBusinessId">
-        update ${bean} set process_status = #{processStatus} ,pass_time =now()  where id = #{businessId}
+        update ${bean}
+        <set>
+            <if test="processStatus != null and processStatus != ''">process_status = #{processStatus},</if>
+            pass_time =now(),
+            <if test="step != null and step != ''">step = #{step}</if>
+        </set>
+         where id = #{businessId}
     </update>