自定义工单参数调整

slibra-common/src/main/java/com/slibra/common/constant/MyConstants.java

@@ -78,7 +78,7 @@ public class MyConstants {
     public static final String WARNING_DEFAULT_QUESTION= "在线仪表数据异常";
     public static final String WARNING_DEFAULT_CREATE = "task-job";
     public static final String DEFAULT_ID_IDENTIFIER = "@@id@@";
-    public static final String TOOLS_WORK_ORDER = "work-order";
+    public static final String TOOLS_WORK_ORDER = "work_order";
     public static final String TIMEBEGIN = "timeBegin";
     public static final String TIMEEND = "timeEnd";
     public static final String MODULE = "module";
@@ -96,7 +96,8 @@ public class MyConstants {
     public static final String TOOLS_WORK_ORDER_SQL_ROBOT = "SELECT TEST_DATE TEST_DATE, AVG(NO3_HLJ1_JQR) '1#好氧池硝酸盐',AVG(NO3_HLJ2_JQR) '2#好氧池硝酸盐',AVG(NH3_1_JQR) '1#缺氧氨氮',AVG(NH3_2_JQR) '2#缺氧氨氮',AVG(NO3_QYC_1_JQR) '1#缺氧池硝酸盐',AVG(NO3_QYC_2_JQR) '2#缺氧池硝酸盐',AVG(TP_RCC_JQR) '二沉池正磷酸盐' FROM t_xinyi_robot WHERE TEST_DATE BETWEEN ";
 
 
-    public static final String TOOLS_WORK_ORDER_SQL_DIAN = "";
+    public static final String TOOLS_WORK_ORDER_SQL_DIAN_BEGIN = "{";
+    public static final String TOOLS_WORK_ORDER_SQL_DIAN_END = "}";
     public static final String TOOLS_WORK_ORDER_SQL_AND = " AND ";
     public static final String TOOLS_WORK_ORDER_SQL_END = " GROUP BY TEST_DATE";
     //    public static final String ZLSY = "zlsy";//正磷酸盐

slibra-system/src/main/java/com/slibra/business/req/ChatRequest.java

@@ -70,11 +70,11 @@ public class ChatRequest {
         //拼装的SQL
         HashMap<String, Object> sqlMap = new HashMap<>();
         StringBuilder sb = new StringBuilder();
-        sqlMap.put(ONLINE, sb.append(TOOLS_WORK_ORDER_SQL_INDUSTRY).append(TOOLS_WORK_ORDER_SQL_DIAN).append(TIMEBEGIN).append(TOOLS_WORK_ORDER_SQL_DIAN).append(TOOLS_WORK_ORDER_SQL_AND).append(TOOLS_WORK_ORDER_SQL_DIAN).append(TIMEEND).append(TOOLS_WORK_ORDER_SQL_DIAN).append(TOOLS_WORK_ORDER_SQL_END).toString());
+        sqlMap.put(ONLINE, sb.append(TOOLS_WORK_ORDER_SQL_INDUSTRY).append(TOOLS_WORK_ORDER_SQL_DIAN_BEGIN).append(TIMEBEGIN).append(TOOLS_WORK_ORDER_SQL_DIAN_END).append(TOOLS_WORK_ORDER_SQL_AND).append(TOOLS_WORK_ORDER_SQL_DIAN_BEGIN).append(TIMEEND).append(TOOLS_WORK_ORDER_SQL_DIAN_END).append(TOOLS_WORK_ORDER_SQL_END).toString());
         sb = new StringBuilder();
-        sqlMap.put(REPORT, sb.append(TOOLS_WORK_ORDER_SQL_DAILY).append(TOOLS_WORK_ORDER_SQL_DIAN).append(TIMEBEGIN).append(TOOLS_WORK_ORDER_SQL_DIAN).append(TOOLS_WORK_ORDER_SQL_AND).append(TOOLS_WORK_ORDER_SQL_DIAN).append(TIMEEND).append(TOOLS_WORK_ORDER_SQL_DIAN).append(TOOLS_WORK_ORDER_SQL_END).toString());
+        sqlMap.put(REPORT, sb.append(TOOLS_WORK_ORDER_SQL_DAILY).append(TOOLS_WORK_ORDER_SQL_DIAN_BEGIN).append(TIMEBEGIN).append(TOOLS_WORK_ORDER_SQL_DIAN_END).append(TOOLS_WORK_ORDER_SQL_AND).append(TOOLS_WORK_ORDER_SQL_DIAN_BEGIN).append(TIMEEND).append(TOOLS_WORK_ORDER_SQL_DIAN_END).append(TOOLS_WORK_ORDER_SQL_END).toString());
         sb = new StringBuilder();
-        sqlMap.put(ROBOT, sb.append(TOOLS_WORK_ORDER_SQL_ROBOT).append(TOOLS_WORK_ORDER_SQL_DIAN).append(TIMEBEGIN).append(TOOLS_WORK_ORDER_SQL_DIAN).append(TOOLS_WORK_ORDER_SQL_AND).append(TOOLS_WORK_ORDER_SQL_DIAN).append(TIMEEND).append(TOOLS_WORK_ORDER_SQL_DIAN).append(TOOLS_WORK_ORDER_SQL_END).toString());
+        sqlMap.put(ROBOT, sb.append(TOOLS_WORK_ORDER_SQL_ROBOT).append(TOOLS_WORK_ORDER_SQL_DIAN_BEGIN).append(TIMEBEGIN).append(TOOLS_WORK_ORDER_SQL_DIAN_END).append(TOOLS_WORK_ORDER_SQL_AND).append(TOOLS_WORK_ORDER_SQL_DIAN_BEGIN).append(TIMEEND).append(TOOLS_WORK_ORDER_SQL_DIAN_END).append(TOOLS_WORK_ORDER_SQL_END).toString());
         map.put(DATA, sqlMap);
         chatRequest.setHistoryDia(Collections.singletonList(JSON.toJSONString(map)));
         System.out.println(JSON.toJSONString(chatRequest));