删除积木报告和部分依赖

pom.xml

@@ -37,24 +37,12 @@
             <artifactId>mybatis-plus-boot-starter</artifactId>
             <version>3.4.2</version>
         </dependency>
-        <!--肖蟾 代码生成器-->
-        <dependency>
-            <groupId>com.baomidou</groupId>
-            <artifactId>mybatis-plus-generator</artifactId>
-            <version>3.4.1</version>
-        </dependency>
         <!-- 数据库中的注释-->
         <dependency>
             <groupId>io.springfox</groupId>
             <artifactId>springfox-swagger2</artifactId>
             <version>2.10.5</version>
         </dependency>
-        <!--肖蟾 模板引擎-->
-        <dependency>
-            <groupId>org.apache.velocity</groupId>
-            <artifactId>velocity-engine-core</artifactId>
-            <version>2.3</version>
-        </dependency>
         <!--多数据源-->
         <dependency>
             <groupId>com.baomidou</groupId>
@@ -71,7 +59,6 @@
             <scope>runtime</scope>
             <optional>true</optional>
         </dependency>
-
         <dependency>
             <groupId>com.microsoft.sqlserver</groupId>
             <artifactId>mssql-jdbc</artifactId>
@@ -93,12 +80,6 @@
             <artifactId>spring-boot-starter-test</artifactId>
             <scope>test</scope>
         </dependency>
-        <!--PostgreSQL数据库 创智的中台数据-->
-        <dependency>
-            <groupId>org.postgresql</groupId>
-            <artifactId>postgresql</artifactId>
-            <version>42.2.26</version>
-        </dependency>
         <dependency>
             <groupId>com.auth0</groupId>
             <artifactId>java-jwt</artifactId>
@@ -180,6 +161,12 @@
             <artifactId>websdk-java-speech</artifactId>
             <version>2.0.1</version>
         </dependency>
+        <dependency>
+            <groupId>org.bouncycastle</groupId>
+            <artifactId>bcprov-jdk15on</artifactId>
+            <version>1.70</version>
+        </dependency>
+
     </dependencies>
     <build>
         <plugins>

src/main/java/thyyxxk/webserver/controller/jimubaobiao/JiMuBaoBiaoController.java

@@ -1,39 +0,0 @@
-package thyyxxk.webserver.controller.jimubaobiao;
-
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
-import thyyxxk.webserver.entity.ResultVo;
-import thyyxxk.webserver.entity.querydata.BaoBiaoChaXun;
-import thyyxxk.webserver.service.jimubaobiao.JiMuBaoBiaoService;
-
-import java.util.List;
-import java.util.Map;
-
-/**
- * <p>
- * 描述： 积木报表
- * </p>
- *
- * @author xc
- * @date 2021-09-02 10:20
- */
-@RequestMapping("/jiMuBaoBiao")
-@RestController
-public class JiMuBaoBiaoController {
-
-    private final JiMuBaoBiaoService service;
-
-    public JiMuBaoBiaoController(JiMuBaoBiaoService service) {
-        this.service = service;
-    }
-
-    @GetMapping("/zhuYuanShiJianChao")
-    public ResultVo<Map<String, List<BaoBiaoChaXun>>> zhuYuanShiJianChao(@RequestParam("startTime") String startTime,
-                                                                         @RequestParam("endTime") String endTime) {
-        return service.zhuYuanShiJianChao(startTime, endTime);
-    }
-
-
-}

src/main/java/thyyxxk/webserver/dao/his/jimubaobiao/JiMuBaoBiaoDao.java

