Merge remote-tracking branch 'origin/master'

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/medical/controller/HisController.java

@@ -71,25 +71,25 @@ public class HisController extends JeecgController<Audit, IAuditService> {
        }
        log.info("事前远端请求的服务ip地址:{}", ipStr);
        ruleEngine.dealPreInterfaceEngin(advanceWarningVO, ipStr);
-       return Result.OK("添加成功！");
+       return Result.OK("事前提醒调用完成！");
    }
 
 
     /**
-     *   事中提醒
+     *  事中预警
      *
      * @param midIncidentWarningVO
      * @return
      */
-    @AutoLog(value = "事中提醒")
-    @ApiOperation(value="事中提醒接口", notes="事中提醒接口调用")
+    @AutoLog(value = "事中预警")
+    @ApiOperation(value="事中预警接口", notes="事中预警接口调用")
     @PostMapping(value = "/midIncidentWarning")
     public Result<String> midIncidentWarning(@RequestBody @Valid MidIncidentWarningVO midIncidentWarningVO,HttpServletRequest httpServletRequest) {
 
         String ipStr = HttpUtils.getIPAddress(httpServletRequest);
         log.info("事中远端请求的服务ip地址:{}", ipStr);
         ruleEngine.dealMidInterfaceEngin("midIncidentWarning", midIncidentWarningVO, ipStr);
-        return Result.OK("添加成功！");
+        return Result.OK("事中预警调用完成！");
     }
 
 }

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/medical/entity/MidIncidentWarningVO.java

@@ -1,13 +1,9 @@
 package org.jeecg.modules.medical.entity;
 
-import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
-import org.springframework.format.annotation.DateTimeFormat;
 
 import javax.validation.constraints.NotBlank;
-import java.util.Date;
 import java.util.List;
 
 /**

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/medical/ruleengine/SqlUtil.java

@@ -10,6 +10,7 @@ import org.jeecg.modules.medical.entity.EventAttr;
 import org.jeecg.modules.medical.entity.FactorAttrRela;
 import org.jeecg.modules.medical.entity.FactorEnchance;
 import org.springframework.jdbc.core.JdbcTemplate;
+import org.springframework.jdbc.core.namedparam.NamedParameterJdbcTemplate;
 import org.springframework.jdbc.support.rowset.SqlRowSet;
 import org.springframework.stereotype.Component;
 
@@ -27,7 +28,8 @@ public class SqlUtil {
 
     public void setSqlResultByFactorEnchance(Map<String, Object> localMap, Map<Integer, List<FactorAttrRela>> ioTypeMap, FactorEnchance factorEnchance, Integer medicalInsRuleInfoId) {
         String dataSourceKey = factorEnchance.getExtAttr1();
-        JdbcTemplate jdbcTemplate = DynamicDBUtil.getJdbcTemplate(dataSourceKey);
+        NamedParameterJdbcTemplate namedParameterJdbcTemplate = DynamicDBUtil.getNamedParameterJdbcTemplate(dataSourceKey);
+//        JdbcTemplate jdbcTemplate = DynamicDBUtil.getJdbcTemplate(dataSourceKey);
         List<FactorAttrRela> factorAttrRelaList = ioTypeMap.get(Constant.INPUT);
         List<Integer> paramNameList = new ArrayList<>();
         List<Integer> paramTypeList = new ArrayList<>();
@@ -41,23 +43,25 @@ public class SqlUtil {
                 paramTypeList.add(eventAttr.getDispType());
             }
         }
-        String sql = getSqlText(localMap, factorEnchance.getEnhanceValue(), paramNameList, paramTypeList, factorEnchance, medicalInsRuleInfoId);
-
+//        String sql = getSqlText(localMap, factorEnchance.getEnhanceValue(), paramNameList, paramTypeList, factorEnchance, medicalInsRuleInfoId);
+        String sql = factorEnchance.getEnhanceValue();
         List<FactorAttrRela> factorAttrRelaOutList = ioTypeMap.get(Constant.OUTPUT);
         if (CollectionUtil.isNotEmpty(factorAttrRelaOutList)) {
-            if (factorAttrRelaOutList.size() == 1 && checkEventAttrArrMap(factorAttrRelaOutList.get(0).getEventAttrId())) {
-                List<Map<String,Object>> dataList = jdbcTemplate.queryForList(sql);
+            if (checkEventAttrArrMap(factorAttrRelaOutList.get(0).getEventAttrId())) {
+//                List<Map<String,Object>> dataList = jdbcTemplate.queryForList(sql);
 //                    jdbcTemplate.queryForList()
+                List<Map<String,Object>> dataList = namedParameterJdbcTemplate.queryForList(sql, localMap);
                 localMap.put(FactorEnchangeFactory.getParamName(factorAttrRelaOutList.get(0).getEventAttrId()), dataList);
-            }else if (factorAttrRelaOutList.size() == 1 && checkEventAttrArr(factorAttrRelaOutList.get(0).getEventAttrId())) {
-                List<Object> dataList = jdbcTemplate.queryForList(sql,Object.class);
+            }else if (checkEventAttrArr(factorAttrRelaOutList.get(0).getEventAttrId())) {
+//                List<Object> dataList = jdbcTemplate.queryForList(sql,Object.class);
+                List<Object> dataList = namedParameterJdbcTemplate.queryForList(sql, localMap, Object.class);
 //                    jdbcTemplate.queryForList()
                 localMap.put(FactorEnchangeFactory.getParamName(factorAttrRelaOutList.get(0).getEventAttrId()), dataList);
-            } else if (factorAttrRelaOutList.size() == 1 && checkEventAttrMap(factorAttrRelaOutList.get(0).getEventAttrId())) {
-                Map<String, Object> dataMap = jdbcTemplate.queryForMap(sql);
+            } else if (checkEventAttrMap(factorAttrRelaOutList.get(0).getEventAttrId())) {
+                Map<String, Object> dataMap = namedParameterJdbcTemplate.queryForMap(sql, localMap);
                 localMap.put(FactorEnchangeFactory.getParamName(factorAttrRelaOutList.get(0).getEventAttrId()), dataMap);
             } else {
-                SqlRowSet rs = jdbcTemplate.queryForRowSet(sql);
+                SqlRowSet rs = namedParameterJdbcTemplate.queryForRowSet(sql, localMap);
                 if (rs.first()) {
                     for (int paramIndex = 1; paramIndex <= factorAttrRelaOutList.size(); paramIndex++) {
                         Object paramObj = rs.getObject(paramIndex);

jeecg-module-system/jeecg-system-start/src/test/java/org/jeecg/modules/system/test/SysUserTest.java

@@ -6,6 +6,10 @@ import org.jeecg.common.constant.CommonConstant;
 import org.jeecg.common.system.util.JwtUtil;
 import org.jeecg.common.util.RedisUtil;
 import org.jeecg.common.util.RestUtil;
+import org.jeecg.common.util.dynamic.db.DynamicDBUtil;
+import org.jeecg.modules.medical.Constant;
+import org.jeecg.modules.medical.ruleengine.FactorEnchangeFactory;
+import org.jeecg.modules.medical.ruleengine.plugin.InsertSqlPlugin;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -14,8 +18,15 @@ import org.springframework.http.HttpHeaders;
 import org.springframework.http.HttpMethod;
 import org.springframework.http.MediaType;
 import org.springframework.http.ResponseEntity;
+import org.springframework.jdbc.core.namedparam.MapSqlParameterSource;
+import org.springframework.jdbc.core.namedparam.NamedParameterJdbcTemplate;
 import org.springframework.test.context.junit4.SpringRunner;
 
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
 /**
  * 系统用户单元测试
  */
