pom.xml
@@ -76,6 +76,11 @@ <!-- <version>3.5.2</version>--> <!-- </dependency>--> <dependency> <groupId>org.mybatis.spring.boot</groupId> <artifactId>mybatis-spring-boot-starter</artifactId> <version>2.2.0</version> </dependency> <dependency> <groupId>org.aspectj</groupId> <artifactId>aspectjweaver</artifactId> <version>1.9.9.1</version> src/main/java/com/gkhy/labRiskManage/Application.java
@@ -1,11 +1,13 @@ package com.gkhy.labRiskManage; import org.mybatis.spring.annotation.MapperScan; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; import org.springframework.data.jpa.repository.config.EnableJpaAuditing; @EnableJpaAuditing @SpringBootApplication @MapperScan("com.gkhy.labRiskManage.mapper") public class Application { public static void main(String[] args){ src/main/java/com/gkhy/labRiskManage/api/controller/riskReport/dto/repDto/RiskUnitInsertReqBO.java
@@ -26,6 +26,10 @@ */ private String liabilityDep; /** * 责任部门id */ private Long liabilityDepId; /** * 风险单元描述 */ private String description; src/main/java/com/gkhy/labRiskManage/api/controller/riskReport/dto/repDto/RiskUnitUpdateReqBO.java
@@ -30,6 +30,10 @@ */ private String liabilityDep; /** * 责任部门id */ private Long liabilityDepId; /** * 风险单元描述 */ private String description; src/main/java/com/gkhy/labRiskManage/api/controller/riskReport/dto/respDto/RiskAssessQueryRespDTO.java
@@ -58,6 +58,11 @@ */ private Long planUserId; /** * 计划制定人 */ private String planUserName; /** * 评估开始时间 */ private LocalDateTime assessStartTime; src/main/java/com/gkhy/labRiskManage/application/riskReport/dto/bo/RiskUnitAppInsertBO.java
@@ -26,6 +26,11 @@ * 责任部门 */ private String liabilityDep; /** * 责任部门id */ private Long liabilityDepId; /** * 风险单元描述 */ src/main/java/com/gkhy/labRiskManage/application/riskReport/dto/bo/RiskUnitAppUpdateBO.java
@@ -30,6 +30,10 @@ */ private String liabilityDep; /** * 责任部门id */ private Long liabilityDepId; /** * 风险单元描述 */ private String description; src/main/java/com/gkhy/labRiskManage/application/riskReport/dto/dto/RiskAssessAppQueryDTO.java
@@ -57,6 +57,10 @@ */ private Long planUserId; /** * 计划制定人 */ private String planUserName; /** * 评估开始时间 */ private LocalDateTime assessStartTime; src/main/java/com/gkhy/labRiskManage/application/riskReport/dto/dto/RiskUnitAppQueryDTO.java
@@ -46,6 +46,11 @@ */ private String liabilityDep; /** * 责任部门id */ private Long liabilityDepId; /** * 图片 */ private String image; src/main/java/com/gkhy/labRiskManage/commons/enums/UserRoleEnum.java
@@ -2,17 +2,17 @@ public enum UserRoleEnum { USER_ROLE_1(1,"实验负责人"), USER_ROLE_1(1,"实验安全员"), USER_ROLE_2(2,"辨识专家"), USER_ROLE_3(3,"评价专家"), USER_ROLE_4(4,"实验管理者"), USER_ROLE_4(4,"实验室负责人"), USER_ROLE_5(5,"现场专家"), USER_ROLE_6(6,"综合办"), USER_ROLE_6(6,"综合办领导"), USER_ROLE_7(7,"超级管理员"),
@@ -1,5 +1,7 @@ package com.gkhy.labRiskManage.domain.riskReport.entity; import com.gkhy.labRiskManage.domain.account.entity.Role; import com.gkhy.labRiskManage.domain.account.entity.User; import com.gkhy.labRiskManage.domain.basic.entity.BasicTip; import lombok.Data; import org.hibernate.annotations.Fetch; @@ -169,6 +171,10 @@ */ private Byte manageLevel; @OneToOne(targetEntity = User.class,fetch = FetchType.EAGER) @JoinColumn(name = "planUserId",referencedColumnName = "id",insertable =false ,updatable = false) private User planUser; @OneToMany(fetch = FetchType.EAGER,cascade = {CascadeType.REFRESH}) @Fetch(FetchMode.SUBSELECT) @JoinColumn(name = "riskAssessPlanId",referencedColumnName = "id",insertable =false ,updatable = false) src/main/java/com/gkhy/labRiskManage/domain/riskReport/entity/RiskUnit.java
@@ -55,6 +55,12 @@ * 责任部门 */ private String liabilityDep; /** * 责任部门id */ private Long liabilityDepId; /** * 图片 */ src/main/java/com/gkhy/labRiskManage/domain/riskReport/model/dto/AssessQueryDTO.java
@@ -55,6 +55,11 @@ * 计划制定人 */ private Long planUserId; /** * 计划制定人 */ private String planUserName; /** * 评估开始时间 */ src/main/java/com/gkhy/labRiskManage/domain/riskReport/model/dto/RiskUnitQueryDTO.java
@@ -42,6 +42,11 @@ */ private String liabilityDep; /** * 责任部门id */ private Long liabilityDepId; /** * 图片 */ private String image; src/main/java/com/gkhy/labRiskManage/domain/riskReport/service/impl/RiskAssessPlanServiceImpl.java
@@ -5,34 +5,31 @@ import com.gkhy.labRiskManage.application.account.dto.respDto.UserIdentityRespDTO; import com.gkhy.labRiskManage.application.riskReport.dto.bo.*; import com.gkhy.labRiskManage.application.riskReport.dto.dto.RiskAssessAppQueryDTO; import com.gkhy.labRiskManage.application.riskReport.dto.dto.RiskAssessAppQueryDTO_0223bak; import com.gkhy.labRiskManage.application.riskReport.dto.dto.RiskAssessPlanListAppDTO; import com.gkhy.labRiskManage.commons.domain.SearchResult; import com.gkhy.labRiskManage.commons.enums.*; import com.gkhy.labRiskManage.commons.exception.BusinessException; import com.gkhy.labRiskManage.commons.utils.BeanCopyUtils; import com.gkhy.labRiskManage.domain.account.entity.User; import com.gkhy.labRiskManage.domain.account.model.dto.SysUserRoleBindDomainDTO; import com.gkhy.labRiskManage.domain.account.model.dto.UserInfoDomainDTO; import com.gkhy.labRiskManage.domain.account.service.UserDomainService; import com.gkhy.labRiskManage.domain.basic.entity.BasicRiskUnit; import com.gkhy.labRiskManage.domain.basic.entity.BasicRiskUnitType; import com.gkhy.labRiskManage.domain.basic.model.dto.RiskUnitUpdateDTO; import com.gkhy.labRiskManage.domain.basic.service.BasicExperimentPersonService; import com.gkhy.labRiskManage.domain.basic.service.BasicRiskUnitService; import com.gkhy.labRiskManage.domain.basic.service.BasicRiskUnitTypeService; import com.gkhy.labRiskManage.domain.experiment.entity.ExperimentInfo; import com.gkhy.labRiskManage.domain.experiment.model.dto.ExperimentInfoDTO; import com.gkhy.labRiskManage.domain.experiment.service.ExperimentInfoService; import com.gkhy.labRiskManage.domain.riskReport.entity.*; import com.gkhy.labRiskManage.domain.riskReport.model.bo.*; import com.gkhy.labRiskManage.domain.riskReport.model.dto.*; import com.gkhy.labRiskManage.domain.riskReport.repository.jpa.RiskAssessPlanEvaluateUserRepository; import com.gkhy.labRiskManage.domain.riskReport.repository.jpa.RiskAssessPlanIdentificationUserRepository; import com.gkhy.labRiskManage.domain.riskReport.repository.jpa.RiskAssessPlanRepository; import com.gkhy.labRiskManage.domain.riskReport.service.*; import com.gkhy.labRiskManage.domain.riskReport.utils.EvaluateAndIdentificationUtils; import com.gkhy.labRiskManage.domain.riskReport.utils.EvaluateCheckUtils; import com.gkhy.labRiskManage.domain.riskReport.utils.GetRoleTagUtils; import com.gkhy.labRiskManage.mapper.RiskPlanDataMapper; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.data.domain.Page; import org.springframework.data.domain.PageRequest; @@ -43,10 +40,8 @@ import org.springframework.util.ObjectUtils; import javax.persistence.criteria.*; import java.math.BigDecimal; import java.time.LocalDateTime; import java.util.ArrayList; import java.util.Date; import java.util.List; import java.util.stream.Collectors; @@ -657,7 +652,7 @@ int roleTag = 0; UserInfoDomainDTO user = userDomainService.getUserById(currentUserId); for (SysUserRoleBindDomainDTO role : user.getRoles()) { if (role.getRoleId() == UserRoleEnum.USER_ROLE_4.getCode().byteValue()) { if (role.getRoleId() == UserRoleEnum.USER_ROLE_4.getCode().byteValue() || role.getRoleId() == UserRoleEnum.USER_ROLE_1.getCode().byteValue()) { roleTag = 1; } } @@ -1090,6 +1085,8 @@ return BeanCopyUtils.copyBean(submitResult, AssessPlanUpdateDTO.class); } @Autowired private RiskPlanDataMapper riskPlanDataMapper; /** * 风险辨识与评价 - 查询 */ @@ -1189,6 +1186,7 @@ Join<RiskAssessPlan, RiskAssessPlanIdentificationUser> identificationUserJoin = root.join("riskAssessPlanIdentificationUsers", JoinType.LEFT); Join<RiskAssessPlan, RiskAssessPlanEvaluateUser> evaluateUserJoin = root.join("riskAssessPlanEvaluateUsers", JoinType.LEFT); Join<RiskAssessPlan, User> planUserJoin = root.join("planUser", JoinType.LEFT); if (roleTag == UserTagEnum.USER_TAG_0.getCode()) { //此处应有谁能查询：辨识专家，评价专家,实验负责人(此处未存相关信息，以实验id为条件查询) @@ -1242,6 +1240,9 @@ for (RiskAssessPlan riskAssessPlan : pageResult.getContent()) { AssessQueryDTO assessQueryDTO = BeanCopyUtils.copyBean(riskAssessPlan, AssessQueryDTO.class); if(riskAssessPlan.getPlanUser() != null){ assessQueryDTO.setPlanUserName(riskAssessPlan.getPlanUser().getRealName()); } for (RiskUnitListAppQueryDTO riskUnit : riskUnitListAppQueryDTOS) { if (riskUnit.getId() == assessQueryDTO.getRiskUnitId()) { assessQueryDTO.setRiskUnitName(riskUnit.getRiskName()); src/main/java/com/gkhy/labRiskManage/domain/riskReport/service/impl/RiskUnitServiceImpl.java
@@ -319,6 +319,7 @@ riskUnit.setRiskName(updateParam.getRiskName()); riskUnit.setLiabilityUserId(updateParam.getLiabilityUserId()); riskUnit.setLiabilityDep(updateParam.getLiabilityDep()); riskUnit.setLiabilityDepId(updateParam.getLiabilityDepId()); riskUnit.setDescription(updateParam.getDescription()); riskUnit.setRiskUnitTypeId(riskUnitTypeById.getId());
对比新文件 @@ -0,0 +1,11 @@ package com.gkhy.labRiskManage.mapper; import com.gkhy.labRiskManage.domain.riskReport.entity.RiskAssessPlanIdentificationUser; import org.apache.ibatis.annotations.Mapper; import java.util.List; @Mapper public interface RiskPlanDataMapper { List<RiskAssessPlanIdentificationUser> pageList(); } src/main/resources/config/application-dev.yaml
@@ -6,20 +6,23 @@ datasource: type: com.alibaba.druid.pool.DruidDataSource driver-class-name: com.mysql.cj.jdbc.Driver url: jdbc:mysql://127.0.0.1:3306/laboratory_risk_manage.dev?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai&useAffectedRows=true url: jdbc:mysql://192.168.2.6:7006/laboratory_risk_manage?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai&useAffectedRows=true username: root password: 123456 password: 2farwL3yPXfbH2AP master: driver-class-name: com.mysql.cj.jdbc.Driver url: jdbc:mysql://127.0.0.1:3306/laboratory_risk_manage.dev?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai&useAffectedRows=true url: jdbc:mysql://192.168.2.6:7006/laboratory_risk_manage?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai&useAffectedRows=true username: root password: 123456 password: 2farwL3yPXfbH2AP type: com.alibaba.druid.pool.DruidDataSource jpa: hibernate: ddl-auto: none # ddl-auto: update #自动更新 show-sql: true #日志中显示sql语句 mybatis: mapper-locations: classpath:mapper/*.xml # type-aliases-package: com.gkhy.labRiskManage.domain.** redis: # host: 192.168.0.52 @@ -69,6 +72,9 @@ module: #用户模块 accountPath: /account/user/ #辨识模块 identification: /identification/ #linux测试 #file: src/main/resources/config/application-gslab.yaml
@@ -20,6 +20,9 @@ ddl-auto: none # ddl-auto: update #自动更新 show-sql: true #日志中显示sql语句 mybatis: mapper-locations: classpath:mapper/*.xml # type-aliases-package: com.gkhy.labRiskManage.domain.** redis: # host: 192.168.0.52 src/main/resources/mapper/RiskPlanDataMapper.xml
对比新文件 @@ -0,0 +1,11 @@ <?xml version="1.0" encoding="UTF-8" ?> <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> <mapper namespace="com.gkhy.labRiskManage.mapper.RiskPlanDataMapper"> <select id="pageList" resultType="com.gkhy.labRiskManage.domain.riskReport.entity.RiskAssessPlanIdentificationUser"> select id,identification_user identificationUser,identification_user_id identificationUserId from risk_assess_plan_identification_user </select> </mapper>