@@ -1,63 +0,0 @@
-package thyyxxk.webserver.dao.his.jimubaobiao;
-
-import org.apache.ibatis.annotations.Mapper;
-import org.apache.ibatis.annotations.Param;
-import org.apache.ibatis.annotations.Select;
-import thyyxxk.webserver.entity.querydata.BaoBiaoChaXun;
-
-import java.math.BigDecimal;
-import java.sql.Timestamp;
-import java.util.List;
-
-/**
- * <p>
- * 描述： 积木报表
- * </p>
- *
- * @author xc
- * @date 2021-09-02 10:22
- */
-@Mapper
-public interface JiMuBaoBiaoDao {
-
-
-    /**
-     * 查询患者住院 是否超 30 天
-     *
-     * @param startTime 开始时间
-     * @param endTime   结束时间
-     * @return list
-     */
-    @Select("select '超30天' name,count(*) value,'天' unit " +
-            "from zy_inactpatient where admiss_date >= #{startTime} and admiss_date <= #{endTime} " +
-            "and date_part('day',  cast(dis_date as TIMESTAMP) - cast(admiss_date as TIMESTAMP)) > 30 " +
-            "union all " +
-            "select '未超30天' name,count(*) value,'天' unit from zy_inactpatient where admiss_date >= #{startTime} and admiss_date <= #{endTime} " +
-            "and date_part('day',  cast(dis_date as TIMESTAMP) - cast(admiss_date as TIMESTAMP)) < 30;")
-    List<BaoBiaoChaXun> huanZheZhuYuanChao(@Param("startTime") Timestamp startTime,
-                                           @Param("endTime") Timestamp endTime);
-
-    /**
-     * 查询患者入院间隔
-     *
-     * @param startTime 开始时间
-     * @param endTime   结束时间
-     * @return list
-     */
-    @Select("select date_part('day',cast(dis_date as TIMESTAMP) - cast(admiss_date as TIMESTAMP)) tian_shu from zy_inactpatient " +
-            "where admiss_date >= #{startTime} and admiss_date <= #{endTime}")
-    List<BigDecimal> huanZheRuYuanJianGe(@Param("startTime") Timestamp startTime,
-                                         @Param("endTime") Timestamp endTime);
-
-    /**
-     * 获取患者人数
-     *
-     * @param startTime 时间时间
-     * @param endTime   结束时间
-     * @return list
-     */
-    @Select("select count(*) count from zy_inactpatient where admiss_date >= #{startTime} and admiss_date <= #{endTime}")
-    BigDecimal huanZheRenShu(@Param("startTime") Timestamp startTime,
-                             @Param("endTime") Timestamp endTime);
-
-}

src/main/java/thyyxxk/webserver/service/jimubaobiao/JiMuBaoBiaoService.java

@@ -1,73 +0,0 @@
-package thyyxxk.webserver.service.jimubaobiao;
-
-import com.baomidou.dynamic.datasource.annotation.DS;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.stereotype.Service;
-import thyyxxk.webserver.config.exception.ExceptionEnum;
-import thyyxxk.webserver.dao.his.jimubaobiao.JiMuBaoBiaoDao;
-import thyyxxk.webserver.entity.ResultVo;
-import thyyxxk.webserver.entity.querydata.BaoBiaoChaXun;
-import thyyxxk.webserver.utils.ResultVoUtil;
-import thyyxxk.webserver.utils.StringUtil;
-
-import java.math.BigDecimal;
-import java.math.RoundingMode;
-import java.sql.Timestamp;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-/**
- * <p>
- * 描述： 积木报表
- * </p>
- *
- * @author xc
- * @date 2021-09-02 10:21
- */
-@Service
-@Slf4j
-@DS("jimu")
-public class JiMuBaoBiaoService {
-
-    private final JiMuBaoBiaoDao dao;
-
-    public JiMuBaoBiaoService(JiMuBaoBiaoDao dao) {
-        this.dao = dao;
-    }
-
-
-    /**
-     * 住院超 30 天
-     *
-     * @return 返回积木报表链接
-     */
-    public ResultVo<Map<String, List<BaoBiaoChaXun>>> zhuYuanShiJianChao(String startTime, String endTime) {
-        if (StringUtil.isBlank(startTime) || StringUtil.isBlank(endTime)) {
-            return ResultVoUtil.fail(ExceptionEnum.NULL_POINTER);
-        }
-        Map<String, List<BaoBiaoChaXun>> map = new HashMap<>();
-        map.put("huanZheChao30", dao.huanZheZhuYuanChao(Timestamp.valueOf(startTime), Timestamp.valueOf(endTime)));
-
-        List<BigDecimal> huanZheZhuYuanTianShu = dao.huanZheRuYuanJianGe(Timestamp.valueOf(startTime), Timestamp.valueOf(endTime));
-        // 患者的全部住院天数
-        BigDecimal sum = new BigDecimal(0);
-        for (BigDecimal integer : huanZheZhuYuanTianShu) {
-            sum = sum.add(integer);
-        }
-        // 患者总人数 totalNumberOfPatients
-        BigDecimal huanZheRenShu = dao.huanZheRenShu(Timestamp.valueOf(startTime), Timestamp.valueOf(endTime));
-        // 患者的平均住院天数
-        BigDecimal pingJunZhuYuanTianShu = sum.divide(huanZheRenShu, 2, RoundingMode.HALF_UP);
-        List<BaoBiaoChaXun> list = new ArrayList<>();
-        list.add(new BaoBiaoChaXun("总住院天数", sum, "天"));
-        list.add(new BaoBiaoChaXun("患者的总人数", huanZheRenShu, "人"));
-        list.add(new BaoBiaoChaXun("平均住院天数", pingJunZhuYuanTianShu, "天"));
-        map.put("pingJunZhuYuan", list);
-
-        log.info("开始时间：{}，结束时间：{}", startTime, endTime);
-        return ResultVoUtil.success(map);
-    }
-
-}

