Skip to content

T
tianjin-cement
Commit f9e8f13f authored by 竹天卫's avatar 竹天卫
Browse files
Options

正式部署一版

parent 3ef26bd6
Hide whitespace changes
Inline Side-by-side
Showing with 45 additions and 34 deletions
cement-business/src/main/java/cn/wise/sc/cement/business/controller/WeiXinController.java
View file @ f9e8f13f
...@@ -40,9 +40,9 @@ public class WeiXinController { ...@@ -40,9 +40,9 @@ public class WeiXinController {
log.debug("============================================="); log.debug("=============================================");
try { try {
//测试服务器 //测试服务器
return weiXinService.getTestToken(code); // return weiXinService.getTestToken(code);
//正式服务器 //正式服务器
// return weiXinService.getToken(code, "APP"); return weiXinService.getToken(code, "APP");
} catch (Exception e) { } catch (Exception e) {
log.debug("获取登录token{}", e); log.debug("获取登录token{}", e);
} }
...@@ -54,9 +54,9 @@ public class WeiXinController { ...@@ -54,9 +54,9 @@ public class WeiXinController {
public BaseResponse getPCToken(String code) { public BaseResponse getPCToken(String code) {
try { try {
//测试服务器 //测试服务器
return weiXinService.getTestToken(code); // return weiXinService.getTestToken(code);
//正式服务器 //正式服务器
// return weiXinService.getToken(code, "PC"); return weiXinService.getToken(code, "PC");
} catch (Exception e) { } catch (Exception e) {
log.debug("获取登录token{}", e); log.debug("获取登录token{}", e);
} }
......
cement-business/src/main/java/cn/wise/sc/cement/business/service/impl/EntrustServiceImpl.java
View file @ f9e8f13f
...@@ -260,9 +260,12 @@ public class EntrustServiceImpl extends ServiceImpl<EntrustMapper, Entrust> impl ...@@ -260,9 +260,12 @@ public class EntrustServiceImpl extends ServiceImpl<EntrustMapper, Entrust> impl
if (query.getClientId() == null) { if (query.getClientId() == null) {
return BaseResponse.errorMsg("请选择委托单位"); return BaseResponse.errorMsg("请选择委托单位");
} }
if (query.getProjectId() == null || StringUtils.isEmpty(query.getProjectCode())) { if (query.getProjectId() == null) {
if (StringUtils.isEmpty(query.getProjectName())) { if (StringUtils.isEmpty(query.getProjectName())) {
return BaseResponse.errorMsg("请填写项目名称或选择已有项目"); return BaseResponse.errorMsg("请填写项目名称");
}
if (StringUtils.isEmpty(query.getProjectCode())) {
return BaseResponse.errorMsg("请填写项目编号");
} }
} }
if (StringUtils.isEmpty(query.getSendName()) || StringUtils.isEmpty(query.getSendPhone())) { if (StringUtils.isEmpty(query.getSendName()) || StringUtils.isEmpty(query.getSendPhone())) {
...@@ -375,7 +378,7 @@ public class EntrustServiceImpl extends ServiceImpl<EntrustMapper, Entrust> impl ...@@ -375,7 +378,7 @@ public class EntrustServiceImpl extends ServiceImpl<EntrustMapper, Entrust> impl
String systemUrL = systemUrl.replace("U_R_L", URLUtil.encodeAll(URL)); String systemUrL = systemUrl.replace("U_R_L", URLUtil.encodeAll(URL));
String content="你好！"+loginUser.getName()+"向您申请了一条委托，请前往\n" + String content="你好！"+loginUser.getName()+"向您申请了一条委托，请前往\n" +
systemUrL+"进行评审。"; systemUrl+"进行评审。";
System.out.println("**************************content**********************"); System.out.println("**************************content**********************");
System.out.println(content); System.out.println(content);
weiXinService.sendTextMessage(userIds, content); weiXinService.sendTextMessage(userIds, content);
...@@ -430,6 +433,10 @@ public class EntrustServiceImpl extends ServiceImpl<EntrustMapper, Entrust> impl ...@@ -430,6 +433,10 @@ public class EntrustServiceImpl extends ServiceImpl<EntrustMapper, Entrust> impl
if(entrust == null){ if(entrust == null){
return BaseResponse.errorMsg("信息错误"); return BaseResponse.errorMsg("信息错误");
} }
String entrustCode = entrust.getProjectCode()+"-"+query.getSampleList().get(0).getCementCode();
entrust.setEntrustCode(entrustCode);
//消息推送 和 判断是否符合修改权限 会用到 //消息推送 和 判断是否符合修改权限 会用到
List<Integer> approvalIdList = sysApprovalMapper.getApprovalId("委托评审"); List<Integer> approvalIdList = sysApprovalMapper.getApprovalId("委托评审");
if (approvalIdList == null) { if (approvalIdList == null) {
...@@ -445,11 +452,11 @@ public class EntrustServiceImpl extends ServiceImpl<EntrustMapper, Entrust> impl ...@@ -445,11 +452,11 @@ public class EntrustServiceImpl extends ServiceImpl<EntrustMapper, Entrust> impl
if(entrust.getUserId() == loginUser.getId() ){ if(entrust.getUserId() == loginUser.getId() ){
entrust.setStatus(0); //未评审 entrust.setStatus(0); //未评审
}else if(approvalIdList.contains(loginUser.getId())){ }else if(approvalIdList.contains(loginUser.getId())){
if(StringUtils.isEmpty(query.getProjectType())){
return BaseResponse.errorMsg("请选择项目类型");
}
entrust.setStatus(9); //修改待确认 entrust.setStatus(9); //修改待确认
entrust.setProjectType(query.getProjectType()); entrust.setProjectType(query.getProjectType());
//审批后生成委托编号
String entrustCode = entrust.getProjectCode()+"-"+query.getSampleList().get(0).getCementCode();
entrust.setEntrustCode(entrustCode);
} }
entrust.setEntrustCode(null) entrust.setEntrustCode(null)
.setUserId(entrust.getUserId()) .setUserId(entrust.getUserId())
...@@ -3805,8 +3812,8 @@ public class EntrustServiceImpl extends ServiceImpl<EntrustMapper, Entrust> impl ...@@ -3805,8 +3812,8 @@ public class EntrustServiceImpl extends ServiceImpl<EntrustMapper, Entrust> impl
return BaseResponse.errorMsg("参数错误"); return BaseResponse.errorMsg("参数错误");
} }
Map<String, Object> params = new HashMap<>(); Map<String, Object> params = new HashMap<>();
params.put("sample_distribution_id", sampleDistributionId); params.put("sampleDistributionId", sampleDistributionId);
params.put("is_public", 1); params.put("isPublic", 1);
List<SampleDistributionEnclosureVo> list = sampleDistributionEnclosureMapper.getList(params); List<SampleDistributionEnclosureVo> list = sampleDistributionEnclosureMapper.getList(params);
//如果有平行样 //如果有平行样
...@@ -3824,8 +3831,8 @@ public class EntrustServiceImpl extends ServiceImpl<EntrustMapper, Entrust> impl ...@@ -3824,8 +3831,8 @@ public class EntrustServiceImpl extends ServiceImpl<EntrustMapper, Entrust> impl
if(sdList != null && sdList.size()>0 ){ if(sdList != null && sdList.size()>0 ){
for(SampleDistribution sd : sdList){ for(SampleDistribution sd : sdList){
Map<String, Object> params2 = new HashMap<>(); Map<String, Object> params2 = new HashMap<>();
params2.put("sample_distribution_id", sd.getId()); params2.put("sampleDistributionId", sd.getId());
params.put("is_public", 1); params.put("isPublic", 1);
List<SampleDistributionEnclosureVo> sdevList = sampleDistributionEnclosureMapper.getList(params2); List<SampleDistributionEnclosureVo> sdevList = sampleDistributionEnclosureMapper.getList(params2);
if(sdevList != null && sdevList.size()>0){ if(sdevList != null && sdevList.size()>0){
for(SampleDistributionEnclosureVo sdev : sdevList){ for(SampleDistributionEnclosureVo sdev : sdevList){
......
cement-business/src/main/java/cn/wise/sc/cement/business/service/impl/PrecipriceServiceImpl.java
View file @ f9e8f13f
...@@ -608,12 +608,16 @@ public class PrecipriceServiceImpl extends ServiceImpl<PrecipriceMapper, Precipr ...@@ -608,12 +608,16 @@ public class PrecipriceServiceImpl extends ServiceImpl<PrecipriceMapper, Precipr
NormProduction.NormProductionDetail rts = new NormProduction.NormProductionDetail(); NormProduction.NormProductionDetail rts = new NormProduction.NormProductionDetail();
BeanUtil.copyProperties(preciprice, rts); BeanUtil.copyProperties(preciprice, rts);
if(rts.getSampleId() != null){
//todo 暂时去掉本所编号
/*if(rts.getSampleId() != null){
Sample sample = sampleMapper.selectById(rts.getSampleId()); Sample sample = sampleMapper.selectById(rts.getSampleId());
if(sample != null){ if(sample != null){
rts.setCementCode(sample.getCementCode()); rts.setCementCode(sample.getCementCode());
} }
} }*/
//todo 增加项目信息 //todo 增加项目信息
rts.setProjectName(preciprice.getEntrustName()); rts.setProjectName(preciprice.getEntrustName());
rts.setAssessId(preciprice.getTargetId()); rts.setAssessId(preciprice.getTargetId());
......
cement-business/src/main/resources/application.yml
View file @ f9e8f13f
...@@ -8,9 +8,9 @@ spring: ...@@ -8,9 +8,9 @@ spring:
active: dev active: dev
datasource: datasource:
# 192.168.110.85 admin!@#123 sinoma_zhengshiData # 192.168.110.85 admin!@#123 sinoma_zhengshiData
url: jdbc:mysql://192.168.110.85:3306/sinoma_zhengshiData?serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=UTF-8&useSSL=false # url: jdbc:mysql://192.168.110.85:3306/sinoma_zhengshiData?serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=UTF-8&useSSL=false
# url: jdbc:mysql://192.168.110.85:3306/sinoma_bangye?serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=UTF-8&useSSL=false # url: jdbc:mysql://192.168.110.85:3306/sinoma_bangye?serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=UTF-8&useSSL=false
# url: jdbc:mysql://47.93.148.213:3306/sinoma_tcdri?serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=UTF-8&useSSL=false url: jdbc:mysql://47.93.148.213:3306/sinoma_tcdri?serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=UTF-8&useSSL=false
username: root username: root
password: admin!@#123 password: admin!@#123
driverClassName: com.mysql.cj.jdbc.Driver driverClassName: com.mysql.cj.jdbc.Driver
...@@ -41,25 +41,25 @@ mybatis-plus: ...@@ -41,25 +41,25 @@ mybatis-plus:
mapper-locations: classpath:/cn/wise/sc/cement/business/mapper/xml/*Mapper.xml mapper-locations: classpath:/cn/wise/sc/cement/business/mapper/xml/*Mapper.xml
#正式服务器 #正式服务器
#weixin: weixin:
# corpId: wwc7ae84e6af6ba921 corpId: wwc7ae84e6af6ba921
# agentIdPC: 1000151 agentIdPC: 1000151
# agentSecretPC: h4K-GL1y7pCADFZQ7m1tO1GOSa3zU4kGEItFknvwOAg agentSecretPC: h4K-GL1y7pCADFZQ7m1tO1GOSa3zU4kGEItFknvwOAg
# agentId: 1000150 agentId: 1000150
# agentSecret: zWIO_kt36d1jta3R76s6WmKFdfs2TuJ1wTQu1IXO0Fc agentSecret: zWIO_kt36d1jta3R76s6WmKFdfs2TuJ1wTQu1IXO0Fc
# backUrl: https%3a%2f%2fccdcmtl.sinoma-tianjin.com%2flab-system backUrl: https%3a%2f%2fccdcmtl.sinoma-tianjin.com%2flab-system
# systemUrl: '<a href="https://open.weixin.qq.com/connect/oauth2/authorize?appid=wwc7ae84e6af6ba921&redirect_uri=https%3a%2f%2fccdcmtl.sinoma-tianjin.com%2flab-system%2f&response_type=code&scope=snsapi_base&state=#wechat_redirect">物化检测流程</a>,' systemUrl: '<a href="https://open.weixin.qq.com/connect/oauth2/authorize?appid=wwc7ae84e6af6ba921&redirect_uri=https%3a%2f%2fccdcmtl.sinoma-tianjin.com%2flab-system%2f&response_type=code&scope=snsapi_base&state=#wechat_redirect">物化检测流程</a>,'
#测试服务器 #测试服务器
weixin: #weixin:
corpId: ww348f91b2573c1867 # corpId: ww348f91b2573c1867
agentId: 1000002 # agentId: 1000002
agentIdPC: 1000003 # agentIdPC: 1000003
agentSecret: gFa_7XvXtCaoeAYERzjRwwz_OTJkJfgBb8weOKjmI3o # agentSecret: gFa_7XvXtCaoeAYERzjRwwz_OTJkJfgBb8weOKjmI3o
agentSecretPC: itCLYcwl9ggA9VfZam_iz96Ikp9StDFfVr4Adb0yY7A # agentSecretPC: itCLYcwl9ggA9VfZam_iz96Ikp9StDFfVr4Adb0yY7A
backUrl: https%3a%2f%2flab.wisenergy.cn%2flab-bangye # backUrl: https%3a%2f%2flab.wisenergy.cn%2flab-bangye
systemUrl: '<a href="https://open.weixin.qq.com/connect/oauth2/authorize?appid=ww348f91b2573c1867&redirect_uri=U_R_L&response_type=code&scope=snsapi_base&state=#wechat_redirect">物化检测流程</a>,' # systemUrl: '<a href="https://open.weixin.qq.com/connect/oauth2/authorize?appid=ww348f91b2573c1867&redirect_uri=U_R_L&response_type=code&scope=snsapi_base&state=#wechat_redirect">物化检测流程</a>,'
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment