代码提交

liusheng

2025-05-09 6e34bc4a364b68ab0e62159eecc61bb6b0bf8201

代码提交

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

@@ -382,7 +382,7 @@
                                log.error("---------丽水短信发送结果：{}-------", dxCode);
                                ObjectMapper objectMapper = new ObjectMapper();
                                Map<String, Object> textParam = objectMapper.readValue(dxCode, Map.class);
                                String code = textParam.get("code").toString();
                                String code = textParam.get("Code").toString();
                                if (code.equals("0")) {
                                    s = "true";
                                } else {
@@ -718,7 +718,7 @@
        YeWuXX.put("DuanXinXX", DuanXinXX);

        map.put("XiaoXiTou", headerMap);
        map.put("DuanXinXX", DuanXinXX);
        map.put("YeWuXX", YeWuXX);

        String body = new Gson().toJson(map);


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

@@ -25,9 +25,9 @@

        #  公司云
#        url: jdbc:mysql://116.62.18.175:6002/smartor_lisui?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
      #        username: hxsoft
      #        password: Hxerp2000
      #        driverClassName: com.mysql.cj.jdbc.Driver
#        username: hxsoft
#        password: Hxerp2000
#        driverClassName: com.mysql.cj.jdbc.Driver

      # 从库数据源
      slave:

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

@@ -501,7 +501,7 @@
                                    log.error("---------丽水短信发送结果：{}-------", dxCode);
                                    ObjectMapper objectMapper = new ObjectMapper();
                                    Map<String, Object> textParam = objectMapper.readValue(dxCode, Map.class);
                                    String code = textParam.get("code").toString();
                                    String code = textParam.get("Code").toString();
                                    if (code.equals("0")) {
                                        isSuccess = "true";
                                    }
@@ -858,7 +858,7 @@
        YeWuXX.put("DuanXinXX", DuanXinXX);

        map.put("XiaoXiTou", headerMap);
        map.put("DuanXinXX", DuanXinXX);
        map.put("YeWuXX", YeWuXX);

        String body = new Gson().toJson(map);


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

@@ -367,6 +367,8 @@
        if (ObjectUtils.isNotEmpty(serviceSubtask) && serviceSubtask.getUpid() != null) {
            Map<String, Object> scriptInfoByCondition2 = serviceTaskService.getScriptInfoByCondition(serviceSubTaskQueryReq.getTaskid(), serviceSubTaskQueryReq.getPatid(), serviceSubTaskQueryReq.getIsFinish(), serviceSubTaskQueryReq.getPatfrom());
            Map<String, Object> map1 = getMap(scriptInfoByCondition2, Long.valueOf(serviceSubtask.getUpid()), serviceSubTaskQueryReq.getPatid());
            map.put("upScriptResult", null);
            map.put("upTaskName", null);
            if (!map1.isEmpty()) {
                map.put("upScriptResult", map1.get("scriptResult"));
                map.put("upTaskName", map1.get("taskName"));