src/main/java/thyyxxk/webserver/service/medicalinsurance/AutoUploadBillService.java

@@ -5,12 +5,12 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import org.apache.commons.lang3.StringUtils;
 import org.springframework.scheduling.annotation.Async;
 import org.springframework.stereotype.Service;
 import thyyxxk.webserver.dao.his.medicalinsurance.AutoUploadBillDao;
 import thyyxxk.webserver.entity.querydata.AutoUploadBill;
 import thyyxxk.webserver.utils.ListUtil;
+import thyyxxk.webserver.utils.StringUtil;
 
 import java.util.Date;
 import java.util.List;
@@ -71,7 +71,7 @@ public class AutoUploadBillService extends ServiceImpl<AutoUploadBillDao,AutoUpl
 
     public QueryWrapper<AutoUploadBill> getAutoUploadBillQueryWrapper(AutoUploadBill autoUploadBill) {
         QueryWrapper<AutoUploadBill> query = new QueryWrapper<>();
-        query.eq(StringUtils.isNotBlank(autoUploadBill.getPatNo()), "t1.pat_no", autoUploadBill.getPatNo());
+        query.eq(StringUtil.notBlank(autoUploadBill.getPatNo()), "t1.pat_no", autoUploadBill.getPatNo());
         //0 查询全部
         query.eq(autoUploadBill.getTypeFlag() !=0, "t1.type_flag", autoUploadBill.getTypeFlag());
         query.eq(autoUploadBill.getTimes() !=null, "t1.times", autoUploadBill.getTimes());
@@ -79,10 +79,10 @@ public class AutoUploadBillService extends ServiceImpl<AutoUploadBillDao,AutoUpl
         query.eq(autoUploadBill.getFlag() != 0, "t1.flag", autoUploadBill.getFlag());
         query.ne("0".equals(autoUploadBill.getZhuYuanFlag()),"t1.ledger_sn","0");
         query.eq("1".equals(autoUploadBill.getZhuYuanFlag()),"t1.ledger_sn","0");
-        query.ge(StringUtils.isNotBlank(autoUploadBill.getUpdateStartTime()), "t1.created_date", autoUploadBill.getUpdateStartTime());
-        query.le(StringUtils.isNotBlank(autoUploadBill.getUpdateEndTime()), "t1.created_date", autoUploadBill.getUpdateEndTime());
-        query.ge(StringUtils.isNotBlank(autoUploadBill.getSetlStartTime()), "t1.setl_time", autoUploadBill.getSetlStartTime());
-        query.le(StringUtils.isNotBlank(autoUploadBill.getSetlEndTime()), "t1.setl_time", autoUploadBill.getSetlEndTime());
+        query.ge(StringUtil.notBlank(autoUploadBill.getUpdateStartTime()), "t1.created_date", autoUploadBill.getUpdateStartTime());
+        query.le(StringUtil.notBlank(autoUploadBill.getUpdateEndTime()), "t1.created_date", autoUploadBill.getUpdateEndTime());
+        query.ge(StringUtil.notBlank(autoUploadBill.getSetlStartTime()), "t1.setl_time", autoUploadBill.getSetlStartTime());
+        query.le(StringUtil.notBlank(autoUploadBill.getSetlEndTime()), "t1.setl_time", autoUploadBill.getSetlEndTime());
         query.in(CollUtil.isNotEmpty(autoUploadBill.getOutDeptList()), "isnull(t2.zk_ward, t2.small_dept)", autoUploadBill.getOutDeptList());
         return query;
     }

src/main/java/thyyxxk/webserver/service/medicalinsurance/TSetlDeptConfService.java

