删除配置信息

liusheng

4 天以前 193807b4c32ba9517e7ba060983cb3f32851d09d

删除配置信息

 ruoyi-admin/src/main/java/com/ruoyi/web/component/RedisMqReceiver.java

@@ -96,9 +96,6 @@
    @Value("${xhsmsPath}")
    private String xhsmsPath;

    @Value("${visitHosp}")
    private Integer visitHosp;

    @Value("${server.port}")
    private String port;

@@ -299,9 +296,9 @@
                        iServiceOutPathService.updateServiceOutPath(serviceOutPath);
                        sendMagParam.setPhone(serviceSubtask.getPhone());
                        sendMagParam.setUrl(ip + ":" + req_path + "/sf?p=" + format);
                        if (visitHosp == 2) {
                        if (active.equals("ls") || active.equals("sltd")) {
                            sendMagParam.setContent("您好，邀请您填写出院随访调查表，请点击" + sendMagParam.getUrl() + "查看。感谢您配合！");
                        } else if (visitHosp == 1) {
                        } else if (active.equals("xh")) {
                            sendMagParam.setContent("【新华医院】您好，邀请您填写出院随访调查表，请点击" + sendMagParam.getUrl() + "填写。感谢您配合！");
                        }

@@ -325,12 +322,12 @@
                        //如果type是语音随访的话（说明补偿发送方式中有电话随访的方式，这里的外链就地址只能用/sf）
                        if (serviceSubtask.getType().equals("1"))
                            sendMagParam.setUrl(ip + ":" + req_path + "/sf?p=" + format);
                        if (visitHosp == 2) {
                        if (active.equals("ls") || active.equals("ssltd")) {
                            sendMagParam.setContent("您好，邀请您填写出院调查表，请点击" + sendMagParam.getUrl() + "查看。感谢您配合！");
                        } else if (visitHosp == 1) {
                        } else if (active.equals("xh")) {
                            sendMagParam.setContent("【新华医院】您好，邀请您填写出院调查表，请点击" + sendMagParam.getUrl() + "填写。感谢您配合！");
                        } else if (visitHosp == 4) {
                            sendMagParam.setContent("【省立同德】您好，邀请您填写出院调查表，请点击" + sendMagParam.getUrl() + "填写。感谢您配合！");
                        } else if (active.equals("druid")) {
                            sendMagParam.setContent("您好，邀请您填写出院调查表，请点击" + sendMagParam.getUrl() + "填写。感谢您配合！");
                        }
                    } else if (type == 3) {
                        //宣教
@@ -350,12 +347,10 @@
                        if (heLibrary.getHetype().equals("1")) {
                            sendMagParam.setPhone(serviceSubtask.getPhone());
                            sendMagParam.setUrl(ip + ":" + req_path + "/xj?p=" + format);
                            if (visitHosp == 2) {
                            if (active.equals("ls") || active.equals("sltd")) {
                                sendMagParam.setContent("您好，邀请您填写出院宣教调查表，请点击" + sendMagParam.getUrl() + "查看。感谢您配合！");
                            } else if (visitHosp == 1) {
                            } else if (active.equals("xh")) {
                                sendMagParam.setContent("【新华医院】您好，邀请您填写出院宣教调查表，请点击" + sendMagParam.getUrl() + "查看。感谢您配合！");
                            }else if (visitHosp == 4) {
                                sendMagParam.setContent("【省立同德】您好，邀请您填写出院宣教调查表，请点击" + sendMagParam.getUrl() + "查看。感谢您配合！");
                            }
                        } else {
                            //通知
@@ -366,13 +361,13 @@

                    //短信还需要模板
                    String s = null;
                    if (visitHosp == 1) {
                    if (active.equals("xh")) {
                        //新华的短信发送方式
                        Map<String, String> req = new HashMap<>();
                        req.put("phone", sendMagParam.getPhone());
                        req.put("content", sendMagParam.getContent());
                        s = HttpUtil.postJsonRequest(xhsmsPath, new Gson().toJson(req));
                    } else if (visitHosp == 2) {
                    } else if (active.equals("ls")) {
                        String url = configService.selectConfigByKey("token.360", serviceSubtask.getOrgid());
                        log.info("-------00token.360的URL为：{}", url);
                        //丽水的短信发送方式
@@ -400,7 +395,7 @@
                            setFailPreachForm(serviceSubtask, sendPreachform, "短信发送失败", "5");
                            throw new BaseException("短信发送失败");
                        }
                    } else if (visitHosp == 4) {
                    } else if (active.equals("sltd")) {
                        //省立同德的短信发送方式
                        JSONObject data = MessageSend.sendMsg(sendMagParam.getContent(), "2", sendMagParam.getPhone(), LocalDateTime.now().format(DateTimeFormatter.ofPattern("yyyyMMddHHmmss")));
                        String code = data.get("code").toString();

 ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/PatMedInhospController.java

@@ -42,9 +42,6 @@
    @Autowired
    private IPatMedOuthospService iPatMedOuthospService;

    @Value("${visitHosp}")
    private Integer visitHosp;


    /**
     * æŸ¥è¯¢æ‚£è€…住院记录列表

 ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/tools/BaseSmsaccountController.java

@@ -40,9 +40,6 @@
    @Autowired
    private IBaseSmsaccountService baseSmsaccountService;

    @Value("${visitHosp}")
    private Integer visitHosp;

    @Value("${xhsmsPath}")
    private String xhsmsPath;

@@ -52,11 +49,14 @@
    @Value("${xhsmsPwd}")
    private String xhsmsPwd;

    @Value("${spring.profiles.active}")
    private String active;

    /**
     * æŸ¥è¯¢çŸ­ä¿¡è´¦å·åˆ—表
     */
    //@PreAuthorize("@ss.hasPermi('smartor:smsaccount:list')")
   @PostMapping("/list")
    @PostMapping("/list")
    public TableDataInfo list(@RequestBody BaseSmsaccount baseSmsaccount) {
        startPage();
        List<BaseSmsaccount> list = baseSmsaccountService.selectBaseSmsaccountList(baseSmsaccount);
@@ -122,17 +122,17 @@
    @PostMapping("/sendMsg")
    @RepeatSubmit
    public AjaxResult sendMsg(@RequestBody BaseSmsRequest baseSmsRequest) {
        String sendMsg="";
        if(visitHosp.equals("3")) {
            try{
        String sendMsg = "";
        if (active.equals("hzszlyy")) {
            try {
                JSONObject jsTemp = JSON.parseObject(baseSmsRequest.getTemplateParam());
                String content=jsTemp.getString("name");
                sendMsg= smsUtils.sendSms(xhsmsPath,xhsmsAccount,xhsmsPwd,baseSmsRequest.getPhoneNumber(),content);
                String content = jsTemp.getString("name");
                sendMsg = smsUtils.sendSms(xhsmsPath, xhsmsAccount, xhsmsPwd, baseSmsRequest.getPhoneNumber(), content);
            } catch (Exception ex) {
                return AjaxResult.error(ex.getMessage()) ;
                return AjaxResult.error(ex.getMessage());
            }
            return AjaxResult.success(sendMsg);
        }else {
        } else {
            if (baseSmsaccountService.sendMsg(baseSmsRequest) == null) {
                return error();
            }

 ruoyi-admin/src/main/resources/application-druid.yml

@@ -266,8 +266,6 @@
#admin管理员userId
isAdmin: 1,2,3,4,5,6,7,8,9,10,11,12,13

#随访医院：1新华   2丽水
visitHosp: 2

isEncryp:


 ruoyi-admin/src/main/resources/application-hn.yml

@@ -254,9 +254,6 @@
#admin管理员userId
isAdmin: 1,2,3,4,5,6,7,8,9,10,11,12,13

#随访医院：1新华   2丽水    3省立同德
visitHosp: 0

#处理投诉建议的部门编码
dealDeptCode:


 ruoyi-admin/src/main/resources/application-hzszlyy.yml

@@ -213,5 +213,3 @@
#admin管理员userId
isAdmin: 1,2,3,4,5,6,7,8,9,10,11,12,13

#随访医院：1新华   2丽水 3 æ­å·žå¸‚一医院吴山院区
visitHosp: 3

 ruoyi-admin/src/main/resources/application-ls.yml

@@ -243,9 +243,6 @@
#admin管理员userId
isAdmin: 1,2,3,4,5,6,7,8,9,10,11,12,13

#随访医院：1新华   2丽水    4省立同德
visitHosp: 2

#处理投诉建议的部门编码
dealDeptCode:


 ruoyi-admin/src/main/resources/application-sltd.yml

@@ -231,9 +231,6 @@
#admin管理员userId
isAdmin: 1,2,3,4,5,6,7,8,9,10,11,12,13

#随访医院：1新华   2丽水   3市一   4省立同德
visitHosp: 4

#用户默认密码
userPwd: sltd@0230


 ruoyi-admin/src/main/resources/application-xh.yml

@@ -229,8 +229,6 @@
#admin管理员userId
isAdmin: 1,2,3,4,5,6,7,8,9,10,11,12,13

#随访医院：1新华   2丽水    3省立同德
visitHosp: 1

#处理投诉建议的部门编码
dealDeptCode:

 ruoyi-admin/src/main/resources/application-ywry.yml

@@ -215,8 +215,6 @@
#admin管理员userId
isAdmin: 1,2,3,4,5,6,7,8,9,10,11,12,13

#随访医院：1新华   2丽水
visitHosp: 2

#处理投诉建议的部门编码
dealDeptCode:

 ruoyi-admin/src/main/resources/application.yml

@@ -74,7 +74,7 @@
    # å›½é™…化资源文件路径
    basename: i18n/messages
  profiles:
    active: ls
    active: druid
  # æ–‡ä»¶ä¸Šä¼ 
  servlet:
    multipart:

 ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/RyTask.java

@@ -5,7 +5,7 @@
import com.fasterxml.jackson.databind.ObjectMapper;
import com.google.gson.Gson;
import com.ruoyi.common.core.redis.RedisCache;
import com.ruoyi.common.dx2.MessageSend;
import com.ruoyi.common.dx.MessageSend;
import com.ruoyi.common.enums.MsgLSEnum;
import com.ruoyi.common.enums.ServiceFromEnum;
import com.ruoyi.common.enums.WxGZHEnum;
@@ -111,9 +111,6 @@

    @Value("${req_path}")
    private String req_path;

    @Value("${visitHosp}")
    private Integer visitHosp;

    @Autowired
    private ServiceTaskMapper serviceTaskMapper;
@@ -339,7 +336,7 @@
            //出院表
            iPatMedInhospService.dealOutHospInfo();
            //门诊表
            if (visitHosp != 1) {
            if (active.equals("xh")) {
                iPatMedOuthospService.dealOutpatientInfo();
            }
        }
@@ -588,12 +585,12 @@
                        }
                    }
                    String isSuccess = null;
                    if (visitHosp == 1) {
                    if (active.equals("xh")) {
                        Map<String, String> req = new HashMap<>();
                        req.put("phone", sendMagParam.getPhone());
                        req.put("content", sendMagParam.getContent());
                        isSuccess = HttpUtil.postJsonRequest(xhsmsPath, new Gson().toJson(req));
                    } else if (visitHosp == 2) {
                    } else if (active.equals("ls")) {
                        String url = configService.selectConfigByKey("token.360", serviceSubtask.getOrgid());
                        //丽水的短信发送方式
                        Map<String, String> map = MsgLSEnum.getAddressByCode(serviceSubtask.getOrgid());
@@ -611,14 +608,14 @@
                        if (code.equals("0")) {
                            isSuccess = "true";
                        }
                    } else if (visitHosp == 4) {
                    } else if (active.equals("sltd")) {
                        //省立同德的短信发送方式
                        JSONObject data = MessageSend.sendMsg(sendMagParam.getContent(), "2", sendMagParam.getPhone(), LocalDateTime.now().format(DateTimeFormatter.ofPattern("yyyyMMddHHmmss")));
                        String code = data.get("code").toString();
                        if (StringUtils.isNotEmpty(code) && code.equals("00000")) {
                            isSuccess = "true";
                        }
                    } else if (visitHosp == 3) {//市一医院
                    } else if (active.equals("hzszlyy")) {//市一医院
                        String content = sendMagParam.getContent().replace("【新华医院】", "");
                        String result = smsUtils.sendSms(xhsmsPath, xhsmsAccount, xhsmsPwd, sendMagParam.getPhone(), content);
                        //这里需要根据result返回的值去判断，是否成功，然后将值赋值给isSuccess
@@ -679,10 +676,8 @@
                        return;
                    }
                    String wxCode = "";
                    if (visitHosp == 3) {//市一医院
                        String urlTemp = "http://192.200.54.14:5003/sfjk/SendMessage?sfzh=" + serviceSubtask.getSfzh()
                                + "&title=您好，邀请您填写出院调查表，请点击填写。&content=您好，邀请您填写出院调查表，请点击填写。&phone=" + patArchive.getTelcode()
                                + "&url=" + url + "&key=ff76f8904f5f32b5ee1739e8ea46e60g";
                    if (active.equals("hzszlyy")) {//市一医院
                        String urlTemp = "http://192.200.54.14:5003/sfjk/SendMessage?sfzh=" + serviceSubtask.getSfzh() + "&title=您好，邀请您填写出院调查表，请点击填写。&content=您好，邀请您填写出院调查表，请点击填写。&phone=" + patArchive.getTelcode() + "&url=" + url + "&key=ff76f8904f5f32b5ee1739e8ea46e60g";
                        HttpUtils.sendGet(urlTemp);
                    } else {
                        wxCode = getWXCode(serviceSubtask.getSfzh(), url, serviceSubtask.getTaskName(), serviceSubtask.getTaskDesc(), patArchive.getTelcode(), serviceSubtask.getSendname(), patArchive.getPatidHis(), wxqqxx);

 ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/RyTask2.java

ÎļþÒÑɾ³ý

 smartor/src/main/java/com/smartor/service/impl/PatMedInhospServiceImpl.java

@@ -51,8 +51,9 @@
    @Autowired
    private ServiceSubtaskPreachformMapper serviceSubtaskPreachformMapper;

    @Value("${visitHosp}")
    private Integer visitHosp;
    @Value("${spring.profiles.active}")
    private String active;


    /**
     * æŸ¥è¯¢æ‚£è€…住院记录
@@ -260,8 +261,7 @@
        }

        //根据患者所在病区，获取该病区的长期任务,新华医院可以先不用根据病区和疾病来做
        if (visitHosp != 1) {

        if (active.equals("xh")) {
            PatMedInhosp pmbq = new PatMedInhosp();
            //获取需要出院部门随访，未处理的数据
            pmbq.setWardcheckFlag("0");