ruoyi-admin/src/main/java/com/ruoyi/web/component/RedisMqReceiver.java
@@ -305,6 +305,7 @@ serviceOutPath.setParam2(patid); serviceOutPath.setParam6(subId); serviceOutPath.setCreateTime(new Date()); serviceOutPath.setOrgid(serviceSubtask.getOrgid()); iServiceOutPathService.insertServiceOutPath(serviceOutPath); // sendMagParam.setUrl(ip + ":" + req_path + "/followvisit/particty?param1=" + taskId + "¶m2=" + patid + "¶m5=false"); //转成16进制 @@ -337,6 +338,7 @@ // serviceOutPath.setParam3(URLEncoder.encode(ivrTask1.getTaskName(), StandardCharsets.UTF_8.toString())); serviceOutPath.setParam3(ivrTask1.getTaskName()); serviceOutPath.setCreateTime(new Date()); serviceOutPath.setOrgid(serviceSubtask.getOrgid()); iServiceOutPathService.insertServiceOutPath(serviceOutPath); String format = String.format("%03X", serviceOutPath.getId()); serviceOutPath.setRadix(format); @@ -371,6 +373,7 @@ serviceOutPath.setParam6(subId); serviceOutPath.setParam3(ivrTask1.getTaskName()); serviceOutPath.setCreateTime(new Date()); serviceOutPath.setOrgid(serviceSubtask.getOrgid()); iServiceOutPathService.insertServiceOutPath(serviceOutPath); String format = String.format("%03X", serviceOutPath.getId()); serviceOutPath.setRadix(format); @@ -554,6 +557,7 @@ serviceOutPath.setParam1(taskId); serviceOutPath.setParam2(patid); serviceOutPath.setCreateTime(new Date()); serviceOutPath.setOrgid(serviceSubtask.getOrgid()); iServiceOutPathService.insertServiceOutPath(serviceOutPath); String format = String.format("%03X", serviceOutPath.getId()); serviceOutPath.setRadix(format); @@ -567,6 +571,7 @@ serviceOutPath.setParam2(patid); serviceOutPath.setParam3(ivrTask1.getTaskName()); serviceOutPath.setCreateTime(new Date()); serviceOutPath.setOrgid(serviceSubtask.getOrgid()); iServiceOutPathService.insertServiceOutPath(serviceOutPath); String format = String.format("%03X", serviceOutPath.getId()); serviceOutPath.setRadix(format); @@ -583,6 +588,7 @@ serviceOutPath.setParam2(patid); serviceOutPath.setParam3(ivrTask1.getTaskName()); serviceOutPath.setCreateTime(new Date()); serviceOutPath.setOrgid(serviceSubtask.getOrgid()); iServiceOutPathService.insertServiceOutPath(serviceOutPath); String format = String.format("%03X", serviceOutPath.getId()); serviceOutPath.setRadix(format); ruoyi-admin/src/main/java/com/ruoyi/web/controller/common/SmsController.java
@@ -115,6 +115,7 @@ serviceOutPath.setParam6(subId); serviceOutPath.setRadix(format); serviceOutPath.setCreateTime(new Date()); serviceOutPath.setOrgid(vo.getOrgid()); iServiceOutPathService.insertServiceOutPath(serviceOutPath); String url = ip + ":" + req_path + "/wt?p=" + format; content = "您好，邀请您填写出院调查表，请点击" + url + "填写。感谢您配合！"; @@ -179,6 +180,7 @@ serviceOutPath.setParam6(subId); serviceOutPath.setRadix(format); serviceOutPath.setCreateTime(new Date()); serviceOutPath.setOrgid(vo.getOrgid()); iServiceOutPathService.insertServiceOutPath(serviceOutPath); String url = ip + ":" + req_path + "/wt?p=" + format; sendMsg = smsUtils.sendChat(url, vo.getPhone(), vo.getIdCard()); ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/ServiceOutPathController.java
@@ -7,16 +7,22 @@ import com.ruoyi.common.core.domain.entity.SysUser; import com.ruoyi.common.core.page.TableDataInfo; import com.ruoyi.common.enums.BusinessType; import com.ruoyi.common.utils.RSAPublicKeyExample; import com.ruoyi.common.utils.StringUtils; import com.ruoyi.common.utils.poi.ExcelUtil; import com.smartor.domain.BaseOrganization; import com.smartor.domain.ServiceOutPath; import com.smartor.domain.ServiceTask; import com.smartor.service.IBaseOrganizationService; import com.smartor.service.IServiceOutPathService; import com.smartor.service.IServiceTaskService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.lang3.ObjectUtils; import org.apache.ibatis.annotations.Param; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; import org.springframework.web.bind.annotation.*; import javax.servlet.http.HttpServletResponse; @@ -35,7 +41,16 @@ private IServiceOutPathService serviceOutPathService; @Autowired private IServiceTaskService serviceTaskService; @Autowired private IBaseOrganizationService baseOrganizationService; @Autowired private RSAPublicKeyExample rsaPublicKeyExample; @Value("${pri_key}") private String pri_key; /** * 查询主键列表 @@ -57,15 +72,6 @@ */ @PostMapping("/getInfoByParam") public AjaxResult param(@Param("param") String param) { SysUser user = getLoginUser().getUser(); String orgname = ""; String orgid = user.getOrgid(); if(orgid != null && !"".equals(orgid)){ BaseOrganization baseOrganization = new BaseOrganization(); List<BaseOrganization> orgids = baseOrganizationService.selectBaseOrganizationList(baseOrganization); orgname = orgids.get(0).getOrganizationName(); } ServiceOutPath serviceOutPath = new ServiceOutPath(); serviceOutPath.setRadix(param); List<ServiceOutPath> list = serviceOutPathService.selectServiceOutPathList(serviceOutPath); @@ -73,8 +79,17 @@ ServiceOutPath serviceOutPath1 = list.get(0); serviceOutPath1.setId(null); serviceOutPath1.setRadix(null); serviceOutPath1.setOrgid(orgid); serviceOutPath1.setOrgname(orgname); if(StringUtils.isNotEmpty(serviceOutPath1.getOrgid())){ String orgId = serviceOutPath1.getOrgid(); BaseOrganization baseOrganization = new BaseOrganization(); baseOrganization.setOrgid(orgId); List<BaseOrganization> orgs = baseOrganizationService.selectBaseOrganizationList(baseOrganization); if(CollectionUtils.isNotEmpty(orgs)){ String orgname = orgs.get(0).getOrganizationName(); serviceOutPath1.setOrgid(orgId); serviceOutPath1.setOrgname(orgname); } } return success(serviceOutPath1); } return success(null); ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/RyTask.java
@@ -910,6 +910,7 @@ serviceOutPath.setParam3(ivrTask1.getTaskName()); serviceOutPath.setParam6(subId); serviceOutPath.setCreateTime(new Date()); serviceOutPath.setOrgid(serviceSubtask.getOrgid()); iServiceOutPathService.insertServiceOutPath(serviceOutPath); String format = String.format("%03X", serviceOutPath.getId()); serviceOutPath.setRadix(format); smartor/src/main/java/com/smartor/domain/smsVO.java
@@ -28,4 +28,7 @@ @ApiModelProperty(value = "身份证号") private String idCard; @ApiModelProperty(value = "机构号") private String orgid; } smartor/src/main/java/com/smartor/service/impl/ServiceSubtaskServiceImpl.java
@@ -3633,6 +3633,7 @@ serviceOutPath.setParam2(patid); serviceOutPath.setCreateTime(new Date()); serviceOutPath.setParam6(subId); serviceOutPath.setOrgid(serviceSubtask.getOrgid()); iServiceOutPathService.insertServiceOutPath(serviceOutPath); //转成16进制 String format = String.format("%03X", serviceOutPath.getId()); smartor/src/main/resources/mapper/smartor/ServiceOutPathMapper.xml
@@ -40,7 +40,6 @@ <include refid="selectServiceOutPathVo"/> where 1=1 and del_flag = 0 and orgid is null <if test="param1 != null "> and param1 = #{param1} </if>