@@ -32,6 +43,46 @@ public class SysUserTest {
     private final String PASSWORD = "123456";
     @Autowired
     private RedisUtil redisUtil;
+    @Autowired
+    InsertSqlPlugin insertSqlPlugin;
+
+    @Test
+    public void testInsertSql(){
+        NamedParameterJdbcTemplate namedParameterJdbcTemplate = DynamicDBUtil.getNamedParameterJdbcTemplate(Constant.LOCAL_MYSQL);
+        List<MapSqlParameterSource> batchArgs = new ArrayList<>();
+        List<Map<String,Object>> dataList = new ArrayList<>();
+        Map<String,Object> localMap1 = new HashMap<>();
+        localMap1.put("11","2343");
+        localMap1.put("id",1);
+        localMap1.put("name","lindong");
+        localMap1.put("code","lindong");
+        dataList.add(localMap1);
+        Map<String,Object> localMap2 = new HashMap<>();
+        localMap2.put("11","2343");
+        localMap2.put("id",2);
+        localMap2.put("name","lindong1");
+        localMap2.put("code","lindong1");
+
+        Map<String,Object> localMap = new HashMap<>();
+        localMap.put("11","2343");
+        dataList.add(localMap2);
+        for (Map<String,Object> dataMap : dataList) {
+            dataMap.putAll(localMap);
+            MapSqlParameterSource parameters = new MapSqlParameterSource(dataMap);
+
+            batchArgs.add(parameters);
+        }
+        namedParameterJdbcTemplate.batchUpdate("insert into test(id,name,code)values(:id,:name,:code)", batchArgs.toArray(new MapSqlParameterSource[batchArgs.size()]));
+        Map<String,Object> queryMap = new HashMap<>();
+        List<Integer> idList = new ArrayList<>();
+        idList.add(1);
+        idList.add(2);
+        queryMap.put("id",idList);
+        List<Map<String,Object>> resultList = namedParameterJdbcTemplate.queryForList("select * from test where id in (:id)", queryMap);
+        System.out.println(resultList);
+        System.out.println(resultList.size());
+//        insertSqlPlugin.plugin();
+    }
 
     /**
      * 测试用例：查询记录