@@ -3,7 +3,6 @@ package thyyxxk.webserver.service.medicalinsurance;
 import cn.hutool.core.collection.CollUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.scheduling.annotation.Async;
 import org.springframework.stereotype.Service;
@@ -11,6 +10,7 @@ import thyyxxk.webserver.dao.his.medicalinsurance.TSetlDeptConfDao;
 import thyyxxk.webserver.entity.querydata.TSetlDeptConf;
 import thyyxxk.webserver.service.wxapi.SendWxInfoService;
 import thyyxxk.webserver.utils.ListUtil;
+import thyyxxk.webserver.utils.StringUtil;
 
 import java.util.List;
 import java.util.stream.Collectors;
@@ -30,7 +30,7 @@ public class TSetlDeptConfService extends ServiceImpl<TSetlDeptConfDao, TSetlDep
 
     public List<TSetlDeptConf> querySetlDeptConfInfo(TSetlDeptConf query) {
         QueryWrapper queryWrapper = new QueryWrapper();
-        queryWrapper.eq(StringUtils.isNotBlank(query.getCode()), "code", query.getCode());
+        queryWrapper.eq(StringUtil.notBlank(query.getCode()), "code", query.getCode());
         queryWrapper.eq(query.getTypeFlag() != null,"type_flag" ,query.getTypeFlag());
         return baseMapper.selectList(queryWrapper);
     }
