| 2022-08-24 | songhuangfeng123 |  |
| 2022-08-23 | SZH | |
goal-manage/goal-manage-service/src/main/java/com/gkhy/safePlatform/targetDuty/service/impl/ExamineMngServiceImpl.java
@@ -55,9 +55,9 @@ @Resource private CommonService commonService; @Override @Override public ResultVO queryAll(PageQuery<ExamineMngQueryCriteria> pageQuery) { Long pageIndex = pageQuery.getPageIndex(); Long pageSize = pageQuery.getPageSize(); @@ -70,32 +70,32 @@ // --------------------------- 获取部门信息----------------------- //收集所用到的部门ID Set<Long> collectDepIdSet = new HashSet(); respList.forEach(f->{ respList.forEach(f -> { collectDepIdSet.add(f.getExamineDepartmentId()); collectDepIdSet.add(f.getBeExaminedDepartmentId()); }); //获取部门名集合 Map<Long,String> depNameMap = commonService.getDepName(collectDepIdSet); Map<Long, String> depNameMap = commonService.getDepName(collectDepIdSet); respList.forEach(f->{ respList.forEach(f -> { f.setExamineDepartmentName(depNameMap.get(f.getExamineDepartmentId())); f.setBeExaminedDepartmentName(depNameMap.get(f.getBeExaminedDepartmentId())); }); //获取打分明细 respList.forEach(dto->{ List<CurrentExamineDto> list = JSONObject.parseArray( dto.getNumberDetailJson(), CurrentExamineDto.class); respList.forEach(dto -> { List<CurrentExamineDto> list = JSONObject.parseArray(dto.getNumberDetailJson(), CurrentExamineDto.class); List<Long> idList = list.stream().map(CurrentExamineDto::getId).collect(Collectors.toList()); if(!idList.isEmpty()){ if (!idList.isEmpty()) { List<ExamineItem> itemList = examineItemRepository.selectBatchIds(idList); Map<Long,ExamineItem> itemMap = itemList.stream().collect( Collectors.toMap(ExamineItem::getId, Function.identity(),(k1, k2)->k1)); Map<Long, ExamineItem> itemMap = itemList.stream().collect( Collectors.toMap(ExamineItem::getId, Function.identity(), (k1, k2) -> k1)); if(itemMap != null){ list.forEach(f->{ if (itemMap != null) { list.forEach(f -> { ExamineItem item = itemMap.get(f.getId()); if(item != null){ if (item != null) { f.setItemDetail(item.getItemDetail()); f.setContent(item.getContent()); f.setJudgeStandard(item.getJudgeStandard()); @@ -109,7 +109,7 @@ return new SearchResultVO<>( true, pageIndex, pageSize,page.getPages(), pageSize, page.getPages(), page.getTotal(), respList, ResultCodes.OK @@ -125,42 +125,45 @@ @Override public ExamineMngDto selectOne(Serializable id) { ExamineMng examineMng = this.getById(id); if(examineMng == null){ if (examineMng == null) { return null; } ExamineMngDto dto = BeanCopyUtils.copyBean(examineMng, ExamineMngDto.class); if(!StringUtils.hasText(examineMng.getNumberDetailJson())){ if (!StringUtils.hasText(examineMng.getNumberDetailJson())) { return dto; } //获取打分明细 List<CurrentExamineDto> list = JSONObject.parseArray( examineMng.getNumberDetailJson(), CurrentExamineDto.class); List<CurrentExamineDto> list = JSONObject.parseArray(examineMng.getNumberDetailJson(), CurrentExamineDto.class); List<Long> idList = list.stream().map(CurrentExamineDto::getId).collect(Collectors.toList()); List<ExamineItem> itemList = examineItemRepository.selectBatchIds(idList); Map<Long,ExamineItem> itemMap = itemList.stream().collect( Collectors.toMap(ExamineItem::getId, Function.identity(),(k1, k2)->k1)); if(itemMap != null){ list.forEach(f->{ ExamineItem item = itemMap.get(f.getId()); if(item != null){ f.setItemDetail(item.getItemDetail()); f.setContent(item.getContent()); f.setJudgeStandard(item.getJudgeStandard()); } }); if (!idList.isEmpty()) { List<ExamineItem> itemList = examineItemRepository.selectBatchIds(idList); Map<Long, ExamineItem> itemMap = itemList.stream().collect( Collectors.toMap(ExamineItem::getId, Function.identity(), (k1, k2) -> k1)); if (itemMap != null) { list.forEach(f -> { ExamineItem item = itemMap.get(f.getId()); if (item != null) { f.setItemDetail(item.getItemDetail()); f.setContent(item.getContent()); f.setJudgeStandard(item.getJudgeStandard()); } }); } } dto.setCurrentExamineDtoList(list); //获取合格分数 ExamineTemplate examineTemplate = examineTemplateRepository.selectOne(new QueryWrapper<ExamineTemplate>().eq("id",examineMng.getExamineTemplateId())); if(examineTemplate != null){ ExamineTemplate examineTemplate = examineTemplateRepository.selectOne(new QueryWrapper<ExamineTemplate>().eq("id", examineMng.getExamineTemplateId())); if (examineTemplate != null) { dto.setAcceptanceNumber(examineTemplate.getAcceptanceNumber()); dto.setExamineTemplateName(examineTemplate.getTitle()); } return dto; } } } safePlatfrom-out-web/src/main/resources/config/application-guotai-demo.yaml
@@ -14,25 +14,25 @@ type: com.alibaba.druid.pool.xa.DruidXADataSource emergency: driver-class-name: com.mysql.cj.jdbc.Driver url: jdbc:mysql://192.168.30.107:43306/safeplatform.emergency.guotai?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true url: jdbc:mysql://192.168.30.107:43306/safeplatform.emergency.guotai?allowMultiQueries=true&autoReconnect=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true username: gkhy_safeplatform_guotai_out password: a7687@i8a1Sdd type: com.alibaba.druid.pool.DruidDataSource goalmanage: driver-class-name: com.mysql.cj.jdbc.Driver url: jdbc:mysql://192.168.30.107:43306/safeplatform.goalmanage.guotai?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true url: jdbc:mysql://192.168.30.107:43306/safeplatform.goalmanage.guotai?allowMultiQueries=true&autoReconnect=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true username: gkhy_safeplatform_guotai_out password: a7687@i8a1Sdd type: com.alibaba.druid.pool.DruidDataSource incidentmanage: driver-class-name: com.mysql.cj.jdbc.Driver url: jdbc:mysql://192.168.30.107:43306/safeplatform.incidentmanage.guotai?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true url: jdbc:mysql://192.168.30.107:43306/safeplatform.incidentmanage.guotai?allowMultiQueries=true&autoReconnect=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true username: gkhy_safeplatform_guotai_out password: a7687@i8a1Sdd type: com.alibaba.druid.pool.DruidDataSource equipment: driver-class-name: com.mysql.cj.jdbc.Driver url: jdbc:mysql://192.168.30.107:43306/safeplatform.equipment.guotai?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true url: jdbc:mysql://192.168.30.107:43306/safeplatform.equipment.guotai?allowMultiQueries=true&autoReconnect=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true username: gkhy_safeplatform_guotai_out password: a7687@i8a1Sdd type: com.alibaba.druid.pool.DruidDataSource safePlatfrom-out-web/src/main/resources/config/application-guotai-uat.yaml
对比新文件 @@ -0,0 +1,132 @@ server: tomcat: uri-encoding: UTF-8 basedir: / port: 16012 servlet: context-path: / # mysql spring: jta: transaction-manager-id: txManager datasource: type: com.alibaba.druid.pool.xa.DruidXADataSource emergency: driver-class-name: com.mysql.cj.jdbc.Driver url: jdbc:mysql://192.168.30.107:43306/safeplatform.emergency.guotai.uat?allowMultiQueries=true&autoReconnect=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true username: gkhy_safeplatform_guotai_out password: a7687@i8a1Sdd type: com.alibaba.druid.pool.DruidDataSource goalmanage: driver-class-name: com.mysql.cj.jdbc.Driver url: jdbc:mysql://192.168.30.107:43306/safeplatform.goalmanage.guotai.uat?allowMultiQueries=true&autoReconnect=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true username: gkhy_safeplatform_guotai_out password: a7687@i8a1Sdd type: com.alibaba.druid.pool.DruidDataSource incidentmanage: driver-class-name: com.mysql.cj.jdbc.Driver url: jdbc:mysql://192.168.30.107:43306/safeplatform.incidentmanage.guotai.uat?allowMultiQueries=true&autoReconnect=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true username: gkhy_safeplatform_guotai_out password: a7687@i8a1Sdd type: com.alibaba.druid.pool.DruidDataSource equipment: driver-class-name: com.mysql.cj.jdbc.Driver url: jdbc:mysql://192.168.30.107:43306/safeplatform.equipment.guotai.uat?allowMultiQueries=true&autoReconnect=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true username: gkhy_safeplatform_guotai_out password: a7687@i8a1Sdd type: com.alibaba.druid.pool.DruidDataSource redis: host: 192.168.30.107 port: 6375 password: SEF98uvs98dUAUEF90Udssa database: 0 # Redis 数据库号，默认为 0 timeout: 15000 # Redis 连接超时时间，单位：毫秒。 lettuce: pool: max-active: 4 max-idle: 4 # 对应 RedisProperties.Jedis 内部类 jedis: pool: max-active: 4 # 连接池最大连接数，默认为 8 。使用负数表示没有限制 同一时间最大只能执行8条sql语句，每执行一条语句就会建立一个连接 max-idle: 4 # 默认连接数最大空闲的连接数，默认为 8 。使用负数表示没有限制。 min-idle: 0 # 默认连接池最小空闲的连接数，默认为 0 。允许设置 0 和 正数。 max-wait: -1 cloud: nacos: discovery: server-addr: http://192.168.30.107:8848 namespace: 78fe80cc-6159-4381-8e42-1cc6c68eb22e username: gkhy_dev_out_team password: 9485uyJHISes09t enabled: true register-enabled: true config: server-addr: http://192.168.30.107:8848 namespace: 78fe80cc-6159-4381-8e42-1cc6c68eb22e username: gkhy_dev_out_team password: 9485uyJHISes09t inetutils: ignored-interfaces: - VirtualBox Host-Only Network preferred-networks: - 192.168 #是否允许跨域 true：允许；false：不允许 enableCors: false mybatis-plus: configuration: log-impl: org.apache.ibatis.logging.stdout.StdOutImpl dubbo: registry: protocol: nacos address: nacos://192.168.30.107:8848?namespace=78fe80cc-6159-4381-8e42-1cc6c68eb22e&username=gkhy_dev_out_team&password=9485uyJHISes09t application: name: gkhy-safeplatform-out scan: # 扫描rpc接口定义包 base-packages: com.gkhy.safePlatform protocol: name: dubbo port: 18089 serialization: kryo host: ${spring.cloud.client.ip-address} consumer: # 服务连接超时时间 timeout: 3000 # 取消服务启动检查 check: false rocketmq: name-server: 192.168.30.107:9876 producer: group: gkhy-safeplatform-guotai-uat sendMessageTimeout: 300000 consumer: group: gkhy-safeplatform-guotai-uat topic: demoTopic: gkhy-safeplatform-topic-demo-uat minio: endPoint: 121.239.169.27 port: 9000 accessKey: QR0J7S55SZO8QI1TC2AD secretKey: X0oSBT7vRqYWU41Ut21B+FU7G5A87BzPIRdObGjK secure: false bucketName: safeplatform-dev urlPrefix: http://121.239.169.27/file #用户名 gkhy_team_out_dev #密码 12345678 token: header: Authorization secret: safe666 expiration: 7200 refreshExpiration: 14400 tokenHead: Bearer loginUserHeader: uid
@@ -14,25 +14,25 @@ type: com.alibaba.druid.pool.xa.DruidXADataSource emergency: driver-class-name: com.mysql.cj.jdbc.Driver url: jdbc:mysql://192.168.0.52:3306/safeplatform.emergency.uat?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true url: jdbc:mysql://192.168.0.52:3306/safeplatform.emergency.uat?allowMultiQueries=true&autoReconnect=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true username: gkhy_dev_out_team password: Adsdf675T6AC7yga type: com.alibaba.druid.pool.DruidDataSource goalmanage: driver-class-name: com.mysql.cj.jdbc.Driver url: jdbc:mysql://192.168.0.52:3306/safeplatform.goalmanage.uat?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true url: jdbc:mysql://192.168.0.52:3306/safeplatform.goalmanage.uat?allowMultiQueries=true&autoReconnect=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true username: gkhy_dev_out_team password: Adsdf675T6AC7yga type: com.alibaba.druid.pool.DruidDataSource incidentmanage: driver-class-name: com.mysql.cj.jdbc.Driver url: jdbc:mysql://192.168.0.52:3306/safeplatform.incidentmanage.uat?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true url: jdbc:mysql://192.168.0.52:3306/safeplatform.incidentmanage.uat?allowMultiQueries=true&autoReconnect=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true username: gkhy_dev_out_team password: Adsdf675T6AC7yga type: com.alibaba.druid.pool.DruidDataSource equipment: driver-class-name: com.mysql.cj.jdbc.Driver url: jdbc:mysql://192.168.0.52:3306/safeplatform.equipment.uat?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true url: jdbc:mysql://192.168.0.52:3306/safeplatform.equipment.uat?allowMultiQueries=true&autoReconnect=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true username: gkhy_dev_out_team password: Adsdf675T6AC7yga type: com.alibaba.druid.pool.DruidDataSource safePlatfrom-out-web/src/main/resources/config/application.yaml
@@ -2,9 +2,9 @@ application: name: safeplatform-out profiles: active: uat active: guotai-uat # active: guotai-demo #### test uat guotai-demo #### test uat guotai-demo guotai-uat # active: test # active: uat
