Skip to content

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

企业微信消息推送

parent a4dee111
Hide whitespace changes
Inline Side-by-side
Showing with 471 additions and 442 deletions
cement-business/src/main/java/cn/wise/sc/cement/business/controller/EntrustController.java
View file @ e5922508
......@@ -197,13 +197,16 @@ public class EntrustController {
@ApiImplicitParam(name = "clientName", value = "委托单位id", paramType = "query", dataType = "String"),
@ApiImplicitParam(name = "projectName", value = "项目名称", paramType = "query", dataType = "String"),
@ApiImplicitParam(name = "projectCode", value = "项目编号", paramType = "query", dataType = "String"),
@ApiImplicitParam(name = "isUrgent", value = "（1加急，0不加急）", paramType = "query", dataType = "Integer")
@ApiImplicitParam(name = "isUrgent", value = "（1加急，0不加急）", paramType = "query", dataType = "Integer"),
@ApiImplicitParam(name = "handleStatus", value = "样品处理表状态（0未接受，1接受，2完成，3退回）", paramType = "query", dataType = "Integer")
})
@GetMapping("/getSampleHandlePage")
public BaseResponse getSampleHandlePage(PageQuery pageQuery, String entrustCode, Integer status,
String clientName, String projectName, String projectCode, Integer isUrgent) {
String clientName, String projectName, String projectCode,
Integer isUrgent,Integer handleStatus) {
try {
return entrustService.getSampleHandlePage(pageQuery, entrustCode, status, clientName, projectName, projectCode, isUrgent);
return entrustService.getSampleHandlePage(pageQuery, entrustCode, status, clientName, projectName,
projectCode, isUrgent, handleStatus);
} catch (Exception e) {
log.debug("样品处理任务分页{}", e);
}
......@@ -221,39 +224,6 @@ public class EntrustController {
return BaseResponse.errorMsg("失败!");
}
@ApiOperation(value = "接受样品处理任务")
@PostMapping("/acceptHandle")
public BaseResponse acceptHandle(@RequestBody Integer[] ids) {
try {
return entrustService.acceptHandle(ids);
} catch (Exception e) {
log.debug("接受样品处理任务{}", e);
}
return BaseResponse.errorMsg("失败!");
}
@ApiOperation(value = "样品处理附件列表")
@GetMapping("/getSampleHandleEnclosureList")
public BaseResponse getSampleHandleEnclosureList(Integer sampleHandleId) {
try {
return entrustService.getSampleHandleEnclosureList(sampleHandleId);
} catch (Exception e) {
log.debug("样品处理附件列表{}", e);
}
return BaseResponse.errorMsg("失败!");
}
@ApiOperation(value = "样品处理数据上传附件")
@PostMapping("/uploadEnclosureCL")
public BaseResponse uploadEnclosureCL(SampleHandleEnclosureQuery query) {
try {
return entrustService.uploadEnclosureCL(query);
} catch (Exception e) {
log.debug("样品处理数据上传附件{}", e);
}
return BaseResponse.errorMsg("失败!");
}
@ApiOperation(value = "样品处理详情")
@GetMapping("/getHandleDtail/{id}")
public BaseResponse getHandleDtail(@PathVariable Integer id) {
......@@ -288,7 +258,7 @@ public class EntrustController {
}
@ApiOperation(value = "样品处理退回任务分页")
@ApiOperation(value = "样品处理退回任务分页（）")
@ApiImplicitParams(value = {
@ApiImplicitParam(name = "entrustCode", value = "委托单号", paramType = "query", dataType = "String"),
@ApiImplicitParam(name = "userId", value = "接受人id", paramType = "query", dataType = "Integer"),
......@@ -319,6 +289,34 @@ public class EntrustController {
return BaseResponse.errorMsg("失败!");
}
//*******************样品检测*****************************************
@ApiOperation(value = "派发样品检测-委托详情")
@GetMapping("/getPFDtail/{id}")
public BaseResponse getPFDtail(@PathVariable Integer id) {
try {
return entrustService.getDtail(id);
} catch (Exception e) {
log.debug("委托详情{}", e);
}
return BaseResponse.errorMsg("失败!");
}
@ApiOperation(value = "派发检测项目任务")
@PostMapping("/distribution")
public BaseResponse distribution(@RequestBody DistributionQuery query) {
try {
return entrustService.distribution(query);
} catch (Exception e) {
log.debug("派发检测项目任务{}", e);
}
return BaseResponse.errorMsg("失败!");
}
@ApiOperation(value = "派发任务分页列表")
@ApiImplicitParams(value = {
@ApiImplicitParam(name = "entrustCode", value = "委托单号", paramType = "query", dataType = "String"),
......@@ -330,14 +328,17 @@ public class EntrustController {
@ApiImplicitParam(name = "clientName", value = "委托单位id", paramType = "query", dataType = "String"),
@ApiImplicitParam(name = "projectName", value = "项目名称", paramType = "query", dataType = "String"),
@ApiImplicitParam(name = "projectCode", value = "项目编号", paramType = "query", dataType = "String"),
@ApiImplicitParam(name = "isUrgent", value = "（1加急，0不加急）", paramType = "query", dataType = "Integer")
@ApiImplicitParam(name = "isUrgent", value = "（1加急，0不加急）", paramType = "query", dataType = "Integer"),
@ApiImplicitParam(name = "distributionStatus", value = "样品检测表状态（0未接受，1接受，2待校核，" +
"3退回，4校核通过，5校核退回）", paramType = "query", dataType = "Integer")
})
@GetMapping("/getSampleDistributionPage")
public BaseResponse getSampleDistributionPage(PageQuery pageQuery, String entrustCode, Integer status,
String clientName, String projectName, String projectCode, Integer isUrgent) {
String clientName, String projectName, String projectCode, Integer isUrgent,
Integer distributionStatus ) {
try {
return entrustService.getSampleDistributionPage(pageQuery, entrustCode, status,
clientName, projectName, projectCode, isUrgent);
clientName, projectName, projectCode, isUrgent, distributionStatus);
} catch (Exception e) {
log.debug("派发任务分页列表{}", e);
}
......@@ -355,19 +356,6 @@ public class EntrustController {
return BaseResponse.errorMsg("失败!");
}
@ApiOperation(value = "派发检测项目任务")
@PostMapping("/distribution")
public BaseResponse distribution(@RequestBody DistributionQuery query) {
try {
return entrustService.distribution(query);
} catch (Exception e) {
log.debug("派发检测项目任务{}", e);
}
return BaseResponse.errorMsg("失败!");
}
@ApiOperation(value = "详情-基本信息")
@GetMapping("/getBaseDtail/{id}")
public BaseResponse getBaseDtail(@PathVariable Integer id) {
......@@ -401,16 +389,7 @@ public class EntrustController {
return BaseResponse.errorMsg("失败!");
}
@ApiOperation(value = "详情-样品处理信息-附件列表")
@GetMapping("/getSampleHandleDtailEnclosureList")
public BaseResponse getSampleHandleDtailEnclosureList(Integer sampleHandleId) {
try {
return entrustService.getSampleHandleDtailEnclosureList(sampleHandleId);
} catch (Exception e) {
log.debug("详情-样品处理信息-附件列表{}", e);
}
return BaseResponse.errorMsg("失败!");
}
@ApiOperation(value = "详情-检测任务信息")
@GetMapping("/getSampleCheckDtail/{id}")
......@@ -434,28 +413,6 @@ public class EntrustController {
return BaseResponse.errorMsg("失败!");
}
@ApiOperation(value = "样品检测附件列表")
@GetMapping("/getSampleDistributionEnclosureList")
public BaseResponse getSampleDistributionEnclosureList(Integer sampleDistributionId) {
try {
return entrustService.getSampleDistributionEnclosureList(sampleDistributionId);
} catch (Exception e) {
log.debug("样品检测数据上传列表{}", e);
}
return BaseResponse.errorMsg("失败!");
}
@ApiOperation(value = "样品检测上传附件")
@PostMapping("/uploadEnclosurePF")
public BaseResponse uploadEnclosurePF(SampleHandleEnclosureQuery query) {
try {
return entrustService.uploadEnclosurePF(query);
} catch (Exception e) {
log.debug("检测项目上传附件{}", e);
}
return BaseResponse.errorMsg("失败!");
}
@ApiOperation(value = "完成检测项目任务（按组完成）+重新检测")
@PostMapping("/finishDistribution")
......@@ -515,17 +472,6 @@ public class EntrustController {
@ApiOperation(value = "数据校核分页")
@ApiImplicitParams(value = {
@ApiImplicitParam(name = "startDate", value = "开始日期", paramType = "query", dataType = "String"),
......@@ -582,8 +528,6 @@ public class EntrustController {
}
@ApiOperation(value = "校核计算")
@PostMapping("/checkCount")
public BaseResponse checkCount(@RequestBody CheckCountNewQuery query) {
......@@ -594,6 +538,108 @@ public class EntrustController {
}
return BaseResponse.errorMsg("失败!");
}
//附件功能**************************************************
@ApiOperation(value = "样品处理附件列表")
@GetMapping("/getSampleHandleEnclosureList")
public BaseResponse getSampleHandleEnclosureList(Integer sampleHandleId) {
try {
return entrustService.getSampleHandleEnclosureList(sampleHandleId);
} catch (Exception e) {
log.debug("样品处理附件列表{}", e);
}
return BaseResponse.errorMsg("失败!");
}
@ApiOperation(value = "样品处理上传附件")
@PostMapping("/uploadEnclosureCL")
public BaseResponse uploadEnclosureCL(SampleHandleEnclosureQuery query) {
try {
return entrustService.uploadEnclosureCL(query);
} catch (Exception e) {
log.debug("样品处理上传附件{}", e);
}
return BaseResponse.errorMsg("失败!");
}
@ApiOperation(value = "样品检测/校核附件列表")
@GetMapping("/getSampleDistributionEnclosureList")
public BaseResponse getSampleDistributionEnclosureList(Integer sampleDistributionId) {
try {
return entrustService.getSampleDistributionEnclosureList(sampleDistributionId);
} catch (Exception e) {
log.debug("样品检测/校核附件列表{}", e);
}
return BaseResponse.errorMsg("失败!");
}
@ApiOperation(value = "样品检测/校核上传附件")
@PostMapping("/uploadEnclosurePF")
public BaseResponse uploadEnclosurePF(SampleHandleEnclosureQuery query) {
try {
return entrustService.uploadEnclosurePF(query);
} catch (Exception e) {
log.debug("样品检测/校核上传附件{}", e);
}
return BaseResponse.errorMsg("失败!");
}
@ApiOperation(value = "删除附件")
@ApiImplicitParams(value = {
@ApiImplicitParam(name = "id", value = "样品表id/检测表id", paramType = "query", dataType = "Integer"),
@ApiImplicitParam(name = "type",value = "状态 0处理项，1检测项", paramType = "query", dataType = "Integer")
})
@PostMapping("/deleteEnclosure")
public BaseResponse deleteEnclosure(Integer id,Integer type) {
try {
return entrustService.deleteEnclosure(id, type);
} catch (Exception e) {
log.debug("删除附件{}", e);
}
return BaseResponse.errorMsg("失败!");
}
@ApiOperation(value = "设置附件是否公开（校核）")
@ApiImplicitParams(value = {
@ApiImplicitParam(name = "isPublic", value = "是否公开 0不公开 1公开", paramType = "query", dataType = "Integer"),
@ApiImplicitParam(name = "id", value = "样品表id/检测表id", paramType = "query", dataType = "Integer"),
@ApiImplicitParam(name = "type",value = "状态 0处理项，1检测项", paramType = "query", dataType = "Integer")
})
@PostMapping("/makePublicEnclosure")
public BaseResponse makePublicEnclosure(Integer isPublic, Integer id,Integer type) {
try {
return entrustService.makePublicEnclosure(isPublic, id, type);
} catch (Exception e) {
log.debug("设置附件是否公开{}", e);
}
return BaseResponse.errorMsg("失败!");
}
@PostMapping("/export/{entrustId}")
@ApiOperation("导出委托单")
......@@ -632,17 +678,6 @@ public class EntrustController {
}
/* @ApiOperation(value = "数据校核")
@PostMapping("/check")
public BaseResponse check(@RequestBody CheckQuery query) {
try {
return entrustService.check(query);
} catch (Exception e) {
log.debug("数据校核{}", e);
}
return BaseResponse.errorMsg("失败!");
}*/
private String getTeamName(List<SampleDistributionTeamVo> teamVos) {
if (teamVos.size() == 0) {
return "";
......
cement-business/src/main/java/cn/wise/sc/cement/business/controller/PlanPeopleController.java
View file @ e5922508
......@@ -3,7 +3,6 @@ package cn.wise.sc.cement.business.controller;
import cn.wise.sc.cement.business.model.BaseResponse;
import cn.wise.sc.cement.business.model.PageQuery;
import cn.wise.sc.cement.business.model.query.PlanPeopleQuery;
import cn.wise.sc.cement.business.model.query.SampleDistributionEnclosureQuery;
import cn.wise.sc.cement.business.service.IPlanPeopleService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
......
cement-business/src/main/java/cn/wise/sc/cement/business/controller/WeiXinController.java
View file @ e5922508
package cn.wise.sc.cement.business.controller;
import cn.hutool.core.util.StrUtil;
import cn.hutool.core.util.URLUtil;
import cn.wise.sc.cement.business.model.BaseResponse;
import cn.wise.sc.cement.business.service.impl.WeiXinService;
import cn.wise.sc.cement.business.util.weixin.Global;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.transaction.interceptor.TransactionAspectSupport;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
......@@ -139,14 +139,19 @@ public class WeiXinController {
@ApiOperation(value = "发送消息")
@GetMapping("/sendTextMessage")
public BaseResponse sendTextMessage() {
public BaseResponse sendTextMessage(String touser) {
try {
//发送企业微信消息内容
Integer notice = (int)(1+Math.random()*(10-1+1));
String URL = "https://lab.wisenergy.cn/lab-bangye?id="+269+"&path=/blanche/entrustdetail&notice="+notice;
String systemUrL = systemUrl.replace("U_R_L",URLUtil.encode(URL));
String content="你好！"+"竹天卫"+"向您申请了一条委托，请前往\n" +
systemUrl+"进行评审。";
systemUrL+"进行评审。";
System.out.println("**************************content**********************");
System.out.println(content);
weiXinService.sendTextMessage("ZhuTianWei", content);
weiXinService.sendTextMessage(touser, content);
// weiXinService.sendTextMessage("1","hello");
......@@ -157,4 +162,5 @@ public class WeiXinController {
return BaseResponse.errorMsg("失败!");
}
}
cement-business/src/main/java/cn/wise/sc/cement/business/entity/SampleHandleEnclosure.java
View file @ e5922508
......@@ -62,4 +62,9 @@ public class SampleHandleEnclosure implements Serializable {
@ApiModelProperty("pdf路径")
private String pdfUrl;
/**
* 是否允许委托人查看 是否公开 （0不公开，1公开）
*/
private Integer isPublic;
}
cement-business/src/main/java/cn/wise/sc/cement/business/entity/Team.java
View file @ e5922508
......@@ -84,4 +84,9 @@ public class Team extends BaseEntity implements Serializable {
@ApiModelProperty("是否需要平行（0否，1是）")
private Integer isParallel;
@ApiModelProperty("是否需要派发（0否 样品处理完直接校核，1是样品处理完需要检测再校核）")
private Integer isPf;
}
cement-business/src/main/java/cn/wise/sc/cement/business/mapper/xml/EntrustMapper.xml
View file @ e5922508
......@@ -185,6 +185,9 @@
<if test="params.status != null">
and e.status = #{params.status}
</if>
<if test="params.handleStatus != null">
and e.status = #{params.handleStatus}
</if>
<if test="params.isUrgent != null">
and e.is_urgent = #{params.isUrgent}
</if>
......@@ -241,6 +244,10 @@
<if test="params.status != null">
and e.status = #{params.status}
</if>
<if test="params.distributionStatus != null">
and t.status = #{params.distributionStatus}
</if>
<if test="params.isUrgent != null">
and e.is_urgent = #{params.isUrgent}
</if>
......
cement-business/src/main/java/cn/wise/sc/cement/business/mapper/xml/SampleDistributionEnclosureMapper.xml
View file @ e5922508
......@@ -16,6 +16,9 @@
from sample_distribution_enclosure t
left join sys_user su on su.id = t.user_id
where t.sample_distribution_id = #{params.sampleDistributionId}
<if test="params.userId != null">
and t.user_id = #{params.userId}
</if>
order by t.id ASC
</select>
......
cement-business/src/main/java/cn/wise/sc/cement/business/model/PageQuery.java
View file @ e5922508
......@@ -24,5 +24,5 @@ public class PageQuery implements Serializable {
@ApiModelProperty(value = "每页显示数量")
@NonNull
private Integer pageSize = 10;
private Integer pageSize = 20;
}
cement-business/src/main/java/cn/wise/sc/cement/business/model/query/TeamQuery.java
View file @ e5922508
......@@ -45,4 +45,7 @@ public class TeamQuery {
@ApiModelProperty("是否需要平行（0否，1是）")
private Integer isParallel;
@ApiModelProperty("是否需要派发（0否 样品处理完直接校核，1是样品处理完需要检测再校核）")
private Integer isPf;
}
cement-business/src/main/java/cn/wise/sc/cement/business/model/vo/TeamVo.java
View file @ e5922508
......@@ -71,5 +71,9 @@ public class TeamVo {
@ApiModelProperty("是否需要平行（0否，1是）")
private Integer isParallel;
@ApiModelProperty("是否需要派发（0否 样品处理完直接校核，1是样品处理完需要检测再校核）")
private Integer isPf;
}
cement-business/src/main/java/cn/wise/sc/cement/business/service/IEntrustService.java
View file @ e5922508
......@@ -45,20 +45,13 @@ public interface IEntrustService extends IService<Entrust> {
BaseResponse<String> sureUpdate(sureUpdateQuery query);
// BaseResponse<String> handle(HandleQuery query);
//派发处理
//样品处理
BaseResponse<IPage<EntrustVo>> getSampleHandlePage(PageQuery pageQuery, String entrustCode, Integer status,
String clientName, String projectName, String projectCode, Integer isUrgent);
String clientName, String projectName, String projectCode,
Integer isUrgent,Integer handleStatus);
BaseResponse<Map<String, Object>> getSampleHandleList(Integer id);
BaseResponse<String> acceptHandle(Integer[] ids);
BaseResponse<List<SampleHandleEnclosureVo>> getSampleHandleEnclosureList(Integer sampleHandleId);
BaseResponse<SampleHandleEnclosure> uploadEnclosureCL(SampleHandleEnclosureQuery query);
BaseResponse<SampleHandleVo> getHandleDtail(Integer id);
BaseResponse<String> finishHandle(Integer id);
......@@ -70,22 +63,18 @@ public interface IEntrustService extends IService<Entrust> {
BaseResponse<String> handleAgain(HandleAgainQuery query);
//派发检测
//样品检测
BaseResponse<String> distribution(DistributionQuery query);
BaseResponse<IPage<EntrustVo>> getSampleDistributionPage(PageQuery pageQuery, String entrustCode, Integer status,
String clientName, String projectName, String projectCode, Integer isUrgent);
String clientName, String projectName, String projectCode,
Integer isUrgent, Integer distributionStatus);
BaseResponse<Map<String, Object>> getSampleDistributionList(Integer id);
BaseResponse<String> acceptDistribution(Integer[] ids);
BaseResponse<List<SampleDistributionEnclosureVo>> getSampleDistributionEnclosureList(Integer sampleDistributionId);
BaseResponse<SampleDistributionEnclosure> uploadEnclosurePF(SampleHandleEnclosureQuery query);
// BaseResponse<SampleDistribution> uploadEnclosurePF(SampleDistributionEnclosureQuery query);
BaseResponse<String> finishDistribution(FinishCheckGroupQuery query);
......@@ -97,12 +86,7 @@ public interface IEntrustService extends IService<Entrust> {
BaseResponse<String> distributioAgain(HandleAgainQuery query);
//校核
BaseResponse<IPage<EntrustVo>> getCheckPage(PageQuery pageQuery, String startDate, String endDate, Integer status,
Integer clientId, String projectName, String projectCode);
......@@ -110,14 +94,27 @@ public interface IEntrustService extends IService<Entrust> {
BaseResponse<CheckUserResultVo> getCheckResult(Integer entrustId, Integer userId);
BaseResponse<List<SampleCheckVo>> getCheckDetail(String cementCode);
BaseResponse<Map<String, String>> checkCountFast(CheckCountFastQuery query);
BaseResponse<String> checkCountNew(CheckCountNewQuery query);
/*BaseResponse<String> check(CheckQuery query);*/
//附件的操作
BaseResponse<List<SampleHandleEnclosureVo>> getSampleHandleEnclosureList(Integer sampleHandleId);
BaseResponse<SampleHandleEnclosure> uploadEnclosureCL(SampleHandleEnclosureQuery query);
BaseResponse<List<SampleDistributionEnclosureVo>> getSampleDistributionEnclosureList(Integer sampleDistributionId);
BaseResponse<SampleDistributionEnclosure> uploadEnclosurePF(SampleHandleEnclosureQuery query);
BaseResponse<String> deleteEnclosure(Integer id,Integer type);
BaseResponse<String> makePublicEnclosure(Integer isPublic, Integer id,Integer type);
//报告
BaseResponse<IPage<EntrustVo>> getReportPage(PageQuery pageQuery, String startDate,
String endDate, Integer clientId,
String projectName, String projectCode);
......@@ -143,8 +140,6 @@ public interface IEntrustService extends IService<Entrust> {
BaseResponse<List<SampleHandleVo>> getSampleHandleDtail(Integer id);
BaseResponse<List<SampleHandleEnclosureVo>> getSampleHandleDtailEnclosureList(Integer sampleHandleId);
BaseResponse<List<SampleVo>> getSampleCheckDtail(Integer id);
/**
......
cement-business/src/main/java/cn/wise/sc/cement/business/service/IPlanPeopleService.java
View file @ e5922508
package cn.wise.sc.cement.business.service;
import cn.wise.sc.cement.business.entity.PlanPeople;
import cn.wise.sc.cement.business.entity.PlanTraining;
import cn.wise.sc.cement.business.entity.SampleDistribution;
import cn.wise.sc.cement.business.model.BaseResponse;
import cn.wise.sc.cement.business.model.PageQuery;
import cn.wise.sc.cement.business.model.query.PlanPeopleQuery;
import cn.wise.sc.cement.business.model.query.SampleDistributionEnclosureQuery;
import cn.wise.sc.cement.business.model.vo.PlanPeopleVo;
import cn.wise.sc.cement.business.model.vo.PlanTrainingVo;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.service.IService;
import org.springframework.transaction.annotation.Transactional;
import java.util.Date;
import java.util.List;
public interface IPlanPeopleService extends IService<PlanPeople> {
......
cement-business/src/main/java/cn/wise/sc/cement/business/service/impl/EntrustServiceImpl.java
View file @ e5922508
......@@ -3,14 +3,10 @@ package cn.wise.sc.cement.business.service.impl;
import cn.hutool.core.bean.BeanUtil;
import cn.hutool.core.date.DateUtil;
import cn.hutool.core.util.StrUtil;
import cn.hutool.core.util.URLUtil;
import cn.wise.sc.cement.business.entity.*;
import cn.wise.sc.cement.business.mapper.*;
import cn.wise.sc.cement.business.model.BaseResponse;
import cn.wise.sc.cement.business.model.IndustrialReport;
import cn.wise.sc.cement.business.model.LoginUser;
import cn.wise.sc.cement.business.model.PageQuery;
import cn.wise.sc.cement.business.model.ReportDetailVo;
import cn.wise.sc.cement.business.model.SixElementReport;
import cn.wise.sc.cement.business.model.*;
import cn.wise.sc.cement.business.model.query.*;
import cn.wise.sc.cement.business.model.vo.*;
import cn.wise.sc.cement.business.service.*;
......@@ -19,17 +15,13 @@ import cn.wise.sc.cement.business.util.ExcelUtil;
import cn.wise.sc.cement.business.util.RedisUtil;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import io.swagger.models.auth.In;
import lombok.Data;
import org.apache.commons.lang3.StringUtils;
import org.apache.ibatis.annotations.Param;
import org.apache.poi.ss.formula.functions.T;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
......@@ -386,8 +378,12 @@ public class EntrustServiceImpl extends ServiceImpl<EntrustMapper, Entrust> impl
}
}
//发送企业微信消息内容
Integer notice = (int)(1+Math.random()*(10-1+1));
String URL = "https://lab.wisenergy.cn/lab-bangye?id="+entrust.getId()+"&path=/blanche/entrustdetail&notice="+notice;
String systemUrL = systemUrl.replace("U_R_L", URLUtil.encodeAll(URL));
String content="你好！"+loginUser.getName()+"向您申请了一条委托，请前往\n" +
systemUrl+"进行评审。";
systemUrL+"进行评审。";
System.out.println("**************************content**********************");
System.out.println(content);
weiXinService.sendTextMessage(userIds, content);
......@@ -395,6 +391,14 @@ public class EntrustServiceImpl extends ServiceImpl<EntrustMapper, Entrust> impl
return BaseResponse.okData(entrust);
}
public static void main(String[] args) {
String URL = "https://lab.wisenergy.cn/lab-bangye?id="+12+"&path=/blanche/entrustdetail&notice="+21;
String a = URLUtil.encodeAll(URL);
String b = URLUtil.encode(URL).replaceAll("&","%26");
// String a = URLUtil.encode(URL);
System.out.println(a);
System.out.println(b);
}
/**
......@@ -672,7 +676,7 @@ public class EntrustServiceImpl extends ServiceImpl<EntrustMapper, Entrust> impl
List<Integer> teamGroupIdList = new ArrayList<>();
for (String teamId : teamIdS) {
TeamVo teamVo = teamMapper.getDetail(Integer.valueOf(teamId));
if (teamVo != null) {
if (teamVo != null && teamVo.getIsPf()!=0) {
if(!teamGroupIdList.contains(teamVo.getGroupId())){
teamGroupIdList.add(teamVo.getGroupId());
SampleTeamGroupVo sampleTeamGroupVo = new SampleTeamGroupVo();
......@@ -802,6 +806,8 @@ public class EntrustServiceImpl extends ServiceImpl<EntrustMapper, Entrust> impl
return BaseResponse.okData(entrustVo);
}
/**
* 详情-基本信息
*
......@@ -1066,25 +1072,7 @@ public class EntrustServiceImpl extends ServiceImpl<EntrustMapper, Entrust> impl
return BaseResponse.okData(sampleHandleList);
}
/**
* 详情-样品处理信息-附件列表
*
* @param sampleHandleId 样品处理表id
* @return
*/
public BaseResponse<List<SampleHandleEnclosureVo>> getSampleHandleDtailEnclosureList(Integer sampleHandleId) {
LoginUser loginUser = userService.getLoginUser();
if (loginUser == null) {
return BaseResponse.errorMsg("请登录账号");
}
if (sampleHandleId == null) {
return BaseResponse.errorMsg("参数错误");
}
Map<String, Object> params = new HashMap<>();
params.put("sampleHandleId", sampleHandleId);
List<SampleHandleEnclosureVo> list = sampleHandleEnclosureMapper.getList(params);
return BaseResponse.okData(list);
}
/**
* 详情-检测任务信息
......@@ -1689,7 +1677,8 @@ public class EntrustServiceImpl extends ServiceImpl<EntrustMapper, Entrust> impl
*/
@Override
public BaseResponse<IPage<EntrustVo>> getSampleHandlePage(PageQuery pageQuery, String entrustCode, Integer status,
String clientName, String projectName, String projectCode, Integer isUrgent) {
String clientName, String projectName, String projectCode, Integer isUrgent,
Integer handleStatus) {
LoginUser loginUser = userService.getLoginUser();
if (loginUser == null) {
return BaseResponse.errorMsg("请登录账号");
......@@ -1702,6 +1691,7 @@ public class EntrustServiceImpl extends ServiceImpl<EntrustMapper, Entrust> impl
params.put("projectCode", projectCode);
params.put("isUrgent", isUrgent);
params.put("userId", loginUser.getId());
params.put("handleStatus", handleStatus);
Page<EntrustVo> page = new Page<>(pageQuery.getPageNo(), pageQuery.getPageSize());
IPage<EntrustVo> pages = entrustMapper.getSampleHandlePage(page, params);
......@@ -1802,7 +1792,7 @@ public class EntrustServiceImpl extends ServiceImpl<EntrustMapper, Entrust> impl
* @param ids 委托单
* @return
*/
@Transactional
/*@Transactional
@Override
public BaseResponse<String> acceptHandle(Integer[] ids) {
LoginUser loginUser = userService.getLoginUser();
......@@ -1837,62 +1827,11 @@ public class EntrustServiceImpl extends ServiceImpl<EntrustMapper, Entrust> impl
//处理消息
userMessageService.dealMessage(loginUser.getId(), sample.getEntrustId(), SysUserMessage.MessageType.ENTRUST);
return BaseResponse.okMsg("已接受样品处理任务");
}
}*/
/**
* 数据上传列表
*
* @param sampleHandleId 样品处理表id
* @return
*/
public BaseResponse<List<SampleHandleEnclosureVo>> getSampleHandleEnclosureList(Integer sampleHandleId) {
LoginUser loginUser = userService.getLoginUser();
if (loginUser == null) {
return BaseResponse.errorMsg("请登录账号");
}
Map<String, Object> params = new HashMap<>();
params.put("sampleHandleId", sampleHandleId);
params.put("userId", loginUser.getId());
List<SampleHandleEnclosureVo> list = sampleHandleEnclosureMapper.getList(params);
return BaseResponse.okData(list);
}
/**
* 样品处理数据上传附件
*
* @param query
* @return
*/
@Transactional
@Override
public BaseResponse<SampleHandleEnclosure> uploadEnclosureCL(SampleHandleEnclosureQuery query) {
LoginUser loginUser = userService.getLoginUser();
if (loginUser == null) {
return BaseResponse.errorMsg("请登录账号");
}
if (query == null || query.getId() == null) {
return BaseResponse.errorMsg("参数错误");
}
SampleHandle sampleHandle = sampleHandleMapper.selectById(query.getId());
Handle handle = handleMapper.selectById(sampleHandle.getHandleId());
SampleHandleEnclosure sampleHandleEnclosure = new SampleHandleEnclosure();
sampleHandleEnclosure.setSampleHandleId(sampleHandle.getId())
.setHandleId(sampleHandle.getHandleId())
.setUserId(sampleHandle.getUserId())
.setCreateTime(LocalDateTime.now())
.setStatus(1)
.setAlias(handle.getName())
.setEnclosureUrl(query.getEnclosureUrl())
.setExtName(query.getExtName())
.setUpdateTime(LocalDateTime.now())
.setPdfUrl(query.getPdfUrl());
if (StringUtils.isEmpty(query.getEnclosureUrl())) {
sampleHandleEnclosure.setStatus(2); //上传失败
}
sampleHandleEnclosureMapper.insert(sampleHandleEnclosure);
return BaseResponse.okData(sampleHandleEnclosure);
}
/**
* 样品处理详情
......@@ -2254,7 +2193,8 @@ public class EntrustServiceImpl extends ServiceImpl<EntrustMapper, Entrust> impl
*/
@Override
public BaseResponse<IPage<EntrustVo>> getSampleDistributionPage(PageQuery pageQuery, String entrustCode, Integer status,
String clientName, String projectName, String projectCode, Integer isUrgent) {
String clientName, String projectName, String projectCode,
Integer isUrgent, Integer distributionStatus) {
LoginUser loginUser = userService.getLoginUser();
if (loginUser == null) {
return BaseResponse.errorMsg("请登录账号");
......@@ -2267,7 +2207,7 @@ public class EntrustServiceImpl extends ServiceImpl<EntrustMapper, Entrust> impl
params.put("projectCode", projectCode);
params.put("isUrgent", isUrgent);
params.put("userId", loginUser.getId());
params.put("userId", loginUser.getId());
params.put("distributionStatus", distributionStatus);
Page<EntrustVo> page = new Page<>(pageQuery.getPageNo(), pageQuery.getPageSize());
IPage<EntrustVo> pages = entrustMapper.getSampleDistributionPage(page, params);
List<EntrustVo> list = pages.getRecords();
......@@ -2459,65 +2399,6 @@ public class EntrustServiceImpl extends ServiceImpl<EntrustMapper, Entrust> impl
return BaseResponse.okMsg("已接受检测项目任务");
}
/**
* 样品检测数据上传列表
*
* @param sampleDistributionId 样品检测表id
* @return
*/
@Override
public BaseResponse<List<SampleDistributionEnclosureVo>> getSampleDistributionEnclosureList(Integer sampleDistributionId) {
LoginUser loginUser = userService.getLoginUser();
if (loginUser == null) {
return BaseResponse.errorMsg("请登录账号");
}
Map<String, Object> params = new HashMap<>();
params.put("sampleDistributionId", sampleDistributionId);
List<SampleDistributionEnclosureVo> list = sampleDistributionEnclosureMapper.getList(params);
return BaseResponse.okData(list);
}
/**
* 样品检测数据上传附件
*
* @param query
* @return
*/
@Transactional
@Override
public BaseResponse<SampleDistributionEnclosure> uploadEnclosurePF(SampleHandleEnclosureQuery query) {
LoginUser loginUser = userService.getLoginUser();
if (loginUser == null) {
return BaseResponse.errorMsg("请登录账号");
}
if (query == null || query.getId() == null) {
return BaseResponse.errorMsg("参数错误");
}
SampleDistribution distribution = distributionMapper.selectById(query.getId());
if (distribution == null) {
return BaseResponse.errorMsg("信息错误");
}
Team team = teamMapper.selectById(distribution.getTeamId());
SampleDistributionEnclosure sampleDistributionEnclosure = new SampleDistributionEnclosure();
sampleDistributionEnclosure.setSampleDistributionId(distribution.getId())
.setTeamId(distribution.getTeamId())
.setUserId(distribution.getUserId())
.setCreateTime(LocalDateTime.now())
.setStatus(1)
.setAlias(team.getName())
.setEnclosureUrl(query.getEnclosureUrl())
.setExtName(query.getExtName())
.setUpdateTime(LocalDateTime.now())
.setPdfUrl(query.getPdfUrl())
.setIsPublic(0); //默认不允许公开
if (StringUtils.isEmpty(query.getEnclosureUrl())) {
sampleDistributionEnclosure.setStatus(2); //上传失败
}
sampleDistributionEnclosureMapper.insert(sampleDistributionEnclosure);
return BaseResponse.okData(sampleDistributionEnclosure);
}
/**
* 完成检测项目任务 重新检测也是用这个接口
......@@ -3211,9 +3092,6 @@ public class EntrustServiceImpl extends ServiceImpl<EntrustMapper, Entrust> impl
/**
* 按照检测组校核计算 （新的）
* @param query
......@@ -3533,10 +3411,212 @@ public class EntrustServiceImpl extends ServiceImpl<EntrustMapper, Entrust> impl
return BaseResponse.okData(sampleCheckVoList);
}
//附件****************************************************************
/**
* 样品处理附件列表
*
* @param sampleHandleId 样品处理表id
* @return
*/
public BaseResponse<List<SampleHandleEnclosureVo>> getSampleHandleEnclosureList(Integer sampleHandleId) {
LoginUser loginUser = userService.getLoginUser();
if (loginUser == null) {
return BaseResponse.errorMsg("请登录账号");
}
if (sampleHandleId == null) {
return BaseResponse.errorMsg("参数错误");
}
Map<String, Object> params = new HashMap<>();
params.put("sample_handle_id", sampleHandleId);
List<SampleHandleEnclosureVo> list = sampleHandleEnclosureMapper.getList(params);
return BaseResponse.okData(list);
}
/**
* 样品检测附件列表
*
* @param sampleDistributionId 样品检测表id
* @return
*/
@Override
public BaseResponse<List<SampleDistributionEnclosureVo>> getSampleDistributionEnclosureList(Integer sampleDistributionId) {
LoginUser loginUser = userService.getLoginUser();
if (loginUser == null) {
return BaseResponse.errorMsg("请登录账号");
}
Map<String, Object> params = new HashMap<>();
params.put("sampleDistributionId", sampleDistributionId);
List<SampleDistributionEnclosureVo> list = sampleDistributionEnclosureMapper.getList(params);
return BaseResponse.okData(list);
}
/**
* 样品处理上传附件
*
* @param query
* @return
*/
@Transactional
@Override
public BaseResponse<SampleHandleEnclosure> uploadEnclosureCL(SampleHandleEnclosureQuery query) {
LoginUser loginUser = userService.getLoginUser();
if (loginUser == null) {
return BaseResponse.errorMsg("请登录账号");
}
if (query == null || query.getId() == null) {
return BaseResponse.errorMsg("参数错误");
}
SampleHandle sampleHandle = sampleHandleMapper.selectById(query.getId());
SampleHandleEnclosure sampleHandleEnclosure = new SampleHandleEnclosure();
sampleHandleEnclosure.setSampleHandleId(sampleHandle.getId())
.setHandleId(sampleHandle.getHandleId())
.setUserId(sampleHandle.getUserId())
.setCreateTime(LocalDateTime.now())
.setStatus(1)
.setAlias(query.getAlias())
.setEnclosureUrl(query.getEnclosureUrl())
.setExtName(query.getExtName())
.setUpdateTime(LocalDateTime.now())
.setPdfUrl(query.getPdfUrl())
.setIsPublic(0); ////默认不允许公开
if (StringUtils.isEmpty(query.getEnclosureUrl())) {
sampleHandleEnclosure.setStatus(2); //上传失败
}
sampleHandleEnclosureMapper.insert(sampleHandleEnclosure);
return BaseResponse.okData(sampleHandleEnclosure);
}
/**
* 样品检测上传附件
*
* @param query
* @return
*/
@Transactional
@Override
public BaseResponse<SampleDistributionEnclosure> uploadEnclosurePF(SampleHandleEnclosureQuery query) {
LoginUser loginUser = userService.getLoginUser();
if (loginUser == null) {
return BaseResponse.errorMsg("请登录账号");
}
if (query == null || query.getId() == null) {
return BaseResponse.errorMsg("参数错误");
}
SampleDistribution distribution = distributionMapper.selectById(query.getId());
if (distribution == null) {
return BaseResponse.errorMsg("信息错误");
}
SampleDistributionEnclosure sampleDistributionEnclosure = new SampleDistributionEnclosure();
sampleDistributionEnclosure.setSampleDistributionId(distribution.getId())
.setTeamId(distribution.getTeamId())
.setUserId(distribution.getUserId())
.setCreateTime(LocalDateTime.now())
.setStatus(1)
.setAlias(query.getAlias())
.setEnclosureUrl(query.getEnclosureUrl())
.setExtName(query.getExtName())
.setUpdateTime(LocalDateTime.now())
.setPdfUrl(query.getPdfUrl())
.setIsPublic(0); //默认不允许公开
if (StringUtils.isEmpty(query.getEnclosureUrl())) {
sampleDistributionEnclosure.setStatus(2); //上传失败
}
sampleDistributionEnclosureMapper.insert(sampleDistributionEnclosure);
return BaseResponse.okData(sampleDistributionEnclosure);
}
/**
* 删除附件
* @param id 附件表id
* @param type 0处理项，1检测项
* @return
*/
@Transactional
@Override
public BaseResponse<String> deleteEnclosure(Integer id,Integer type) {
if(type == 0 ){
SampleHandleEnclosure sampleHandleEnclosure =
sampleHandleEnclosureMapper.selectById(id);
if(sampleHandleEnclosure == null){
return BaseResponse.errorMsg("信息错误");
}
sampleHandleEnclosureMapper.deleteById(id);
return BaseResponse.okData("附件信息删除成功");
}else if(type ==1){
SampleDistributionEnclosure sampleDistributionEnclosure =
sampleDistributionEnclosureMapper.selectById(id);
if(sampleDistributionEnclosure == null){
return BaseResponse.errorMsg("信息错误");
}
sampleDistributionEnclosureMapper.deleteById(id);
return BaseResponse.okData("附件信息删除成功");
}else{
return BaseResponse.errorMsg("请选择类型");
}
}
/**
* 设置附件是否公开
* @param isPublic
* @param id
* @param type 0处理项，1检测项
* @return
*/
@Override
@Transactional
public BaseResponse<String> makePublicEnclosure(Integer isPublic, Integer id,Integer type) {
if (isPublic == null || id == null) {
return BaseResponse.errorMsg("参数错误!");
}
if(type == 0 ){
SampleHandleEnclosure sampleHandleEnclosure =
sampleHandleEnclosureMapper.selectById(id);
if(sampleHandleEnclosure == null){
return BaseResponse.errorMsg("信息错误");
}
sampleHandleEnclosure.setIsPublic(isPublic);
sampleHandleEnclosureMapper.updateById(sampleHandleEnclosure);
String result = "";
if (sampleHandleEnclosure.getIsPublic() == 1) {
result = "已公开";
} else {
result = "已禁止";
}
return BaseResponse.okData(result);
}else if(type ==1){
SampleDistributionEnclosure sampleDistributionEnclosure =
sampleDistributionEnclosureMapper.selectById(id);
if(sampleDistributionEnclosure == null){
return BaseResponse.errorMsg("信息错误");
}
sampleDistributionEnclosure.setIsPublic(isPublic);
sampleDistributionEnclosureMapper.updateById(sampleDistributionEnclosure);
String result = "";
if (sampleDistributionEnclosure.getIsPublic() == 1) {
result = "已公开";
} else {
result = "已禁止";
}
return BaseResponse.okData(result);
}else{
return BaseResponse.errorMsg("请选择类型");
}
}
/**
* 校核计算 之前的
* 校核计算 （之前的方式）
*
* @param query
* @return
......@@ -3845,129 +3925,6 @@ public class EntrustServiceImpl extends ServiceImpl<EntrustMapper, Entrust> impl
}
/**
* 数据校核
*
* @param
* @return
*/
/* @Transactional
@Override
public BaseResponse<String> check(CheckQuery query) {
if (query.getId() == null) {
return BaseResponse.errorMsg("参数错误");
}
Entrust entrust = entrustMapper.selectById(query.getId());
entrust.setStatus(7);
if (entrust == null) {
return BaseResponse.errorMsg("信息错误");
}
if (entrust.getStatus() < 6) {
return BaseResponse.errorMsg("当前状态不允许校核");
}
LoginUser loginUser = userService.getLoginUser();
if (loginUser == null) {
return BaseResponse.errorMsg("请登录用户");
}
String cementCode = "";
if (query.getSampleCheckTeamQueryList() != null && query.getSampleCheckTeamQueryList().size() > 0) {
List<SampleCheckTeamQuery> sctQueryList = query.getSampleCheckTeamQueryList();
for (SampleCheckTeamQuery sctQuery : sctQueryList) {
if (sctQuery == null || sctQuery.getCementCode() == null) {
return BaseResponse.errorMsg("检测组或样品信息错误");
}
if (sctQuery.getTeamGroupId() == null || StringUtils.isEmpty(sctQuery.getTeamGroupName())) {
return BaseResponse.errorMsg("请选择检测组");
}
cementCode = sctQuery.getCementCode(); //获取本所编号用于判断委托单和样品表状态
//保存校核表信息
SampleCheck check = new SampleCheck();
check.setEntrustId(entrust.getId())
.setCementCode(sctQuery.getCementCode())
.setTeamGroupId(sctQuery.getTeamGroupId())
.setTeamGroupName(sctQuery.getTeamGroupName())
.setCountResult(JSON.toJSONString(sctQuery.getEndResult()))
.setMainMap(JSON.toJSONString(sctQuery.getMainMap()))
.setSecondaryMap(JSON.toJSONString(sctQuery.getSecondaryMap()))
.setIsParallel(sctQuery.getIsParallel())
.setCreateTime(LocalDateTime.now());
sampleCheckMapper.insert(check);
//保存校核检测组检测项信息
// List<SampleCheckTeam> sampleCheckTeamList = new ArrayList<>();
SampleCheckTeam sampleCheckTeam = new SampleCheckTeam();
sampleCheckTeam.setCheckId(check.getId())
.setSampleId(sctQuery.getMainSampleId())
.setParallelCode(sctQuery.getMainParallelCode())
.setUserId(sctQuery.getMainUserId())
.setEquipmentId(sctQuery.getMainEquipmentId())
.setEquipmentName(sctQuery.getMainEquipmentName())
.setInputResult(JSON.toJSONString(sctQuery.getMainResult()))
.setCreateTime(LocalDateTime.now());
sampleCheckTeamMapper.insert(sampleCheckTeam);
//添加设备使用记录 设备使用记录表 equipment_use
EquipmentUse equipmentUse = new EquipmentUse();
SysUser sysUser = userService.getById(sampleCheckTeam.getUserId());
equipmentUse.setEquipmentId(sampleCheckTeam.getEquipmentId())
.setUserId(sampleCheckTeam.getUserId())
.setUserName(sysUser.getName())
.setUseDate(LocalDate.now())
.setProjectId(entrust.getProjectId())
.setProjectName(entrust.getProjectName())
.setProjectCode(entrust.getProjectCode())
.setTestItem(check.getTeamGroupName())
.setCreateTime(LocalDateTime.now())
.setRemark("委托派发-数据校核");
equipmentUseMapper.insert(equipmentUse);
if (check.getIsParallel() == 1) {
SampleCheckTeam sampleCheckTeam2 = new SampleCheckTeam();
sampleCheckTeam2.setCheckId(check.getId())
.setSampleId(sctQuery.getSecondarySampleId())
.setParallelCode(sctQuery.getSecondaryParallelCode())
.setUserId(sctQuery.getSecondaryUserId())
.setEquipmentId(sctQuery.getSecondaryEquipmentId())
.setEquipmentName(sctQuery.getSecondaryEquipmentName())
.setInputResult(JSON.toJSONString(sctQuery.getSecondaryResult()))
.setCreateTime(sampleCheckTeam.getCreateTime());
sampleCheckTeamMapper.insert(sampleCheckTeam2);
//添加设备使用记录 设备使用记录表 equipment_use
EquipmentUse equipmentUse2 = new EquipmentUse();
SysUser sysUser2 = userService.getById(sampleCheckTeam2.getUserId());
equipmentUse2.setEquipmentId(sampleCheckTeam2.getEquipmentId())
.setUserId(sampleCheckTeam2.getUserId())
.setUserName(sysUser2.getName())
.setUseDate(LocalDate.now())
.setProjectId(entrust.getProjectId())
.setProjectName(entrust.getProjectName())
.setProjectCode(entrust.getProjectCode())
.setTestItem(check.getTeamGroupName())
.setCreateTime(LocalDateTime.now())
.setRemark("委托派发-数据校核");
equipmentUseMapper.insert(equipmentUse2);
}
}
}
//更新样品表状态为已经校核状态 is_check 0未处理 1处理完成
QueryWrapper<Sample> sampleQW = new QueryWrapper<>();
sampleQW.eq("cement_code", cementCode);
List<Sample> sampleList = sampleMapper.selectList(sampleQW);
if (sampleList != null && sampleList.size() > 0) {
for (Sample sample : sampleList) {
sample.setIsCheck(1);
sampleMapper.updateById(sample);
}
}
//如果是保存并完成按钮，检测委托单中其他样品是否都是保存冰完成状态，如果是，委托单为检测完成状态
List<Sample> sampleNoCheckList = sampleMapper.getNoCheckList(entrust.getId());
if (sampleNoCheckList == null || sampleNoCheckList.size() == 0) {
entrust.setStatus(8);
}
entrustMapper.updateById(entrust);
logsService.saveLog(SysLogs.ObjType.ENTRUST_LOG, entrust.getId(), "数据校核", null);
return BaseResponse.okMsg("数据校核完成");
}*/
@Override
public BaseResponse<IPage<EntrustVo>> getReportPage(PageQuery pageQuery, String startDate, String endDate, Integer clientId, String projectName, String projectCode) {
......
cement-business/src/main/java/cn/wise/sc/cement/business/service/impl/WeiXinService.java
View file @ e5922508
......@@ -287,7 +287,7 @@ public class WeiXinService {
//1.2必需
message.setMsgtype("text");
message.setAgentid(agentId);
message.setAgentid(agentIdPC);
Text text=new Text();
text.setContent(content);
......@@ -295,7 +295,7 @@ public class WeiXinService {
//2.获取access_token:根据企业id和通讯录密钥获取access_token,并拼接请求url
// String accessToken= WeiXinUtil.getAccessToken(corpid, WeiXinParamesUtil.agentSecret).getToken();
String accessToken = getAccessToken();
String accessToken = getPCAccessToken();
System.out.println("accessToken:"+accessToken);
//3.发送消息：调用业务类，发送消息
......
cement-business/src/main/java/cn/wise/sc/cement/business/util/ObjUtils.java
View file @ e5922508
package cn.wise.sc.cement.business.util;
import cn.hutool.core.net.URLEncoder;
import cn.hutool.core.util.StrUtil;
import cn.hutool.core.util.URLUtil;
import cn.wise.sc.cement.business.service.impl.KeyValueMap;
import com.alibaba.fastjson.JSON;
import java.util.ArrayList;
......
cement-business/src/main/resources/application.yml
View file @ e5922508
server:
port: 7007
#-Dspring.config.location=D:\idea_workspases\tianjin-cement\cement-business\src\main\resources\application.yml
spring:
application: tianjin-cement
profiles:
......@@ -57,8 +58,8 @@ weixin:
agentIdPC: 1000003
agentSecret: gFa_7XvXtCaoeAYERzjRwwz_OTJkJfgBb8weOKjmI3o
agentSecretPC: itCLYcwl9ggA9VfZam_iz96Ikp9StDFfVr4Adb0yY7A
backUrl: https%3a%2f%2fccdcmtl.sinoma-tianjin.com%2flab-system
systemUrl: '<a href="https://open.weixin.qq.com/connect/oauth2/authorize?appid=ww348f91b2573c1867&redirect_uri=https%3a%2f%2fccdcmtl.sinoma-tianjin.com%2flab-system%2f&response_type=code&scope=snsapi_base&state=#wechat_redirect">物化检测流程</a>,'
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>,'
......
config/application.yml
View file @ e5922508
......@@ -42,21 +42,22 @@ mybatis-plus:
mapper-locations: classpath:/cn/wise/sc/cement/business/mapper/xml/*Mapper.xml
#天津
weixin:
corpId: ww348f91b2573c1867
agentId: 1000002
agentIdPC: 1000003
agentSecret: gFa_7XvXtCaoeAYERzjRwwz_OTJkJfgBb8weOKjmI3o
agentSecretPC: itCLYcwl9ggA9VfZam_iz96Ikp9StDFfVr4Adb0yY7A
backUrl: https%3a%2f%2fccdcmtl.sinoma-tianjin.com%2flab-system
systemUrl: <a href=\"https://open.weixin.qq.com/connect/oauth2/authorize?appid="ww348f91b2573c1867"&redirect_uri="https%3a%2f%2fccdcmtl.sinoma-tianjin.com%2flab-system"%2f&response_type=code&scope=snsapi_base&state=#wechat_redirect\">物化检测流程</a>,
#邦业
#weixin:
# corpId: ww348f91b2573c1867
# agentId: 1000004
# agentIdPC: 1000005
# agentSecret: flISLojPiE1_ieO9bPgyZ4g_4O-Rr-FKzs7e7p3HEtA
# agentSecretPC: ABagJNftdn1uOYsDLrhlCIM8jZdcTgEA9DyX6kn_-hY
# backUrl: https%3a%2f%2flab.wisenergy.cn%2flab-bangye
# agentId: 1000002
# agentIdPC: 1000003
# agentSecret: gFa_7XvXtCaoeAYERzjRwwz_OTJkJfgBb8weOKjmI3o
# agentSecretPC: itCLYcwl9ggA9VfZam_iz96Ikp9StDFfVr4Adb0yY7A
# backUrl: https%3a%2f%2fccdcmtl.sinoma-tianjin.com%2flab-system
# systemUrl: <a href=\"https://open.weixin.qq.com/connect/oauth2/authorize?appid="ww348f91b2573c1867"&redirect_uri="https%3a%2f%2fccdcmtl.sinoma-tianjin.com%2flab-system"%2f&response_type=code&scope=snsapi_base&state=#wechat_redirect\">物化检测流程</a>,
#邦业
weixin:
corpId: ww348f91b2573c1867
agentId: 1000004
agentIdPC: 1000005
agentSecret: flISLojPiE1_ieO9bPgyZ4g_4O-Rr-FKzs7e7p3HEtA
agentSecretPC: ABagJNftdn1uOYsDLrhlCIM8jZdcTgEA9DyX6kn_-hY
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="https%3a%2f%2flab.wisenergy.cn%2flab-bangye"%2f&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