优化

src/main/java/com/zhgd/xmgl/modules/basicdata/controller/admin/SystemUserAuthController.java

@@ -6,6 +6,7 @@ import com.qiwenshare.common.result.RestResult;
 import com.zhgd.annotation.OperLog;
 import com.zhgd.jeecg.common.api.vo.Result;
 import com.zhgd.jeecg.common.constant.CommonConstant;
+import com.zhgd.mybatis.Aes;
 import com.zhgd.xmgl.modules.basicdata.dto.SystemUserAuthDto;
 import com.zhgd.xmgl.modules.basicdata.entity.Government;
 import com.zhgd.xmgl.modules.basicdata.entity.SystemUser;
@@ -19,7 +20,6 @@ import com.zhgd.xmgl.security.JwtTokenProvider;
 import com.zhgd.xmgl.security.SecurityUser;
 import com.zhgd.xmgl.security.SecurityUtil;
 import com.zhgd.xmgl.util.CommonUtil;
-import com.zhgd.xmgl.util.Sm4Util;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
@@ -87,8 +87,8 @@ public class SystemUserAuthController {
 			return result;
 		}
 		SystemUser user = systemUserService.getOne(Wrappers.<SystemUser>lambdaQuery()
-				.eq(SystemUser::getAccount, systemUser.getAccount())
+				.eq(SystemUser::getAccount, Aes.decrypt(systemUser.getAccount()))
-				.eq(SystemUser::getShowPassword, systemUser.getShowPassword()));
+				.eq(SystemUser::getShowPassword, Aes.decrypt(systemUser.getShowPassword())));
 		SystemUserAuthDto userInfo = new SystemUserAuthDto();
 		checkLogin(user, userInfo, result, systemUser.getAccount());
 		if (result.getCode() != CommonConstant.SC_INTERNAL_SERVER_ERROR_500) {
@@ -131,7 +131,7 @@ public class SystemUserAuthController {
 		if (!CommonUtil.checkStrongPwd(password)) {
 			return Result.error("密码必须包含数字、大小写字母、特殊符号且大于8位");
 		}
-		boolean flag = systemUserService.updatePassword(user.getUserId(), Sm4Util.encrypt(password));
+		boolean flag = systemUserService.updatePassword(user.getUserId(), Aes.encrypt(password));
 		if (flag) {
 			return Result.ok();
 		}

src/main/java/com/zhgd/xmgl/modules/basicdata/controller/government/GovEngineeringController.java

@@ -108,6 +108,7 @@ public class GovEngineeringController {
     public Result<IPage<Engineering>> examinePage(@ApiIgnore @RequestBody Map<String, Object> map) {
         QueryWrapper<Engineering> wrapper = QueryGenerator.initPageQueryWrapper(Engineering.class, map);
         Page<Engineering> page = PageUtil.getPage(map);
+        wrapper.lambda().ne(Engineering::getExamineState, 0);
         wrapper.lambda().orderByAsc(Engineering::getExamineState).orderByDesc(Engineering::getCreateTime);
         IPage<Engineering> pageList = engineeringService.getPageList(page, wrapper);
         return Result.success(pageList);

src/main/java/com/zhgd/xmgl/modules/basicdata/controller/government/GovEnterpriseController.java

@@ -2,12 +2,15 @@ package com.zhgd.xmgl.modules.basicdata.controller.government;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.zhgd.annotation.OperLog;
 import com.zhgd.jeecg.common.api.vo.Result;
 import com.zhgd.jeecg.common.system.query.QueryGenerator;
 import com.zhgd.xmgl.modules.basicdata.entity.Enterprise;
 import com.zhgd.xmgl.modules.basicdata.entity.EnterpriseMain;
+import com.zhgd.xmgl.modules.basicdata.entity.SystemUser;
 import com.zhgd.xmgl.modules.basicdata.service.IEnterpriseService;
+import com.zhgd.xmgl.modules.basicdata.service.ISystemUserService;
 import com.zhgd.xmgl.modules.basicdata.vo.EnterpriseVo;
 import com.zhgd.xmgl.security.SecurityUser;
 import com.zhgd.xmgl.security.SecurityUtil;
@@ -43,6 +46,9 @@ public class GovEnterpriseController {
     @Autowired
     private IEnterpriseService enterpriseService;
 
+    @Autowired
+    private ISystemUserService systemUserService;
+
     /**
      * 政务分页列表查询企业
      * @return
@@ -100,7 +106,7 @@ public class GovEnterpriseController {
             result.error500("未找到对应实体");
         } else {
             Integer suggest = MapUtils.getInteger(map, "suggest");
-            boolean ok = enterpriseService.updateInfo(enterpriseEntity, suggest);
+            boolean ok = enterpriseService.examine(enterpriseEntity, suggest);
             if (ok) {
                 result.success("修改成功!");
             }
@@ -108,6 +114,30 @@ public class GovEnterpriseController {
         return result;
     }
 
+    @OperLog(operModul = "企业管理", operType = "修改", operDesc = "企业修改")
+    @ApiOperation(value = "企业修改", notes = "企业修改", httpMethod = "POST")
+    @PostMapping(value = "/update")
+    public Result<Enterprise> update(@ApiIgnore @RequestBody EnterpriseVo enterpriseVo) {
+        Result<Enterprise> result = new Result<Enterprise>();
+        Enterprise enterprise = enterpriseService.getById(enterpriseVo.getEnterpriseId());
+        if (enterprise == null) {
+            result.error500("未找到对应实体");
+        } else {
+            // 检验项目账号是否已存在
+            SystemUser systemUser = systemUserService.getOne(Wrappers.<SystemUser>lambdaQuery().eq(SystemUser::getAccount, enterpriseVo.getAccount())
+                    .ne(SystemUser::getSn, enterprise.getEnterpriseSn()));
+            if (systemUser != null) {
+                result.error500("该用户账号已被使用");
+                return result;
+            }
+            enterpriseVo.setEnterpriseSn(enterprise.getEnterpriseSn());
+            boolean ok = enterpriseService.updateInfo(enterpriseVo);
+            if (ok) {
+                result.success("修改成功!");
+            }
+        }
+        return result;
+    }
 
     /**
      * 通过id查询

src/main/java/com/zhgd/xmgl/modules/basicdata/controller/project/EngineeringController.java

@@ -58,6 +58,7 @@ public class EngineeringController {
     public Result<IPage<Engineering>> queryPageList(@ApiIgnore @RequestBody Map<String, Object> map) {
         QueryWrapper<Engineering> wrapper = QueryGenerator.initPageQueryWrapper(Engineering.class, map);
         Page<Engineering> page = PageUtil.getPage(map);
+        wrapper.lambda().ne(Engineering::getExamineState, 0);
         wrapper.lambda().orderByDesc(Engineering::getCreateTime);
         IPage<Engineering> pageList = engineeringService.getPageList(page, wrapper);
         return Result.success(pageList);

src/main/java/com/zhgd/xmgl/modules/basicdata/service/IEnterpriseService.java

@@ -23,7 +23,9 @@ public interface IEnterpriseService extends IService<Enterprise> {
 
     boolean saveInfo(EnterpriseVo enterpriseVo);
 
-    boolean updateInfo(Enterprise enterprise, Integer suggest);
+    boolean updateInfo(EnterpriseVo enterpriseVo);
+
+    boolean examine(Enterprise enterprise, Integer suggest);
 
     EnterpriseVo getDetailById(Long enterpriseId);
 

src/main/java/com/zhgd/xmgl/modules/basicdata/service/impl/EnterpriseServiceImpl.java

@@ -7,6 +7,7 @@ import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.zhgd.jeecg.common.util.PageUtil;
+import com.zhgd.mybatis.Aes;
 import com.zhgd.xmgl.async.AsyncEmail;
 import com.zhgd.xmgl.modules.basicdata.entity.*;
 import com.zhgd.xmgl.modules.basicdata.mapper.EnterpriseMapper;
@@ -18,7 +19,6 @@ import com.zhgd.xmgl.modules.basicdata.service.ISystemUserService;
 import com.zhgd.xmgl.modules.basicdata.vo.EnterpriseVo;
 import com.zhgd.xmgl.security.SecurityUtil;
 import com.zhgd.xmgl.util.CommonUtil;
-import com.zhgd.xmgl.util.Sm4Util;
 import org.apache.commons.collections.MapUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -100,7 +100,7 @@ public class EnterpriseServiceImpl extends ServiceImpl<EnterpriseMapper, Enterpr
         if (flag) {
             SystemUser systemUser = new SystemUser();
             systemUser.setAccount(enterpriseVo.getAccount());
-            systemUser.setPassword(Sm4Util.encrypt(enterpriseVo.getPassword()));
+            systemUser.setPassword(Aes.encrypt(enterpriseVo.getPassword()));
             systemUser.setShowPassword(enterpriseVo.getPassword());
             systemUser.setRealName(enterpriseVo.getRealName());
             systemUser.setIsManager(true);
@@ -125,7 +125,36 @@ public class EnterpriseServiceImpl extends ServiceImpl<EnterpriseMapper, Enterpr
     }
 
     @Override
-    public boolean updateInfo(Enterprise enterprise, Integer suggest) {
+    public boolean updateInfo(EnterpriseVo enterpriseVo) {
+        List<EnterpriseMain> enterpriseMainList = enterpriseMainService.list(Wrappers.<EnterpriseMain>lambdaQuery().eq(EnterpriseMain::getEnterpriseSn, enterpriseVo.getEnterpriseSn()));
+        List<Long> ids = enterpriseMainList.stream().map(l -> l.getId()).collect(Collectors.toList());
+        enterpriseMainLicenseService.remove(Wrappers.<EnterpriseMainLicense>lambdaQuery().in(EnterpriseMainLicense::getMainId, ids));
+        enterpriseMainService.removeByIds(ids);
+        this.updateById(enterpriseVo);
+        SystemUser systemUser = systemUserService.getOne(Wrappers.<SystemUser>lambdaQuery().eq(SystemUser::getSn, enterpriseVo.getEnterpriseSn()).eq(SystemUser::getIsManager, 1));
+        systemUser.setAccount(enterpriseVo.getAccount());
+        systemUser.setPassword(Aes.encrypt(enterpriseVo.getPassword()));
+        systemUser.setShowPassword(enterpriseVo.getPassword());
+        systemUser.setRealName(enterpriseVo.getRealName());
+        systemUser.setState(enterpriseVo.getState());
+        systemUser.setUserTel(enterpriseVo.getPhone());
+        systemUser.setSn(enterpriseVo.getEnterpriseSn());
+        systemUser.setEmail(enterpriseVo.getEmail());
+        systemUserService.updateById(systemUser);
+        for (EnterpriseMain enterpriseMain : enterpriseVo.getEnterpriseMains()) {
+            enterpriseMain.setEnterpriseSn(enterpriseVo.getEnterpriseSn());
+            enterpriseMainService.save(enterpriseMain);
+            for (EnterpriseMainLicense licenses : enterpriseMain.getLicenses()) {
+                licenses.setEnterpriseSn(enterpriseVo.getEnterpriseSn());
+                licenses.setMainId(enterpriseMain.getId());
+            }
+            enterpriseMainLicenseService.saveBatch(enterpriseMain.getLicenses());
+        }
+        return true;
+    }
+
+    @Override
+    public boolean examine(Enterprise enterprise, Integer suggest) {
         SystemUser systemUser = systemUserService.getOne(Wrappers.<SystemUser>lambdaQuery()
                 .eq(SystemUser::getSn, enterprise.getEnterpriseSn()).eq(SystemUser::getIsManager, true));
         String content = "";

src/main/java/com/zhgd/xmgl/modules/basicdata/service/impl/GovernmentServiceImpl.java

@@ -8,6 +8,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.zhgd.mybatis.Aes;
 import com.zhgd.xmgl.modules.basicdata.dto.GovernmentDto;
 import com.zhgd.xmgl.modules.basicdata.entity.Enterprise;
 import com.zhgd.xmgl.modules.basicdata.entity.Government;
@@ -73,7 +74,7 @@ public class GovernmentServiceImpl extends ServiceImpl<GovernmentMapper, Governm
         SystemUser systemUser = new SystemUser();
         systemUser.setRealName(governmentVo.getGovernmentName());
         systemUser.setAccount(governmentVo.getAccount());
-        systemUser.setPassword(Sm4Util.encrypt(governmentVo.getPassword()));
+        systemUser.setPassword(Aes.encrypt(governmentVo.getPassword()));
         systemUser.setShowPassword(governmentVo.getPassword());
         systemUser.setCreateTime(new Date());
         systemUser.setSn(government.getGovernmentSn());

src/main/java/com/zhgd/xmgl/modules/basicdata/service/impl/ProjectServiceImpl.java

@@ -101,7 +101,7 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectMapper, Project> impl
         if (flag) {
             SystemUser systemUser = new SystemUser();
             systemUser.setAccount(projectVo.getAccount());
-            systemUser.setPassword(Sm4Util.encrypt(projectVo.getShowPassword()));
+            systemUser.setPassword(Aes.encrypt(projectVo.getShowPassword()));
             systemUser.setShowPassword(projectVo.getShowPassword());
             systemUser.setIsManager(true);
             systemUser.setState(0);