From 2cf24c26c52fcc446b425c3529297aceb04ebe2f Mon Sep 17 00:00:00 2001 From: pengjie <17373303529@163.com> Date: Thu, 12 Oct 2023 16:47:51 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E7=BC=96=E8=BE=91=E5=8A=9F?= =?UTF-8?q?=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../government/GovProjectController.java | 32 +++++++++ .../project/EngineeringController.java | 22 ++++-- .../modules/basicdata/entity/Engineering.java | 4 +- .../basicdata/mapper/xml/ProjectMapper.xml | 2 +- .../basicdata/service/IProjectService.java | 2 + .../service/impl/EngineeringServiceImpl.java | 7 +- .../impl/EngineeringSingleServiceImpl.java | 68 ++++++++++--------- .../service/impl/ProjectServiceImpl.java | 24 +++++-- .../xmgl/modules/basicdata/vo/ProjectVo.java | 4 +- 9 files changed, 115 insertions(+), 50 deletions(-) diff --git a/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/government/GovProjectController.java b/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/government/GovProjectController.java index e595bd8..8f43deb 100644 --- a/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/government/GovProjectController.java +++ b/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/government/GovProjectController.java @@ -1,12 +1,16 @@ package com.zhgd.xmgl.modules.basicdata.controller.government; 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.xmgl.modules.basicdata.dto.ProjectDto; import com.zhgd.xmgl.modules.basicdata.entity.Enterprise; import com.zhgd.xmgl.modules.basicdata.entity.Project; +import com.zhgd.xmgl.modules.basicdata.entity.SystemUser; import com.zhgd.xmgl.modules.basicdata.service.IProjectService; +import com.zhgd.xmgl.modules.basicdata.service.ISystemUserService; +import com.zhgd.xmgl.modules.basicdata.vo.ProjectVo; import com.zhgd.xmgl.modules.wisdom.dto.MapAiAlarmDto; import com.zhgd.xmgl.modules.wisdom.dto.MapEnvironAlarmDto; import com.zhgd.xmgl.modules.wisdom.service.IAiMonitorAlarmService; @@ -45,6 +49,9 @@ public class GovProjectController { @Autowired private IProjectService projectService; + @Autowired + private ISystemUserService systemUserService; + @Autowired private IAiMonitorAlarmService aiMonitorAlarmService; @@ -131,6 +138,31 @@ public class GovProjectController { return result; } + @OperLog(operModul = "项目管理", operType = "修改", operDesc = "项目修改") + @ApiOperation(value = "项目修改", notes = "项目修改", httpMethod = "POST") + @PostMapping(value = "/update") + public Result update(@ApiIgnore @RequestBody ProjectVo projectVo) { + Result result = new Result(); + Project project = projectService.getById(projectVo.getProjectId()); + if (project == null) { + result.error500("未找到对应实体"); + } else { + // 检验项目账号是否已存在 + SystemUser systemUser = systemUserService.getOne(Wrappers.lambdaQuery().eq(SystemUser::getAccount, projectVo.getAccount()) + .ne(SystemUser::getSn, project.getProjectSn())); + if (systemUser != null) { + result.error500("该用户账号已被使用"); + return result; + } + projectVo.setProjectSn(project.getProjectSn()); + boolean ok = projectService.updateInfo(projectVo); + if (ok) { + result.success("修改成功!"); + } + } + return result; + } + /** * 通过项目SN查询项目详细信息 * diff --git a/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/project/EngineeringController.java b/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/project/EngineeringController.java index 51ac958..d9f6f6f 100644 --- a/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/project/EngineeringController.java +++ b/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/project/EngineeringController.java @@ -13,6 +13,7 @@ import com.zhgd.xmgl.modules.basicdata.entity.EngineeringSingle; import com.zhgd.xmgl.modules.basicdata.service.IEngineeringService; import com.zhgd.xmgl.modules.basicdata.statistics.EngineeringStat; import com.zhgd.xmgl.modules.basicdata.vo.EngineeringVo; +import com.zhgd.xmgl.security.SecurityUtil; import com.zhgd.xmgl.valid.AddGroup; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; @@ -21,10 +22,7 @@ import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.validation.annotation.Validated; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.bind.annotation.*; import springfox.documentation.annotations.ApiIgnore; import java.util.List; @@ -87,6 +85,22 @@ public class EngineeringController { return result; } + /** + * 查询是否有未提交的报监信息 + * @param + * @return + */ + @OperLog(operModul = "工程管理", operType = "新增", operDesc = "查询是否有未提交的报监信息") + @ApiOperation(value = "查询是否有未提交的报监信息", notes = "查询是否有未提交的报监信息", httpMethod = "GET") + @GetMapping(value = "/queryUnAdd") + public Result queryUnAdd() { + Result result = new Result(); + Engineering engineering = engineeringService.getOne(Wrappers.lambdaQuery() + .eq(Engineering::getExamineState, 0).eq(Engineering::getProjectSn, SecurityUtil.getUser().getSn())); + result.data(engineering == null ? null : engineeringService.queryDetailById(engineering.getId())); + return result; + } + /** * 再次申请 * diff --git a/src/main/java/com/zhgd/xmgl/modules/basicdata/entity/Engineering.java b/src/main/java/com/zhgd/xmgl/modules/basicdata/entity/Engineering.java index 113e41f..59a965f 100644 --- a/src/main/java/com/zhgd/xmgl/modules/basicdata/entity/Engineering.java +++ b/src/main/java/com/zhgd/xmgl/modules/basicdata/entity/Engineering.java @@ -270,9 +270,9 @@ public class Engineering implements Serializable { @ApiModelProperty(value = "项目报监时间") private Date createTime; /** - * 工程审核状态(1:待审批;2:审批驳回;3:审批通过;) + * 工程审核状态(0:保存不提交;1:待审批;2:审批驳回;3:审批通过;) */ - @ApiModelProperty(value = "工程审核状态(1:待审批;2:审批驳回;3:审批通过;)") + @ApiModelProperty(value = "工程审核状态(0:保存不提交;1:待审批;2:审批驳回;3:审批通过;)") private Integer examineState; /** * 审核时间 diff --git a/src/main/java/com/zhgd/xmgl/modules/basicdata/mapper/xml/ProjectMapper.xml b/src/main/java/com/zhgd/xmgl/modules/basicdata/mapper/xml/ProjectMapper.xml index 4b3c6a1..65878d9 100644 --- a/src/main/java/com/zhgd/xmgl/modules/basicdata/mapper/xml/ProjectMapper.xml +++ b/src/main/java/com/zhgd/xmgl/modules/basicdata/mapper/xml/ProjectMapper.xml @@ -2,7 +2,7 @@ - p.project_sn, p.project_id, p.project_name, p.state, p.project_manage, p.project_address, p.project_tel, u.account, u.show_password, u.email, u.user_tel, g.government_name, + p.project_sn, p.project_id, p.project_name, p.state, p.project_manage, p.project_address, p.government_sn, p.project_tel, u.account, u.show_password, u.email, u.user_tel, g.government_name, p.longitude, p.latitude diff --git a/src/main/java/com/zhgd/xmgl/modules/basicdata/service/IProjectService.java b/src/main/java/com/zhgd/xmgl/modules/basicdata/service/IProjectService.java index 5317f3a..4303f23 100644 --- a/src/main/java/com/zhgd/xmgl/modules/basicdata/service/IProjectService.java +++ b/src/main/java/com/zhgd/xmgl/modules/basicdata/service/IProjectService.java @@ -26,6 +26,8 @@ public interface IProjectService extends IService { boolean saveInfo(ProjectVo projectVo); + boolean updateInfo(ProjectVo projectVo); + boolean examine(Project project, Integer suggest); List getSnListForGov(String governmentSn); diff --git a/src/main/java/com/zhgd/xmgl/modules/basicdata/service/impl/EngineeringServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/basicdata/service/impl/EngineeringServiceImpl.java index 4daa0b6..c57da60 100644 --- a/src/main/java/com/zhgd/xmgl/modules/basicdata/service/impl/EngineeringServiceImpl.java +++ b/src/main/java/com/zhgd/xmgl/modules/basicdata/service/impl/EngineeringServiceImpl.java @@ -99,10 +99,7 @@ public class EngineeringServiceImpl extends ServiceImpl scoreList = new ArrayList<>(); - for (EngineeringMain engineeringMain : engineeringVo.getEngineeringMains()) { - engineeringMain.setEngineeringSn(engineeringVo.getEngineeringSn()); - engineeringMainService.save(engineeringMain); - for (EngineeringMainPerson engineeringMainPerson : engineeringMain.getEngineeringMainPersonList()) { - engineeringMainPerson.setMainId(engineeringMain.getId()); - engineeringMainPerson.setEngineeringSn(engineeringVo.getEngineeringSn()); + if (engineeringVo.getAnnexFiles() != null) { + for (AnnexFile annexFile : engineeringVo.getAnnexFiles()) { + annexFile.setRelevanceId(engineeringVo.getEngineeringSn()); + annexFile.setFileType(ParamEnum.AnnexFileType.ENGINEERING.getValue()); } - engineeringMainPersonService.saveBatch(engineeringMain.getEngineeringMainPersonList()); - EnterpriseScore enterpriseScore = new EnterpriseScore(); - enterpriseScore.setEnterpriseSn(engineeringMain.getEnterpriseSn()); - enterpriseScore.setEngineeringSn(engineeringVo.getEngineeringSn()); - enterpriseScore.setEnterpriseType(engineeringMain.getType()); - enterpriseScore.setCreateBy(projectService.getOne(Wrappers.lambdaQuery().eq(Project::getProjectSn, SecurityUtil.getUser().getSn())).getGovernmentSn()); - enterpriseScore.setCreateTime(new Date()); - scoreList.add(enterpriseScore); + annexFileService.saveBatch(engineeringVo.getAnnexFiles()); } - enterpriseScoreService.saveBatch(scoreList); + + if (engineeringVo.getEngineeringMains() != null) { +// List scoreList = new ArrayList<>(); + for (EngineeringMain engineeringMain : engineeringVo.getEngineeringMains()) { + engineeringMain.setEngineeringSn(engineeringVo.getEngineeringSn()); + engineeringMainService.save(engineeringMain); + for (EngineeringMainPerson engineeringMainPerson : engineeringMain.getEngineeringMainPersonList()) { + engineeringMainPerson.setMainId(engineeringMain.getId()); + engineeringMainPerson.setEngineeringSn(engineeringVo.getEngineeringSn()); + } + engineeringMainPersonService.saveBatch(engineeringMain.getEngineeringMainPersonList()); +// EnterpriseScore enterpriseScore = new EnterpriseScore(); +// enterpriseScore.setEnterpriseSn(engineeringMain.getEnterpriseSn()); +// enterpriseScore.setEngineeringSn(engineeringVo.getEngineeringSn()); +// enterpriseScore.setEnterpriseType(engineeringMain.getType()); +// enterpriseScore.setCreateBy(projectService.getOne(Wrappers.lambdaQuery().eq(Project::getProjectSn, SecurityUtil.getUser().getSn())).getGovernmentSn()); +// enterpriseScore.setCreateTime(new Date()); +// scoreList.add(enterpriseScore); + } +// enterpriseScoreService.saveBatch(scoreList); + } + return true; } @@ -86,9 +90,11 @@ public class EngineeringSingleServiceImpl extends ServiceImpl engineeringMains = engineeringMainService.list(Wrappers.lambdaQuery() .eq(EngineeringMain::getEngineeringSn, engineeringSn)); List mainIds = engineeringMains.stream().map(m -> m.getId()).collect(Collectors.toList()); - engineeringMainPersonService.remove(Wrappers.lambdaQuery() - .in(EngineeringMainPerson::getMainId, mainIds)); - engineeringMainService.removeByIds(mainIds); + if (mainIds.size() > 0) { + engineeringMainPersonService.remove(Wrappers.lambdaQuery() + .in(EngineeringMainPerson::getMainId, mainIds)); + engineeringMainService.removeByIds(mainIds); + } return true; } diff --git a/src/main/java/com/zhgd/xmgl/modules/basicdata/service/impl/ProjectServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/basicdata/service/impl/ProjectServiceImpl.java index 995267e..db4a10d 100644 --- a/src/main/java/com/zhgd/xmgl/modules/basicdata/service/impl/ProjectServiceImpl.java +++ b/src/main/java/com/zhgd/xmgl/modules/basicdata/service/impl/ProjectServiceImpl.java @@ -9,6 +9,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.zhgd.jeecg.common.system.query.QueryGenerator; import com.zhgd.jeecg.common.util.PageUtil; +import com.zhgd.mybatis.Aes; import com.zhgd.xmgl.async.AsyncEmail; import com.zhgd.xmgl.modules.basicdata.dto.ProjectDto; import com.zhgd.xmgl.modules.basicdata.dto.ProjectPageDto; @@ -95,16 +96,16 @@ public class ProjectServiceImpl extends ServiceImpl impl public boolean saveInfo(ProjectVo projectVo) { projectVo.setProjectSn(CommonUtil.getUUid()); projectVo.setCreateTime(new Date()); - projectVo.setProjectTel(projectVo.getPhone()); + projectVo.setProjectTel(projectVo.getUserTel()); boolean flag = this.save(projectVo); if (flag) { SystemUser systemUser = new SystemUser(); systemUser.setAccount(projectVo.getAccount()); - systemUser.setPassword(Sm4Util.encrypt(projectVo.getPassword())); - systemUser.setShowPassword(projectVo.getPassword()); + systemUser.setPassword(Sm4Util.encrypt(projectVo.getShowPassword())); + systemUser.setShowPassword(projectVo.getShowPassword()); systemUser.setIsManager(true); systemUser.setState(0); - systemUser.setUserTel(projectVo.getPhone()); + systemUser.setUserTel(projectVo.getUserTel()); systemUser.setSn(projectVo.getProjectSn()); systemUser.setAccountType(4); systemUser.setEmail(projectVo.getEmail()); @@ -115,6 +116,21 @@ public class ProjectServiceImpl extends ServiceImpl impl return flag; } + @Override + public boolean updateInfo(ProjectVo projectVo) { + this.updateById(projectVo); + SystemUser systemUser = systemUserMapper.selectOne(Wrappers.lambdaQuery().eq(SystemUser::getSn, projectVo.getProjectSn()).eq(SystemUser::getIsManager, 1)); + systemUser.setAccount(projectVo.getAccount()); + systemUser.setPassword(Aes.encrypt(projectVo.getShowPassword())); + systemUser.setShowPassword(projectVo.getShowPassword()); + systemUser.setUserTel(projectVo.getUserTel()); + systemUser.setSn(projectVo.getProjectSn()); + systemUser.setEmail(projectVo.getEmail()); + systemUser.setRealName(projectVo.getProjectName()); + systemUserMapper.updateById(systemUser); + return true; + } + @Override public boolean examine(Project project, Integer suggest) { SystemUser systemUser = systemUserMapper.selectOne(Wrappers.lambdaQuery() diff --git a/src/main/java/com/zhgd/xmgl/modules/basicdata/vo/ProjectVo.java b/src/main/java/com/zhgd/xmgl/modules/basicdata/vo/ProjectVo.java index 1211941..5944cd4 100644 --- a/src/main/java/com/zhgd/xmgl/modules/basicdata/vo/ProjectVo.java +++ b/src/main/java/com/zhgd/xmgl/modules/basicdata/vo/ProjectVo.java @@ -14,7 +14,7 @@ public class ProjectVo extends Project { @NotBlank(message = "手机号码不能为空", groups = {AddGroup.class}) @ApiModelProperty(value="手机号") - private String phone; + private String userTel; @NotBlank(message = "登录账号不能为空", groups = {AddGroup.class}) @ApiModelProperty(value="账号") @@ -22,7 +22,7 @@ public class ProjectVo extends Project { @NotBlank(message = "密码不能为空", groups = {AddGroup.class}) @ApiModelProperty(value="密码") - private String password; + private String showPassword; @NotBlank(message = "邮箱不能为空", groups = {AddGroup.class}) @ApiModelProperty(value="邮箱")