自定义工单调整

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

@@ -84,19 +84,19 @@ public class MyConstants {
     public static final String MODULE = "module";
     public static final String TYPE = "type";
     public static final String DATA = "data";
-    public static final String MODULE_CONTENT = "自定义工单查询";
+    public static final String MODULE_CONTENT = "用户自定义工单查询";
     public static final String ONLINE = "online";
     public static final String REPORT = "report";
     public static final String ROBOT = "robot";
-    public static final String TOOLS_WORK_ORDER_SQL_INDUSTRY = "SELECT TEST_DATE 化验日期, AVG(JS_SLQ)  进水量,AVG(JS_COD)  进水COD,AVG(JS_TN)  进水总氮,AVG(JS_TP)  进水总磷,AVG(JS_NH3)  进水氨氮,AVG(JS_SS)  进水SS,AVG(CS_SLQC)  出水量,AVG(CS_COD)  出水COD,AVG(CS_TN)  出水总氮,AVG(CS_TP)  出水总磷,AVG(CS_NH3)  出水氨氮,AVG(CS_SS)  出水SS FROM t_xinyi_industry WHERE TEST_DATE BETWEEN ";
+    public static final String TOOLS_WORK_ORDER_SQL_INDUSTRY = "SELECT TEST_DATE TEST_DATE, AVG(JS_SLQ)  进水量,AVG(JS_COD)  进水COD,AVG(JS_TN)  进水总氮,AVG(JS_TP)  进水总磷,AVG(JS_NH3)  进水氨氮,AVG(JS_SS)  进水SS,AVG(CS_SLQC)  出水量,AVG(CS_COD)  出水COD,AVG(CS_TN)  出水总氮,AVG(CS_TP)  出水总磷,AVG(CS_NH3)  出水氨氮,AVG(CS_SS)  出水SS FROM t_xinyi_industry WHERE TEST_DATE BETWEEN ";
 
-    public static final String TOOLS_WORK_ORDER_SQL_DAILY = "SELECT TEST_DATE 化验日期, AVG(JSL)  进水量,AVG(JS_COD)  进水COD,AVG(JS_TN)  进水总氮,AVG(JS_TP)  进水总磷,AVG(JS_NH3)  进水氨氮,AVG(JS_SS)  进水SS,AVG(CSL)  出水量,AVG(CS_COD)  出水COD,AVG(CS_TN)  出水总氮,AVG(CS_TP)  出水总磷,AVG(CS_NH3)  出水氨氮,AVG(CS_SS)  出水SS FROM t_xinyi_daily WHERE TEST_DATE BETWEEN ";
+    public static final String TOOLS_WORK_ORDER_SQL_DAILY = "SELECT TEST_DATE TEST_DATE, AVG(JSL)  进水量,AVG(JS_COD)  进水COD,AVG(JS_TN)  进水总氮,AVG(JS_TP)  进水总磷,AVG(JS_NH3)  进水氨氮,AVG(JS_SS)  进水SS,AVG(CSL)  出水量,AVG(CS_COD)  出水COD,AVG(CS_TN)  出水总氮,AVG(CS_TP)  出水总磷,AVG(CS_NH3)  出水氨氮,AVG(CS_SS)  出水SS FROM t_xinyi_daily WHERE TEST_DATE BETWEEN ";
 
 
-    public static final String TOOLS_WORK_ORDER_SQL_ROBOT = "SELECT 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_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 = "";
     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).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());
         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).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());
         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).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());
         map.put(DATA, sqlMap);
         chatRequest.setHistoryDia(Collections.singletonList(JSON.toJSONString(map)));
         System.out.println(JSON.toJSONString(chatRequest));