@@ -49,7 +49,7 @@ public class TSetlDeptConfService extends ServiceImpl<TSetlDeptConfDao, TSetlDep
      **/
     @Async
     public void asynSendAuditMessge(String deptCode,String deptName,String name,String patNo){
-        QueryWrapper<TSetlDeptConf> queryWrapper = new QueryWrapper();
+        QueryWrapper<TSetlDeptConf> queryWrapper = new QueryWrapper<>();
         queryWrapper.eq("dept_code",deptCode);
         queryWrapper.eq("type_flag",1);
         List<TSetlDeptConf> list = baseMapper.selectList(queryWrapper);

src/main/java/thyyxxk/webserver/service/medicalinsurance/TUploadDrgGroupService.java

@@ -4,13 +4,13 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import org.apache.commons.lang3.StringUtils;
 import org.jetbrains.annotations.NotNull;
 import org.springframework.stereotype.Service;
 import thyyxxk.webserver.dao.his.medicalinsurance.TUploadDrgGroupDao;
 import thyyxxk.webserver.entity.HeadInfo;
 import thyyxxk.webserver.entity.querydata.TUploadDrgGroup;
 import thyyxxk.webserver.utils.ExcelUtil;
+import thyyxxk.webserver.utils.StringUtil;
 
 import javax.servlet.http.HttpServletResponse;
 import java.util.List;
@@ -40,11 +40,11 @@ public class TUploadDrgGroupService extends ServiceImpl<TUploadDrgGroupDao, TUpl
     private QueryWrapper<TUploadDrgGroup> gettUploadDrgGroupQueryWrapper(TUploadDrgGroup uploadDrgGroup) {
         QueryWrapper<TUploadDrgGroup> query = new QueryWrapper<>();
         query.eq("1",1);
-        query.eq(StringUtils.isNotBlank(uploadDrgGroup.getPatNo()),"pat_no", uploadDrgGroup.getPatNo());
+        query.eq(StringUtil.notBlank(uploadDrgGroup.getPatNo()),"pat_no", uploadDrgGroup.getPatNo());
         query.eq(uploadDrgGroup.getTimes() !=null,"times", uploadDrgGroup.getTimes());
         query.eq(uploadDrgGroup.getLedgerSn() !=null,"ledger_sn", uploadDrgGroup.getLedgerSn());
-        query.ge(StringUtils.isNotBlank(uploadDrgGroup.getSetlStartTime()), "setl_time", uploadDrgGroup.getSetlStartTime());
-        query.le(StringUtils.isNotBlank(uploadDrgGroup.getSetlEndTime()), "setl_time", uploadDrgGroup.getSetlEndTime());
+        query.ge(StringUtil.notBlank(uploadDrgGroup.getSetlStartTime()), "setl_time", uploadDrgGroup.getSetlStartTime());
+        query.le(StringUtil.notBlank(uploadDrgGroup.getSetlEndTime()), "setl_time", uploadDrgGroup.getSetlEndTime());
         return query;
     }
 

src/main/java/thyyxxk/webserver/service/ybkf/YbCssTjService.java

@@ -1,6 +1,5 @@
 package thyyxxk.webserver.service.ybkf;
 
-import org.apache.commons.lang3.StringUtils;
 import org.apache.poi.ss.usermodel.Cell;
 import org.apache.poi.ss.usermodel.DateUtil;
 import org.apache.poi.ss.usermodel.Row;
@@ -395,7 +394,7 @@ public class YbCssTjService {
         for (YbZyDisDiag item : zdList) {
             String deptCode = item.getDeptCode();
             if(1 == item.getDisDiagNo()){
-                if(StringUtils.isNotBlank(deptCode)){
+                if(StringUtil.notBlank(deptCode)){
                     DeptChargeGroup dept = amp.get(deptCode);
                     if(dept == null){
                         return false;
@@ -958,12 +957,10 @@ public class YbCssTjService {
                 return String.valueOf(cell.getBooleanCellValue());
             case "FORMULA":
                 return cell.getCellFormula();
-            case "BLANK":
-                return "";
             case "ERROR":
                 return String.valueOf(cell.getErrorCellValue());
             default:
-                return StringUtils.EMPTY;
+                return "";
         }
     }
 
@@ -1057,7 +1054,7 @@ public class YbCssTjService {
             String ssmc = String.valueOf(map.get("ssmc"));
             String ssbm = String.valueOf(map.get("ssbm"));
             zdmc = zdmc + "(" + zdbm + ")";
-            if(StringUtils.isNotBlank(ssbm)){
+            if(StringUtil.notBlank(ssbm)){
                 ssmc = ssmc + "(" + ssbm + ")";
             }
             map.put("zdmc", zdmc);

src/main/java/thyyxxk/webserver/utils/AssertUtil.java

@@ -1,7 +1,6 @@
 package thyyxxk.webserver.utils;
 
 import cn.hutool.core.collection.CollUtil;
-import org.apache.commons.lang3.StringUtils;
 import thyyxxk.webserver.config.exception.BizException;
 import thyyxxk.webserver.config.exception.ExceptionEnum;
 
@@ -36,7 +35,7 @@ public class AssertUtil {
                 throw new BizException(ExceptionEnum.LOGICAL_ERROR, message);
             }
         }else {
-            if (StringUtils.isBlank(object.toString())) {
+            if (StringUtil.isBlank(object.toString())) {
                 throw new BizException(ExceptionEnum.LOGICAL_ERROR, message);
             }
         }

src/main/java/thyyxxk/webserver/utils/ConvertUtil.java

@@ -2,16 +2,12 @@ package thyyxxk.webserver.utils;
 
 import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.date.DateUtil;
-import org.apache.commons.lang3.StringUtils;
 import thyyxxk.webserver.entity.medicalinsurance.inpatient.BatjBa4;
 import thyyxxk.webserver.entity.medicalinsurance.inpatient.YbZyDisDiag;
 import thyyxxk.webserver.entity.vo.quality.DiseInfoListVO;
 import thyyxxk.webserver.entity.vo.quality.OprtInfoListVO;
 
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 
 /**
  * @Description:
@@ -67,13 +63,13 @@ public class ConvertUtil {
             OprtInfoListVO oprtInfoListVO = new OprtInfoListVO();
             oprtInfoListVO.setOprn_oprt_type(i==0?"1":"2");	;//	手术操作类别	字符型
             for(Map<String,String> oprt:ybOprtCodes){
-                if(StringUtils.equals(oprt.get("code"), batjBa4.get(i).getSsbm())){
+                if(Objects.equals(oprt.get("code"), batjBa4.get(i).getSsbm())){
                     oprtInfoListVO.setOprn_oprt_name(oprt.get("yb_name"));
                     oprtInfoListVO.setOprn_oprt_code(oprt.get("yb_code"));
                     break;
                 }
             }
-            if(StringUtils.isBlank(oprtInfoListVO.getOprn_oprt_code())){
+            if(StringUtil.isBlank(oprtInfoListVO.getOprn_oprt_code())){
                 oprtInfoListVO.setOprn_oprt_name(batjBa4.get(i).getSsmc());	;//	手术操作名称	字符型
                 oprtInfoListVO.setOprn_oprt_code(batjBa4.get(i).getSsbm());	;//	手术操作代码	字符型
             }
@@ -97,7 +93,7 @@ public class ConvertUtil {
 
    private static String  getysYbCode(List<Map<String, String>> dictCodes,String code){
        for (Map<String,String> dictCode:dictCodes){
-           if(StringUtils.equals(dictCode.get("code"), code)){
+           if(Objects.equals(dictCode.get("code"), code)){
             return dictCode.get("yb_code");
            }
        }

src/main/java/thyyxxk/webserver/utils/ExcelUtil.java

@@ -3,7 +3,6 @@ package thyyxxk.webserver.utils;
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.util.ReflectUtil;
 import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.lang3.StringUtils;
 import org.apache.poi.hssf.usermodel.HSSFCell;
 import org.apache.poi.hssf.usermodel.HSSFCellStyle;
 import org.apache.poi.hssf.usermodel.HSSFFont;
@@ -348,7 +347,7 @@ public class ExcelUtil {
         HSSFCell row = hfCell1.createCell(column);
         // 将样式应用于单元格
         row.setCellStyle(cellStyle);
-        if(StringUtils.isNotEmpty(value) && !"null".equals(value)){
+        if(StringUtil.notBlank(value) && !"null".equals(value)){
             value=processNumer(value);
             row.setCellValue(value);
 
@@ -361,7 +360,7 @@ public class ExcelUtil {
         HSSFCell row = hfCell1.createCell(column);
         // 将样式应用于单元格
         row.setCellStyle(cellStyle);
-        if(StringUtils.isNotEmpty(value) && !"null".equals(value)){
+        if(StringUtil.notBlank(value) && !"null".equals(value)){
             value = processNumer(value);
             row.setCellValue(value);
         } else {

src/main/java/thyyxxk/webserver/utils/JsonXmlUtils.java

@@ -5,7 +5,6 @@ import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.alibaba.fastjson.serializer.ValueFilter;
 import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.lang3.StringUtils;
 import org.dom4j.*;
 
 import java.util.List;
@@ -47,7 +46,7 @@ public class JsonXmlUtils {
      */
     private static String updateXml(String xmlStr) {
         xmlStr = xmlStr.trim();
-        if (StringUtils.isBlank(xmlStr)) {
+        if (StringUtil.isBlank(xmlStr)) {
             return xmlStr;
         }
 

src/main/resources/application-dev.yml

@@ -29,12 +29,6 @@ spring:
           password:
           type: "com.zaxxer.hikari.HikariDataSource"
           driver-class-name: "com.microsoft.sqlserver.jdbc.SQLServerDriver"
-        jimu:
-          url: "jdbc:postgresql://172.16.32.185:5432/bdp_db"
-          username: "bdp"
-          password: "Powersi$123"
-          type: "com.zaxxer.hikari.HikariDataSource"
-          driver-class-name: "org.postgresql.Driver"
     hikari:
       minimum-idle: 3
       idle-timeout: 180000

src/main/resources/application-prod.yml

@@ -20,12 +20,6 @@ spring:
           password: "hnthxyyy"
           type: "com.zaxxer.hikari.HikariDataSource"
           driver-class-name: "com.microsoft.sqlserver.jdbc.SQLServerDriver"
-        jimu:
-          url: "jdbc:postgresql://172.16.32.185:5432/bdp_db"
-          username: "bdp"
-          password: "Powersi$123"
-          type: "com.zaxxer.hikari.HikariDataSource"
-          driver-class-name: "org.postgresql.Driver"
     hikari:
       minimum-idle: 3
       idle-timeout: 180000

src/main/resources/application.yml

@@ -29,12 +29,6 @@ spring:
           password:
           type: "com.zaxxer.hikari.HikariDataSource"
           driver-class-name: "com.microsoft.sqlserver.jdbc.SQLServerDriver"
-        jimu:
-          url: "jdbc:postgresql://172.16.32.185:5432/bdp_db"
-          username: "bdp"
-          password: "Powersi$123"
-          type: "com.zaxxer.hikari.HikariDataSource"
-          driver-class-name: "org.postgresql.Driver"
     hikari:
       minimum-idle: 3
       idle-timeout: 180000
@@ -85,6 +79,6 @@ thmz-api-url: http://172.16.32.160:81/thmz/api/v1
 #si-injury-systm-url: http://localhost:2000/siInjury
 #thmz-api-url: http://172.16.30.33:81/thmz/api/v1
 
-logging:
-  level:
-    thyyxxk.webserver.dao: debug
+#logging:
+#  level:
+#    thyyxxk.webserver.dao: debug