server/meeting/meeting_admin/src/main/resources/bootstrap.yml
@@ -1,6 +1,6 @@ spring: profiles: active: dev active: test application: name: meetingAdmin # 安全配置 server/meeting/meeting_service/src/main/resources/application-test.yml
@@ -7,13 +7,23 @@ driver-class-name: com.mysql.cj.jdbc.Driver type: com.alibaba.druid.pool.DruidDataSource jackson: time-zone: GMT+8 date-format: yyyy-MM-dd HH:mm:ss #rocketmq: # namesrvAddr: rmq-cn-pe335rcnn06.cn-shanghai.rmq.aliyuncs.com:8080 # groupId: GID-wakatest # topic: waka-test # username: 4derRb4Sw5EkqUMI # password: v50N97wf4av8Q8I4 # #knife4j: # enable: true # basic: # enable: true # username: admin # password: test@168.com # password: 111111 debug_model: true @@ -26,4 +36,39 @@ description: ${project.name}接口文档 enabled: true # 禁用swagger时的重定向地址 redirect-uri: / redirect-uri: / ########################微信支付相关配置######################## wx: pay: appId: wxfab6da18632e28de appSecret: 4ee3b22afa90287834319fc3c1635271 mchId: 1229817002 mchKey: u4TSNtv0wFP7WRfnxBgijYOtRhS9FvlM notifyUrl: https://dmtest.ahapp.net/smartmeeting_interface/web/api/wxPayNotify keyPath: /usr/local/apiclient_cert.p12 tencent: map: remoteHost: https://apis.map.qq.com appKey: 3AYBZ-I5R3V-2BVP3-UWBDQ-ETBM5-B2BBQ ########################定时开启配置######################## timing: true des_pwd: 123456SDFKDJF ## MQTT## mqtt: host: tcp://192.168.10.198:1883 userName: root passWord: 123456 qos: 1 clientId: ClientId_local #ClientId_local必须唯一 比如你已经定了叫ABC 那你就一直叫ABC 其他地方就不要使用ABC了 timeout: 10 keepalive: 20 topic1: A/pick/warn/# #符号是代表整个warn下面的全部子主题 没有理解的话 可以百度仔细理解一下 topic2: A/cmd/resp topic3: ABCF topic4: ABCH server/pom.xml
@@ -22,6 +22,7 @@ <groupId>org.springframework.boot</groupId> <artifactId>spring-boot-starter-parent</artifactId> <version>2.3.12.RELEASE</version> <relativePath/> </parent> <properties> <java.version>1.8</java.version> server/system_gateway/src/main/resources/bootstrap-dev.yml
@@ -6,8 +6,8 @@ password: nacos discovery: server-addr: http://175.27.187.84:8848 #配置Nacos地址 namespace: dmvisit # namespace: dev_renkang # namespace: dmvisit namespace: dev_renkang username: nacos password: nacos gateway: server/system_service/src/main/java/com/doumee/dao/system/model/Notices.java
@@ -100,7 +100,7 @@ @ExcelColumn(name="关联参数3") private String param3; @ApiModelProperty(value = "关联参数4") @ApiModelProperty(value = "操作人") @ExcelColumn(name="关联参数4") private String param4;
@@ -158,10 +158,12 @@ if(noticesDTO.getQueryType().equals(Constants.ZERO)){ queryWrapper.eq(Notices::getStatus,Constants.ZERO); queryWrapper.eq(Notices::getSendacopy,Constants.ZERO); queryWrapper.eq(Notices::getParam2,Constants.ZERO); queryWrapper.eq(Notices::getUserId, noticesDTO.getMemberId()); } else if(noticesDTO.getQueryType().equals(Constants.ONE)){ queryWrapper.eq(Notices::getStatus,Constants.ONE); queryWrapper.eq(Notices::getSendacopy,Constants.ZERO); queryWrapper.eq(Notices::getParam4,noticesDTO.getMemberId()); } else if(noticesDTO.getQueryType().equals(Constants.TWO)){ queryWrapper.eq(Notices::getParam3, noticesDTO.getMemberId()); } else if (noticesDTO.getQueryType().equals(Constants.THREE)) { server/system_timer/src/main/resources/application-test.yml
@@ -1,21 +1,21 @@ spring: # 数据源配置 datasource: url: jdbc:mysql://sh-cdb-aiskr3vy.sql.tencentcdb.com:62443/dm_visit?useUnicode=true&characterEncoding=utf8&serverTimezone=Asia/Shanghai url: jdbc:mysql://sh-cdb-aiskr3vy.sql.tencentcdb.com:62443/antaiwuliu?useUnicode=true&characterEncoding=utf8&serverTimezone=Asia/Shanghai username: doumee password: rtjgfEr@&0c0m driver-class-name: com.mysql.cj.jdbc.Driver type: com.alibaba.druid.pool.DruidDataSource jackson: time-zone: GMT+8 date-format: yyyy-MM-dd HH:mm:ss redis: # database: 0 host: 127.0.0.1 port: 6379 password: timeout: 5000 # 连接池中的最小空闲连接 jackson: time-zone: GMT+8 date-format: yyyy-MM-dd HH:mm:ss #rocketmq: # namesrvAddr: rmq-cn-pe335rcnn06.cn-shanghai.rmq.aliyuncs.com:8080 # groupId: GID-wakatest @@ -23,30 +23,31 @@ # username: 4derRb4Sw5EkqUMI # password: v50N97wf4av8Q8I4 #knife4j: # enable: true # basic: # enable: true knife4j: enable: true basic: enable: true # username: admin # password: 111111 debug_model: true # Swagger配置 swagger: host: dmtest.ahapp.net title: ${project.name}接口文档 description: ${project.name}接口文档 enabled: true context-path: /erp_api # 禁用swagger时的重定向地址 redirect-uri: / ########################同步数据模式 ######################## data-sync: org-user-data-origin: 1 #组织数据 0自建 2以海康为主 1华晟ERP系统 visitor-data-origin: 1 #访客数据 0自建 2以海康为主 1华晟ERP系统 need-deal-img: true #是否需要处理图片数据 # Swagger配置 swagger: host: 127.0.0.1 title: ${project.name}接口文档 description: ${project.name}接口文档 enabled: true context-path: # 禁用swagger时的重定向地址 redirect-uri: / ########################微信支付相关配置######################## wx: @@ -64,6 +65,7 @@ appKey: 3AYBZ-I5R3V-2BVP3-UWBDQ-ETBM5-B2BBQ des_pwd: 123456SDFKDJF ## MQTT## server/system_timer/src/main/resources/bootstrap.yml
@@ -1,6 +1,6 @@ spring: profiles: active: dev active: test application: name: systemTimer # 安全配置 server/visits/admin_timer/pom.xml
@@ -5,7 +5,7 @@ <modelVersion>4.0.0</modelVersion> <parent> <groupId>com.doumee</groupId> <artifactId>dmvisit</artifactId> <artifactId>visits</artifactId> <version>1.0.0-SNAPSHOT</version> </parent>
@@ -1,6 +1,6 @@ spring: profiles: active: dev active: test application: name: visitsTimer # 安全配置 server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/common/PublicCloudController.java
@@ -100,7 +100,7 @@ String endType = originname.substring(originname.lastIndexOf("."), originname.length()); String date = DateUtil.getNowShortDate(); String fName = date + "/" + UUID.randomUUID() + endType; String fileName = folder + "/" + fName; String fileName = folder + fName; boolean r = ftp.uploadInputstreamBatch(is, fileName, Constants.equalsInteger(index ,fileList.size()),index); if (r) { JSONObject fileJSON = new JSONObject(); server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/web/VisitorWebController.java
@@ -93,8 +93,8 @@ @ApiOperation(value = "访客记录详情", notes = "访客记录详情") @GetMapping("/detail") public ApiResponse<VisitDetailVO> detail(@RequestParam Integer id) { return ApiResponse.success("查询成功", visitsService.getVisitDetail(id,null)); public ApiResponse<VisitDetailVO> detail(@RequestParam Integer id,@RequestHeader(Constants.HEADER_USER_TOKEN) String token) { return ApiResponse.success("查询成功", visitsService.getVisitDetail(id,getLoginUser(token).getMemberId())); }
@@ -23,7 +23,8 @@ # data-id: com.doumee.meeting.admin discovery: server-addr: http://175.27.187.84:8848 #配置Nacos地址 namespace: dmvisit # namespace: dmvisit namespace: dev_renkang username: nacos password: nacos # swagger配置 server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/ApproveServiceImpl.java
@@ -291,7 +291,8 @@ .ge(noticesDTO.getStartDate() != null, Notices::getCreateDate, Utils.Date.getStart(noticesDTO.getStartDate() )) .le(noticesDTO.getEndDate() != null, Notices::getCreateDate, Utils.Date.getEnd(noticesDTO.getEndDate() )) .eq(noticesDTO.getType() != null, Notices::getType, noticesDTO.getType()) .eq(Notices::getUserId,noticesDTO.getMemberId()).orderByDesc(Notices::getCreateDate) .eq(Notices::getUserId,noticesDTO.getMemberId()) .orderByDesc(Notices::getCreateDate) ); internalHomeVO.setTaskNum(noticesList.size()); if(CollectionUtils.isNotEmpty(noticesList)){ @@ -748,6 +749,9 @@ ||Constants.equalsInteger(level.getStatus(),Constants.approveStatus.pass)){ waitModel.setMemberName(waitList.size() +"人会签"); } if(CollectionUtils.isNotEmpty(waitList)){ waitModel.setCreateDate(waitList.get(Constants.ZERO).getCreateDate()); } waitModel.setApproveList(waitList); list.add(waitModel); }else if(waitList.size()>0){ @@ -774,6 +778,9 @@ //如果是或签 if(passList.size()>0){ approveList.addAll(otherPassList); } if(CollectionUtils.isNotEmpty(approveList)){ waitModel.setCreateDate(approveList.get(Constants.ZERO).getCreateDate()); } waitModel.setMemberName("已抄送"+ approveList.size() +"人"); waitModel.setApproveList(approveList); @@ -1055,8 +1062,10 @@ //修改自己的通知记录 noticesJoinMapper.update(null,new UpdateWrapper<Notices>().lambda() .set(Notices::getEditDate,new Date()) .set(Notices::getParam4,approveDTO.getLoginUserInfo().getMemberId()) .set(Notices::getReaded,Constants.ONE) .set(Notices::getParam2,approve.getStatus()) .set(Notices::getParam2,Constants.TWO) .set(Notices::getStatus,Constants.ONE) .eq(Notices::getId,notices.getId()) ); //修改 未处理的 通知数据 为抄送 @@ -1064,7 +1073,8 @@ noticesJoinMapper.update(null,new UpdateWrapper<Notices>().lambda() .set(Notices::getEditDate,new Date()) .set(Notices::getSendacopy,Constants.ONE) .set(Notices::getParam2,approve.getStatus()) .set(Notices::getStatus,Constants.ONE) .set(Notices::getParam2,Constants.TWO) .eq(Notices::getObjId,notices.getObjId()) .eq(Notices::getObjType,notices.getObjType()) .eq(Notices::getReaded,Constants.ZERO) @@ -1078,19 +1088,23 @@ if((Constants.equalsInteger(approve.getApproveType(),Constants.ZERO) || Constants.equalsInteger( approve.getApproveType(),Constants.TWO)) && Constants.equalsInteger(approve.getIsEndCheck(),Constants.ONE)){ //或签 / 单人审 且 终审 approveJoinMapper.update(null,new UpdateWrapper<Approve>() .lambda() .set(Approve::getStatus,Constants.approveStatus.otherDeal) .in(Approve::getId,approveList.stream().map(m->m.getId()).collect(Collectors.toList()))); if(CollectionUtils.isNotEmpty(approveList)){ approveJoinMapper.update(null,new UpdateWrapper<Approve>() .lambda() .set(Approve::getStatus,Constants.approveStatus.otherDeal) .in(Approve::getId,approveList.stream().map(m->m.getId()).collect(Collectors.toList()))); } dealBusinessBean = true; }else if((approve.getApproveType().equals(Constants.ZERO) || approve.getApproveType().equals(Constants.TWO)) &&approve.getIsEndCheck()!=Constants.ONE){ //或签 / 单人审 非终审 则开启下一步业务流程 /**处理本级数据**/ approveJoinMapper.update(null,new UpdateWrapper<Approve>() .lambda() .set(Approve::getStatus,Constants.approveStatus.otherDeal) .in(Approve::getId,approveList.stream().map(m->m.getId()).collect(Collectors.toList()))); if(CollectionUtils.isNotEmpty(approveList)){ approveJoinMapper.update(null,new UpdateWrapper<Approve>() .lambda() .set(Approve::getStatus,Constants.approveStatus.otherDeal) .in(Approve::getId,approveList.stream().map(m->m.getId()).collect(Collectors.toList()))); } /**开启下一级别的数据为待审核**/ approveJoinMapper.update(null,new UpdateWrapper<Approve>() .lambda() @@ -1107,7 +1121,7 @@ dealBusinessBean = true; } } this.passNextNotices(dealBusinessBean,notices,approve,approveList,approveCopyList); this.passNextNotices(dealBusinessBean,notices,approve,approveList,approveCopyList,approveDTO); } //处理业务数据 if(dealBusinessBean){ @@ -1121,12 +1135,14 @@ * @param approve 审批记录 * @param approveList 同级待审批数据 */ public void passNextNotices(Boolean dealBusinessBean,Notices notices,Approve approve,List<Approve> approveList,List<Approve> copyList){ public void passNextNotices(Boolean dealBusinessBean,Notices notices,Approve approve,List<Approve> approveList,List<Approve> copyList,ApproveDTO approveDTO){ //1、修改自己的数据记录 noticesJoinMapper.update(null,new UpdateWrapper<Notices>().lambda() .set(Notices::getEditDate,new Date()) .set(Notices::getReaded,Constants.ONE) .set(dealBusinessBean,Notices::getParam2,approve.getStatus()) .set(Notices::getStatus,Constants.ONE) .set(dealBusinessBean,Notices::getParam2,Constants.ONE) .set(Notices::getParam4,approveDTO.getLoginUserInfo().getMemberId()) .eq(Notices::getId,notices.getId()) ); if(Constants.equalsInteger(approve.getApproveType(),Constants.ZERO)){ @@ -1136,7 +1152,9 @@ .set(Notices::getEditDate,new Date()) .set(Notices::getReaded,Constants.ONE) .set(Notices::getSendacopy,Constants.ONE) .set(dealBusinessBean,Notices::getParam2,approve.getStatus()) .set(Notices::getStatus,Constants.ONE) .set(Notices::getParam4,approveDTO.getLoginUserInfo().getMemberId()) .set(dealBusinessBean,Notices::getParam2,Constants.ONE) .eq(Notices::getObjId,notices.getObjId()) .eq(Notices::getObjType,notices.getObjType()) .ne(Notices::getId,notices.getId()) server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/HiddenDangerParamServiceImpl.java
@@ -27,6 +27,7 @@ import java.util.ArrayList; import java.util.Date; import java.util.List; import java.util.Objects; /** * 隐患区域配置类型信息表Service实现 @@ -228,8 +229,12 @@ } @Override public List<Member> findHiddenAreaMemberList(HiddenDangerParam pageWrap) { QueryWrapper<HiddenDangerParam> wrapper = new QueryWrapper<>(pageWrap); pageWrap.setIsdeleted(Constants.ZERO); HiddenDangerParam hiddenDangerParam = new HiddenDangerParam(); hiddenDangerParam.setIsdeleted(Constants.ZERO); if(Objects.nonNull(pageWrap.getId())){ hiddenDangerParam.setId(pageWrap.getId()); } QueryWrapper<HiddenDangerParam> wrapper = new QueryWrapper<>(hiddenDangerParam); List<HiddenDangerParam> list = hiddenDangerParamMapper.selectList(wrapper); List<Member> memberList = new ArrayList<>(); if(list!=null){ @@ -252,6 +257,7 @@ .leftJoin(Company.class, Company::getId,Member::getCompanyId) .eq(Member::getType,Constants.TWO) .eq(Member::getIsdeleted,Constants.ZERO) .like(StringUtils.isNotBlank(pageWrap.getName()),Member::getName,pageWrap.getName()) .in(Member::getId,idList) ); } server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java
@@ -803,8 +803,8 @@ } for (Integer id:ids) { Member member = memberMapper.selectById(id); if(!Objects.isNull(member)&&member.getStatus()==Constants.ZERO){ member.setStatus(Constants.TWO); if(!Objects.isNull(member)&&member.getStatus()==Constants.TWO){ member.setStatus(Constants.ZERO);//恢复正常状态 member.setEditor(loginUserInfo.getId()); member.setEditDate(new Date()); member.setAuthStatus(Constants.ZERO);//未授权 @@ -838,8 +838,8 @@ } for (Integer id:ids) { Member member = memberMapper.selectById(id); if(!Objects.isNull(member)&&member.getStatus()==Constants.ZERO){ member.setStatus(Constants.ONE);//恢复正常状态 if(!Objects.isNull(member)&&member.getStatus()==Constants.TWO){ member.setStatus(Constants.ZERO);//恢复正常状态 member.setEditor(loginUserInfo.getId()); member.setEditDate(new Date()); member.setAuthStatus(Constants.ZERO);//未授权 @@ -1628,11 +1628,11 @@ String appSecret = systemDictDataBiz.queryByCode(Constants.WX_PLATFORM,Constants.WX_PLATFORM_SECRET).getCode(); String getTokenUrl = WXConstant.GET_USER_INFO_URL.replace("CODE", code) .replace("APPID", appId).replace("SECRET", appSecret); JSONObject tokenJson = JSONObject.parseObject(HttpsUtil.get(getTokenUrl,true)); String openId = null; if(!Objects.isNull(tokenJson.get("access_token"))){ openId = tokenJson.getString("openid"); } // JSONObject tokenJson = JSONObject.parseObject(HttpsUtil.get(getTokenUrl,true)); String openId = code; // if(!Objects.isNull(tokenJson.get("access_token"))){ // openId = tokenJson.getString("openid"); // } // String openId = "12345"; WxAuthorizeVO wxAuthorizeVO = new WxAuthorizeVO(); wxAuthorizeVO.setOpenid(openId); @@ -2019,7 +2019,7 @@ Member member = new Member(); member.setCreateDate(new Date()); member.setIsdeleted(Constants.ZERO); member.setType(Constants.TWO); member.setType(Constants.THREE); member.setName(registerDriverDTO.getName()); member.setPhone(registerDriverDTO.getPhone()); member.setStatus(Constants.ZERO); server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/VisitsServiceImpl.java
@@ -215,7 +215,7 @@ visits.setCreateDate(date); //随行人员数量 visits.setMemberNum(Constants.ZERO); //访客信息(使用身份证号查询是否已存在改普通访客，没有则新增，存在则更新openid等信息),包括随访人员校验和处理 //访客信息(使用身份证号查询是否已存在该普通访客，没有则新增，存在则更新openid等信息),包括随访人员校验和处理 Member member = dealMemberAndVisits(visits); visits.setMemberId(member.getId()); visits.setVisitType(Integer.valueOf(systemDictDataBiz.queryByCode(Constants.SYSTEM,Constants.MDJ_VISIT_REQUIRED).getCode()));
