lrl -2021-12-09

src/main/java/com/steerinfo/ems/emsgmpcjh/controller/EmsGmPcJhController.java

@@ -1,15 +1,16 @@
 package com.steerinfo.ems.emsgmpcjh.controller;
 
-import com.alibaba.fastjson.JSON;
 import com.steerinfo.auth.utils.JwtUtil;
 import com.steerinfo.ems.Utils.DateUtils;
 import com.steerinfo.ems.Utils.ExcelToolUtils;
-import com.steerinfo.ems.websocket.controller.WebSocket;
 import com.steerinfo.ems.emsgmpcjh.mapper.EmsGmPcJhMapper;
 import com.steerinfo.ems.emsgmpcjh.model.EmsGmPcJh;
 import com.steerinfo.ems.emsgmpcjh.service.IEmsGmPcJhService;
 import com.steerinfo.ems.emsprodplanweightadjustment.mapper.EmsProdplanWeightAdjustmentMapper;
 import com.steerinfo.ems.emsprodplanweightadjustment.model.EmsProdplanWeightAdjustment;
+import com.steerinfo.ems.emswebsocketlog.model.EmsWebsocketLog;
+import com.steerinfo.ems.emswebsocketlog.service.IEmsWebsocketLogService;
+import com.steerinfo.ems.websocket.controller.WebSocket;
 import com.steerinfo.framework.controller.BaseRESTfulController;
 import com.steerinfo.framework.controller.RESTfulResult;
 import com.steerinfo.framework.service.pagehelper.PageList;
@@ -22,11 +23,7 @@ import org.springframework.web.multipart.MultipartFile;
 
 import java.io.File;
 import java.math.BigDecimal;
-import java.text.ParseException;
-import java.text.SimpleDateFormat;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.Map;
+import java.util.*;
 
 /**
  * EmsGmPcJh RESTful接口：
@@ -56,6 +53,8 @@ public class EmsGmPcJhController extends BaseRESTfulController {
     private WebSocket webSocket;
     @Autowired
     EmsProdplanWeightAdjustmentMapper emsProdplanWeightAdjustmentMapper;
+    @Autowired
+    IEmsWebsocketLogService emsWebsocketLogService;
 
     @ApiOperation(value="获取列表", notes="分页查询")
     @ApiImplicitParams({
@@ -249,15 +248,25 @@ public class EmsGmPcJhController extends BaseRESTfulController {
             emsGmPcJhService.updateState(model);
         }
         if(result){
-        soketMessage += "已下发,请注意接收";
-        String[] roles = {"生产部-生产处"};
-        Map <String, Object> map = new HashMap<String,Object>();
-        map.put("role",roles);
-        map.put("title","国贸订单下发");
-        map.put("message",soketMessage);
-        map.put("tips","您好，有新的国贸计划已下发,请注意接收。");
-        soketMessage= JSON.toJSONString(map);
-            webSocket.sendAllMessage(soketMessage);
+            soketMessage += "已下发,请注意接收";
+            List<EmsWebsocketLog> websocketLogs = new ArrayList<>();
+            EmsWebsocketLog websocketLog = new EmsWebsocketLog();
+            websocketLog.setMessage(soketMessage);
+            websocketLog.setTitle("生产部-生产处");
+            websocketLog.setState("0");
+            websocketLog.setTips("国贸订单下发");
+            websocketLog.setRole("您好，有新的国贸计划已下发,请注意接收。");
+            websocketLogs.add(websocketLog);
+            emsWebsocketLogService.pushMessageByDataException(websocketLogs);
+        //soketMessage += "已下发,请注意接收";
+        //String[] roles = {"生产部-生产处"};
+        //Map <String, Object> map = new HashMap<String,Object>();
+        //map.put("role",roles);
+        //map.put("title","国贸订单下发");
+        //map.put("message",soketMessage);
+        //map.put("tips","您好，有新的国贸计划已下发,请注意接收。");
+        //soketMessage= JSON.toJSONString(map);
+        //    webSocket.sendAllMessage(soketMessage);
         }
         return success();
     }
@@ -302,14 +311,24 @@ public class EmsGmPcJhController extends BaseRESTfulController {
         }
             if(result){
                 soketMessage += "已提交审核,请注意接收";
-                String[] roles = {"国贸-部门领导"};
-                Map <String, Object> map = new HashMap<String,Object>();
-                map.put("role",roles);
-                map.put("title","国贸订单审核");
-                map.put("message",soketMessage);
-                map.put("tips","您好，有新的国贸计划已提交审核,请注意接收。");
-                soketMessage= JSON.toJSONString(map);
-                webSocket.sendAllMessage(soketMessage);
+                List<EmsWebsocketLog> websocketLogs = new ArrayList<>();
+                EmsWebsocketLog websocketLog = new EmsWebsocketLog();
+                websocketLog.setMessage(soketMessage);
+                websocketLog.setTitle("国贸-部门领导");
+                websocketLog.setState("0");
+                websocketLog.setTips("国贸订单审核");
+                websocketLog.setRole("您好，有新的国贸计划已提交审核,请注意接收。");
+                websocketLogs.add(websocketLog);
+                emsWebsocketLogService.pushMessageByDataException(websocketLogs);
+                //soketMessage += "已提交审核,请注意接收";
+                //String[] roles = {"国贸-部门领导"};
+                //Map <String, Object> map = new HashMap<String,Object>();
+                //map.put("role",roles);
+                //map.put("title","国贸订单审核");
+                //map.put("message",soketMessage);
+                //map.put("tips","您好，有新的国贸计划已提交审核,请注意接收。");
+                //soketMessage= JSON.toJSONString(map);
+                //webSocket.sendAllMessage(soketMessage);
             }
         return success();
     }
@@ -334,14 +353,24 @@ public class EmsGmPcJhController extends BaseRESTfulController {
             soketMessage+=emsGmPcJh.getId()+",";
             if(result){
                 soketMessage += "下发,请注意接收";
-                String[] roles = {"生产部-生产处"};
-                Map <String, Object> map = new HashMap<String,Object>();
-                map.put("role",roles);
-                map.put("title","国贸订单下发");
-                map.put("message",soketMessage);
-                map.put("tips","您好，有新的国贸计划已经下发,请注意接收。");
-                soketMessage= JSON.toJSONString(map);
-                webSocket.sendAllMessage(soketMessage);
+                List<EmsWebsocketLog> websocketLogs = new ArrayList<>();
+                EmsWebsocketLog websocketLog = new EmsWebsocketLog();
+                websocketLog.setMessage(soketMessage);
+                websocketLog.setTitle("生产处");
+                websocketLog.setState("0");
+                websocketLog.setTips("国贸订单下发");
+                websocketLog.setRole("您好，有新的国贸计划已经下发,请注意接收。");
+                websocketLogs.add(websocketLog);
+                emsWebsocketLogService.pushMessageByDataException(websocketLogs);
+                //soketMessage += "下发,请注意接收";
+                //String[] roles = {"生产部-生产处"};
+                //Map <String, Object> map = new HashMap<String,Object>();
+                //map.put("role",roles);
+                //map.put("title","国贸订单下发");
+                //map.put("message",soketMessage);
+                //map.put("tips","您好，有新的国贸计划已经下发,请注意接收。");
+                //soketMessage= JSON.toJSONString(map);
+                //webSocket.sendAllMessage(soketMessage);
             }
         }
         return success();
@@ -365,14 +394,24 @@ public class EmsGmPcJhController extends BaseRESTfulController {
             soketMessage+=emsGmPcJh.getId()+",";
             if(result){
                 soketMessage += "已被撤回,请注意查看";
-                String[] roles = {"国贸-业务人员"};
-                Map <String, Object> map = new HashMap<String,Object>();
-                map.put("role",roles);
-                map.put("title","国贸订单审核");
-                map.put("message",soketMessage);
-                map.put("tips","您好，您提交的订单已被撤回,请注意查看。");
-                soketMessage= JSON.toJSONString(map);
-                webSocket.sendAllMessage(soketMessage);
+                List<EmsWebsocketLog> websocketLogs = new ArrayList<>();
+                EmsWebsocketLog websocketLog = new EmsWebsocketLog();
+                websocketLog.setMessage(soketMessage);
+                websocketLog.setTitle("国贸-业务人员");
+                websocketLog.setState("0");
+                websocketLog.setTips("国贸订单审核");
+                websocketLog.setRole("您好，您提交的订单已被撤回,请注意查看。");
+                websocketLogs.add(websocketLog);
+                emsWebsocketLogService.pushMessageByDataException(websocketLogs);
+                //soketMessage += "已被撤回,请注意查看";
+                //String[] roles = {"国贸-业务人员"};
+                //Map <String, Object> map = new HashMap<String,Object>();
+                //map.put("role",roles);
+                //map.put("title","国贸订单审核");
+                //map.put("message",soketMessage);
+                //map.put("tips","您好，您提交的订单已被撤回,请注意查看。");
+                //soketMessage= JSON.toJSONString(map);
+                //webSocket.sendAllMessage(soketMessage);
             }
         }
         return success();

src/main/java/com/steerinfo/ems/emsprodplanweightadjustment/controller/EmsProdplanWeightAdjustmentController.java

@@ -1,17 +1,18 @@
 package com.steerinfo.ems.emsprodplanweightadjustment.controller;
 
-import com.alibaba.fastjson.JSON;
 import com.steerinfo.auth.utils.JwtUtil;
-import com.steerinfo.ems.websocket.controller.WebSocket;
 import com.steerinfo.ems.emsgmpcjh.mapper.EmsGmPcJhMapper;
 import com.steerinfo.ems.emsgmpcjh.model.EmsGmPcJh;
 import com.steerinfo.ems.emsprodplanweightadjustment.mapper.EmsProdplanWeightAdjustmentMapper;
+import com.steerinfo.ems.emsprodplanweightadjustment.model.EmsProdplanWeightAdjustment;
+import com.steerinfo.ems.emsprodplanweightadjustment.service.IEmsProdplanWeightAdjustmentService;
+import com.steerinfo.ems.emswebsocketlog.model.EmsWebsocketLog;
+import com.steerinfo.ems.emswebsocketlog.service.IEmsWebsocketLogService;
+import com.steerinfo.ems.websocket.controller.WebSocket;
 import com.steerinfo.framework.controller.BaseRESTfulController;
 import com.steerinfo.framework.controller.RESTfulResult;
 import com.steerinfo.framework.service.pagehelper.PageList;
 import com.steerinfo.framework.utils.collection.ListUtils;
-import com.steerinfo.ems.emsprodplanweightadjustment.model.EmsProdplanWeightAdjustment;
-import com.steerinfo.ems.emsprodplanweightadjustment.service.IEmsProdplanWeightAdjustmentService;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
 import io.swagger.annotations.ApiOperation;
@@ -45,6 +46,8 @@ public class EmsProdplanWeightAdjustmentController extends BaseRESTfulController
     EmsGmPcJhMapper emsGmPcJhMapper;
     @Autowired
     private WebSocket webSocket;
+    @Autowired
+    IEmsWebsocketLogService emsWebsocketLogService;
     @ApiOperation(value="获取列表", notes="分页查询")
     @ApiImplicitParams({
         @ApiImplicitParam(name = "pageNum", value = "查询页数", required = false, dataType = "Integer"),
@@ -140,14 +143,24 @@ public class EmsProdplanWeightAdjustmentController extends BaseRESTfulController
         }
         if(result){
             soketMessage += "已提交审核,请注意接收";
-            String[] roles = {"生产部-生产处"};
-            Map <String, Object> map = new HashMap<String,Object>();
-            map.put("role",roles);
-            map.put("title","销售订单调整");
-            map.put("message",soketMessage);
-            map.put("tips","您好，有新的销售订单需要进行重量调整,请注意接收。");
-            soketMessage= JSON.toJSONString(map);
-            webSocket.sendAllMessage(soketMessage);
+            List<EmsWebsocketLog> websocketLogs = new ArrayList<>();
+            EmsWebsocketLog websocketLog = new EmsWebsocketLog();
+            websocketLog.setMessage(soketMessage);
+            websocketLog.setTitle("生产处");
+            websocketLog.setState("0");
+            websocketLog.setTips("销售订单调整");
+            websocketLog.setRole("您好，有新的销售订单需要进行重量调整,请注意接收。");
+            websocketLogs.add(websocketLog);
+            emsWebsocketLogService.pushMessageByDataException(websocketLogs);
+            //soketMessage += "已提交审核,请注意接收";
+            //String[] roles = {"生产部-生产处"};
+            //Map <String, Object> map = new HashMap<String,Object>();
+            //map.put("role",roles);
+            //map.put("title","销售订单调整");
+            //map.put("message",soketMessage);
+            //map.put("tips","您好，有新的销售订单需要进行重量调整,请注意接收。");
+            //soketMessage= JSON.toJSONString(map);
+            //webSocket.sendAllMessage(soketMessage);
         }
             return success(null,"提交成功");
     }
@@ -209,14 +222,24 @@ public class EmsProdplanWeightAdjustmentController extends BaseRESTfulController
             soketMessage+=model.getId()+",";
             if(result){
                 soketMessage += "不通过,请注意查看";
-                String[] roles = {"国贸-业务人员"};
-                Map <String, Object> map = new HashMap<String,Object>();
-                map.put("role",roles);
-                map.put("title","销售订单重量调整");
-                map.put("message",soketMessage);
-                map.put("tips","您好，有提交的订单不通过，请注意查看。");
-                soketMessage= JSON.toJSONString(map);
-                webSocket.sendAllMessage(soketMessage);
+                List<EmsWebsocketLog> websocketLogs = new ArrayList<>();
+                EmsWebsocketLog websocketLog = new EmsWebsocketLog();
+                websocketLog.setMessage(soketMessage);
+                websocketLog.setTitle("国贸-业务人员");
+                websocketLog.setState("0");
+                websocketLog.setTips("销售订单重量调整");
+                websocketLog.setRole("您好，有提交的订单不通过，请注意查看。");
+                websocketLogs.add(websocketLog);
+                emsWebsocketLogService.pushMessageByDataException(websocketLogs);
+                //soketMessage += "不通过,请注意查看";
+                //String[] roles = {"国贸-业务人员"};
+                //Map <String, Object> map = new HashMap<String,Object>();
+                //map.put("role",roles);
+                //map.put("title","销售订单重量调整");
+                //map.put("message",soketMessage);
+                //map.put("tips","您好，有提交的订单不通过，请注意查看。");
+                //soketMessage= JSON.toJSONString(map);
+                //webSocket.sendAllMessage(soketMessage);
             }
         }
                  return success();

src/main/java/com/steerinfo/ems/emswaterrealtime/service/impl/EmsWaterRealtimeServiceImpl.java

@@ -384,7 +384,7 @@ public class EmsWaterRealtimeServiceImpl extends BaseServiceImpl<EmsWaterRealtim
             historyMap.put("clock",clock2);
             historyMap.put("codes", codes.toString());
             historyMap.put("tags", tags);
-            emsWAiHourSumTab1s = emsWAiHourSumTab1Mapper.getHistoryData(historyMap);
+            //emsWAiHourSumTab1s = emsWAiHourSumTab1Mapper.getHistoryData(historyMap);
             emsWAiHourSumTab1Orgs = emsWAiHourSumTab1OrgMapper.getHistoryDataOrg(historyMap);
         }
     }
@@ -420,6 +420,7 @@ public class EmsWaterRealtimeServiceImpl extends BaseServiceImpl<EmsWaterRealtim
         try{
             //获取用量值数据
         if(!emsWAiHourSumTab1s.equals(null)&&emsWAiHourSumTab1s.size()>0){
+            clock5s=new String[emsWAiHourSumTab1s.size()];
         for(EmsWAiHourSumTab1 model : emsWAiHourSumTab1s) {
             fields = model.getClass().getDeclaredFields();
             for(int i = 0, len = fields.length; i < len; i++) {
@@ -483,10 +484,10 @@ public class EmsWaterRealtimeServiceImpl extends BaseServiceImpl<EmsWaterRealtim
                                 //fields[i].set(model,val.setScale(1, RoundingMode.HALF_UP).doubleValue());
                             } else {
                                 // 历史用量值更新失败
-                                tce = gettRmCalpointExValue(clock5s[j], finalI,"6");
-                                tce.setBz("准点用量值读取失败，clock：" + clock5s[j] + ",col:" + varName + ",table:"
-                                        + model.getClass().getName());
-                                tRmCalpointExValues.add(tce);
+                                //tce = gettRmCalpointExValue(clock5s[j], finalI,"6");
+                                //tce.setBz("准点用量值读取失败，clock：" + clock5s[j] + ",col:" + varName + ",table:"
+                                //        + model.getClass().getName());
+                                //tRmCalpointExValues.add(tce);
                                 //用量直接赋值0
                                 val=0d;
                                 fields[i].set(model,val);
@@ -506,15 +507,17 @@ public class EmsWaterRealtimeServiceImpl extends BaseServiceImpl<EmsWaterRealtim
             if(emsWAiHourSumTab1Mapper.updateByPrimaryKeySelective(model)==0){
                 emsWAiHourSumTab1Mapper.insertSelective(model);
             }
+            j++;
         }
             val5s = new Double[0];
         }
         //获取仪表值数据
         if(!emsWAiHourSumTab1Orgs.equals(null)&&emsWAiHourSumTab1Orgs.size()>0){
             clock5s=new String[emsWAiHourSumTab1Orgs.size()];
+            j = 0;
             for(EmsWAiHourSumTab1Org model : emsWAiHourSumTab1Orgs) {
                 fields = model.getClass().getDeclaredFields();
-                for(int i = 0, len = fields.length; i < len; i++) {
+                for(int i = 0;  i <  emsWaterToMeterRelation.size(); i++) {
                     if(val5s.length==0){
                         val5s=new Double[fields.length];
                         Arrays.fill(val5s,0.0d);
@@ -545,29 +548,30 @@ public class EmsWaterRealtimeServiceImpl extends BaseServiceImpl<EmsWaterRealtim
                                     tce.setBz("准点仪表值读取失败，获取5小时前数据clock：" + clock + ",col:" + varName
                                             + ",table:" + model.getClass().getName());
                                     tRmCalpointExValues.add(tce);
-                                    if(val5s[i]==(0.0d)) {
+                                    //if(val5s[i]==(0.0d)) {
                                         // 5小时前准点值,当前小时
                                         clock5s[j]+=":00:00";
+                                        Date d = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").parse(clock5s[j]);
                                         cal5.setTime(new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").parse(clock5s[j]));
                                         //上个小时
-                                        cal5.add(Calendar.HOUR_OF_DAY, -1);
-                                        clock5 = new SimpleDateFormat("yyyy-MM-dd HH").format(cal.getTime());
+                                        cal5.add(Calendar.HOUR_OF_DAY, -4);
+                                        clock5 = new SimpleDateFormat("yyyy-MM-dd HH").format(cal5.getTime());
                                         sql = "select " + varName + " from  EMS_W_AI_HOUR_SUM_TAB1_ORG where CLOCK = '" + clock5 + "'";
                                         try {
                                             val5s[i] = jdbcTemplate.queryForObject(sql, Double.class);
                                             val = val5s[i];
                                         } catch (Exception e) {
                                             val = 0d;
-                                            tce = gettRmCalpointExValue(clock5, finalI,"3");
-                                            tce.setCreatetime(new SimpleDateFormat("yyyy-MM-dd HH:mm:ss")
-                                                    .format(new Date()));
-                                            tce.setBz("5小时前准点仪表值读取失败，clock：" + clock + ",col:" + varName + ",table:"
-                                                    + model.getClass().getName());
-                                            tRmCalpointExValues.add(tce);
+                                            //tce = gettRmCalpointExValue(clock5, finalI,"3");
+                                            //tce.setCreatetime(new SimpleDateFormat("yyyy-MM-dd HH:mm:ss")
+                                            //        .format(new Date()));
+                                            //tce.setBz("5小时前准点仪表值读取失败，clock：" + clock + ",col:" + varName + ",table:"
+                                            //        + model.getClass().getName());
+                                            //tRmCalpointExValues.add(tce);
                                         }
-                                    } else {
-                                       val=val5s[i];
-                                    }
+                                    //} else {
+                                    //   val=val5s[i];
+                                    //}
                                     fields[i].set(model,val);
                                 }
                             }
@@ -611,7 +615,7 @@ public class EmsWaterRealtimeServiceImpl extends BaseServiceImpl<EmsWaterRealtim
             tce.setBz("数据传输错误，无数据；请联系管理员");
             tRmCalpointExValues.add(tce);
         }finally {
-            tRmCalpointExValueService.batchAdd(tRmCalpointExValues);
+            //tRmCalpointExValueService.batchAdd(tRmCalpointExValues);
         }
     }
 
@@ -622,7 +626,7 @@ public class EmsWaterRealtimeServiceImpl extends BaseServiceImpl<EmsWaterRealtim
                 .filter(emsWaterToMeter -> finalI.toUpperCase()
                         .equals(emsWaterToMeter.getmName().toUpperCase().trim()))
                 .findFirst()
-                .orElse(null).getMosaicid();
+                .orElse(null).getMeterid();
         tce = new TRmCalpointExValue();
         tce.setItemid(itemId);
         tce.setExtype(type);

src/main/java/com/steerinfo/ems/emswebsocketlog/controller/EmsWebsocketLogController.java

@@ -92,6 +92,8 @@ public class EmsWebsocketLogController extends BaseRESTfulController {
     @PutMapping(value = "/{id}", produces  = "application/json;charset=UTF-8")
     public RESTfulResult update(@PathVariable String id, @RequestBody EmsWebsocketLog model){
         model.setId(id);
+        model.setCloseman(JwtUtil.getUseridByToken());
+        model.setClosetime(DateUtils.dateStr(new Date(),"yyyy-MM-dd HH:mm:ss"));
         EmsWebsocketLog emsWebsocketLog = emsWebsocketLogService.modify(model);
         return success(emsWebsocketLog);
     }

src/main/java/com/steerinfo/ems/emswebsocketlog/service/IEmsWebsocketLogService.java

@@ -3,6 +3,8 @@ package com.steerinfo.ems.emswebsocketlog.service;
 import com.steerinfo.ems.emswebsocketlog.model.EmsWebsocketLog;
 import com.steerinfo.framework.service.IBaseService;
 
+import java.util.List;
+
 /**
  * EmsWebsocketLog服务接口：
  * @author generator
@@ -18,4 +20,10 @@ import com.steerinfo.framework.service.IBaseService;
  */
 public interface IEmsWebsocketLogService extends IBaseService<EmsWebsocketLog, String>{
 
+    /**
+     * 获取异常数据进行消息推送
+     * @param websocketLogs 传入参数
+     */
+    void pushMessageByDataException(List<EmsWebsocketLog> websocketLogs);
+
 }

src/main/java/com/steerinfo/ems/emswebsocketlog/service/impl/EmsWebsocketLogServiceImpl.java

@@ -1,13 +1,19 @@
 package com.steerinfo.ems.emswebsocketlog.service.impl;
 
+import com.steerinfo.ems.Utils.DateUtils;
 import com.steerinfo.ems.emswebsocketlog.mapper.EmsWebsocketLogMapper;
 import com.steerinfo.ems.emswebsocketlog.model.EmsWebsocketLog;
 import com.steerinfo.ems.emswebsocketlog.service.IEmsWebsocketLogService;
 import com.steerinfo.framework.mapper.IBaseMapper;
 import com.steerinfo.framework.service.impl.BaseServiceImpl;
+import com.steerinfo.websocketclient.model.MessageType;
+import com.steerinfo.websocketclient.service.IAsyncWebSocketService;
+import com.steerinfo.websocketclient.service.ISyncWebSocketService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.*;
+
 /**
  * EmsWebsocketLog服务实现：
  * @author generator
@@ -31,4 +37,76 @@ public class EmsWebsocketLogServiceImpl extends BaseServiceImpl<EmsWebsocketLog,
     protected IBaseMapper<EmsWebsocketLog, String> getMapper() {
         return emsWebsocketLogMapper;
     }
+
+    /**
+     * 异步发送消息
+     */
+    @Autowired
+    IAsyncWebSocketService asyncWebSocketService;
+    /**
+     * 同步发送消息
+     */
+    @Autowired
+    ISyncWebSocketService syncWebSocketService;
+
+    @Override
+    public void pushMessageByDataException(List<EmsWebsocketLog> websocketLogs) {
+        if (websocketLogs != null && websocketLogs.size() > 0) {
+            //这里state必须为2，因为2是接收人，0是未读，1是已读
+            Map<String, Object> map = new HashMap<>(2);
+            map.put("state", "2");
+            map.put("title", websocketLogs.get(0).getTitle());
+            //查出所有符合条件的接收角色
+            List<EmsWebsocketLog> emsWebsocketLogs = getMapper().selectByParameters(map);
+            if (emsWebsocketLogs != null && emsWebsocketLogs.size() > 0) {
+                String[] userIds;
+                String tips;
+                List<MessageType> messageTypeList = new ArrayList<>();
+                List<EmsWebsocketLog> models = new ArrayList<>();
+                //应发送的消息数量=消息个数*接收角色条数*接收角色下的所有用户。三层循环；一：循环消息列表
+                //二：循环角色列表
+                for(int i = 0 ;i<emsWebsocketLogs.size();i++){
+                for (EmsWebsocketLog websocketLog : websocketLogs) {
+                    //语音消息尽量选择自定义，否则会播放失败
+                    switch (websocketLog.getTitle()){
+                        case "计控处": tips="您好，计量点数据存在异常,请注意查看。";break;
+                        default: tips=websocketLogs.get(0).getRole(); break;
+                    }
+                        //用户转为数组
+                        userIds = emsWebsocketLogs.get(i).getRelation().split(",");
+                        //三：循环用户列表
+                        for (String userId : userIds) {
+                            EmsWebsocketLog model = new EmsWebsocketLog();
+                            model.setState("0");
+                            model.setRelation(userId);
+                            model.setRole(emsWebsocketLogs.get(i).getRole());
+                            model.setTitle(websocketLog.getTips());
+                            model.setMessage(websocketLog.getMessage());
+                            model.setTips(tips);
+                            model.setCreateman("系统");
+                            model.setCreatetime(DateUtils.dateStr(new Date(), "yyyy-MM-dd HH:mm:ss"));
+                            models.add(model);
+                            MessageType messageType = new MessageType();
+                            messageType.setType("top-right");
+                            messageType.setPayload(model);
+                            messageType.setUserId(userId);
+                            messageType.setOffline(false);
+                            messageType.setContentId(userId+DateUtils.dateStr(new Date(), "yyyy-MM-dd HH:mm:ss"));
+                            messageTypeList.add(messageType);
+
+                        }
+                    }
+                }
+            if (models != null && models.size() > 0) {
+                try {
+                    //getMapper().batchInsert(models);
+                    this.batchAdd(models);
+                    asyncWebSocketService.sendMessagesAsync(messageTypeList);
+                } catch (Exception ex) {
+                    ex.printStackTrace();
+                }
+            }
+            }
+        }
+    }
 }

src/main/java/com/steerinfo/ems/rttable/mapper/RttableMapper.java

@@ -6,6 +6,7 @@ import org.apache.ibatis.annotations.Mapper;
 
 import java.math.BigDecimal;
 import java.util.HashMap;
+import java.util.List;
 
 @Mapper
 public interface RttableMapper extends IBaseMapper<Rttable, BigDecimal> {
@@ -16,4 +17,5 @@ public interface RttableMapper extends IBaseMapper<Rttable, BigDecimal> {
 
     int updatePowerMinutes(HashMap<String, Object> HashMap);
 
+    List<Rttable> selectPowerAltId();
 }

src/main/java/com/steerinfo/ems/rttable/mapper/RttableMapper.xml

@@ -282,4 +282,10 @@
       ${sql}
     </set>
   </update>
+  <select id="selectPowerAltId" resultMap="BaseResultMap">
+    SELECT p.ALTID,p.RTVALUE,BTYPE2 AS NOTE
+    FROM T_RM_CALPOINT c
+    INNER JOIN RTTABLE p ON c.TAGID = p.ALTID
+    AND c.ENERGYTYPEID = 'P' AND c.ITEMTYPE='AUTO'
+  </select>
 </mapper>

src/main/java/com/steerinfo/ems/rttable/service/impl/RttableServiceImpl.java

@@ -52,18 +52,27 @@ public class RttableServiceImpl extends BaseServiceImpl<Rttable, BigDecimal> imp
             String clock = DateUtils.dateStr(new Date(),"yyyy-MM-dd HH:mm:ss");
             HashMap<String,Object> hashMap = new HashMap<String,Object>();
             hashMap.put("clock",clock);
-            List<Rttable> rttableList = rttableMapper.selectByParameters(hashMap);
-            StringBuffer sub = new StringBuffer();
-            String table="EMS_POWER";
-            for (Rttable rttable : rttableList){
-                addSize ++ ;
-                //多个表生成数据就填加table;
-                String sql = ",TAG"+ addSize+ " = " + "'" + rttable.getRtvalue() + "'";
-                sub.append(sql);
+            List<Rttable> rttableList = rttableMapper.selectPowerAltId();
+            if(rttableList!=null && rttableList.size()>0) {
+                StringBuffer sub = new StringBuffer();
+                String table = "EMS_POWER";
+                String[] tens;
+                String tag;
+                String sql;
+                for (Rttable rttable : rttableList) {
+                    addSize++;
+                    tens = rttable.getNote().split("\\.");
+                    tag = tens[1];
+                    //多个表生成数据就填加table;
+                    //table = tens[0];
+                    //多个表生成数据就填加table;
+                    sql = "," + tag + " = " + "'" + rttable.getRtvalue() + "'";
+                    sub.append(sql);
+                }
+                hashMap.put("table", table);
+                hashMap.put("sql", sub.toString());
+                updateSize += rttableMapper.updatePowerMinutes(hashMap);
             }
-            hashMap.put("table",table);
-            hashMap.put("sql",sub.toString());
-            updateSize += rttableMapper.updatePowerMinutes(hashMap);
         } catch (Exception e) {
             e.printStackTrace();
         } finally {
@@ -91,16 +100,25 @@ public class RttableServiceImpl extends BaseServiceImpl<Rttable, BigDecimal> imp
                 logger.error("主键已存在");
             } finally {
                 StringBuffer sub = new StringBuffer();
-                List<Rttable> rttableList = rttableMapper.selectByParameters(hashMap);
-                String table = "EMS_POWER_TIMING";
-                for (Rttable rttable : rttableList) {
-                    i++;
-                    String sql = "TAG" + i + " = " + "'" + rttable.getRtvalue() + "',";
-                    sub.append(sql);
+                List<Rttable> rttableList = rttableMapper.selectPowerAltId();
+                if(rttableList!=null && rttableList.size()>0) {
+                    String table = "EMS_POWER_TIMING";
+                    String[] tens;
+                    String tag;
+                    String sql;
+                    for (Rttable rttable : rttableList) {
+                        i++;
+                        tens = rttable.getNote().split("\\.");
+                        tag = tens[1];
+                        //多个表生成数据就填加table;
+                        //table = tens[0];
+                        sql = tag + " = " + "'" + rttable.getRtvalue() + "', ";
+                        sub.append(sql);
+                    }
+                    hashMap.put("table", table);
+                    hashMap.put("sql", sub.toString());
+                    updateSize += rttableMapper.updatePowerTenMinutes(hashMap);
                 }
-                hashMap.put("table", table);
-                hashMap.put("sql", sub.toString());
-                updateSize += rttableMapper.updatePowerTenMinutes(hashMap);
             }
         } catch (Exception e) {
             e.printStackTrace();

src/main/java/com/steerinfo/ems/trmactitem/mapper/TRmActItemMapper.xml

@@ -725,7 +725,7 @@
 	           and t.itemdesc like '%${itemdesc}%'
 	        </if>
           <if test="issettle != null and issettle != ''">
-            and t.issettle = ${issettle}
+            and t.islock = ${issettle}
           </if>
 	        <if test="measureid != null and measureid != ''">
       			and exists

src/main/java/com/steerinfo/ems/trmactvalue/service/impl/TRmActValueServiceImpl.java

@@ -1,6 +1,5 @@
 package com.steerinfo.ems.trmactvalue.service.impl;
 
-import com.steerinfo.auth.utils.JwtUtil;
 import com.steerinfo.ems.Utils.BigDecimalUtil;
 import com.steerinfo.ems.Utils.DateUtils;
 import com.steerinfo.ems.Utils.TimegranidUtils;
@@ -8,27 +7,26 @@ import com.steerinfo.ems.common.DateTypeEnum;
 import com.steerinfo.ems.formula.service.IFormulaService;
 import com.steerinfo.ems.trmactitem.model.TRmActItem;
 import com.steerinfo.ems.trmactitem.service.ITRmActItemService;
+import com.steerinfo.ems.trmactvalue.mapper.TRmActValueMapper;
+import com.steerinfo.ems.trmactvalue.model.TRmActValue;
+import com.steerinfo.ems.trmactvalue.service.ITRmActValueService;
+import com.steerinfo.ems.trmcalpointexvalue.model.TRmCalpointExValue;
+import com.steerinfo.ems.trmcalpointexvalue.service.ITRmCalpointExValueService;
 import com.steerinfo.ems.trmplanvalue.service.ITRmPlanValueService;
 import com.steerinfo.ems.trmworkprocproductvalue.service.ITRmWorkprocProductValueService;
-import com.steerinfo.framework.datasource.DataSourceKey;
-import com.steerinfo.framework.datasource.TargetDataSource;
 import com.steerinfo.framework.mapper.IBaseMapper;
 import com.steerinfo.framework.service.impl.BaseServiceImpl;
 import com.steerinfo.framework.service.pagehelper.PageHelper;
 import com.steerinfo.framework.service.pagehelper.PageList;
-import com.steerinfo.ems.trmactvalue.model.TRmActValue;
-import com.steerinfo.ems.trmactvalue.mapper.TRmActValueMapper;
-import com.steerinfo.ems.trmactvalue.service.ITRmActValueService;
-import java.math.BigDecimal;
-import java.text.ParseException;
-import java.text.SimpleDateFormat;
-import java.util.*;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.jdbc.core.JdbcTemplate;
 import org.springframework.stereotype.Service;
 
+import java.math.BigDecimal;
+import java.text.SimpleDateFormat;
+import java.util.*;
+
 /**
  * TRmActValue服务实现：
  * @author generator
@@ -55,6 +53,8 @@ public class TRmActValueServiceImpl extends BaseServiceImpl<TRmActValue, HashMap
     private ITRmWorkprocProductValueService tRmWorkprocProductValueService;
     @Autowired
     ITRmPlanValueService tRmPlanValueService;
+    @Autowired
+    ITRmCalpointExValueService tRmCalpointExValueService;
 
     @Override
     protected IBaseMapper<TRmActValue, HashMap<String, Object>> getMapper() {
@@ -440,48 +440,59 @@ public class TRmActValueServiceImpl extends BaseServiceImpl<TRmActValue, HashMap
             Double  sjcl  = dh.get("SJCL").doubleValue();
             //累计产量
             // Double  ljcl = dh.get("LJCL").doubleValue();
-            // 数据是否已存在
-            TRmActValue tv = tRmActValueMapper.selectByPrimaryKey(id);
-            try {
-                if(tv!=null){
-                    tv.setActualvalue(new BigDecimal(actualvalue));
-                    tv.setApportvalue(BigDecimalUtil.add(tv.getCorrectvalue()!=null?tv.getCorrectvalue().doubleValue():0d, actualvalue).setScale(digits, BigDecimal.ROUND_HALF_UP));
-                    // 折标值
-                    tv.setStdvalue(BigDecimalUtil.mul(zbxs, tv.getApportvalue().doubleValue()).setScale(digits, BigDecimal.ROUND_HALF_UP));
-                    //单耗值
-                    tv.setUcvalue(BigDecimalUtil.divide(tv.getApportvalue().doubleValue(), sjcl, digits2.intValue()));
-                    tv.setUptime(DateUtils.dateStr(new Date(),"yyyy-MM-dd HH:mm:ss"));
-                    tv.setUserid(opuser);
-                    tRmActValueMapper.updateByPrimaryKeySelective(tv);
-                }else{
-                    TRmActValue tRmActValue = new TRmActValue();
-                    tRmActValue.setItemid(itemid);
-                    tRmActValue.setClock(clock);
-                    tRmActValue.setTimegranid(timegranid);
-                    //计算值
-                    tRmActValue.setActualvalue(new BigDecimal(actualvalue));
-                    //修正值
-                    tRmActValue.setCorrectvalue(new BigDecimal(0));
-                    //最终值
-                    tRmActValue.setApportvalue(new BigDecimal(actualvalue));
-                    //折标值
-                    tRmActValue.setStdvalue(BigDecimalUtil.mul(zbxs, actualvalue).setScale(digits, BigDecimal.ROUND_HALF_UP));
-                    //单耗值
-                    tRmActValue.setUcvalue(BigDecimalUtil.divide(actualvalue, sjcl, digits2.intValue()));
-                    tRmActValue.setCrman(opuser);
-                    tRmActValue.setRecTime(DateUtils.dateStr(new Date(),"yyyy-MM-dd HH:mm:ss"));
-                    //修改次数
-                    // tRmActValue.setModifyflag(new Short("0"));
-                    tRmActValueMapper.insert(tRmActValue);
-                }
-            } catch (Exception e) {
-                logger.error("实绩数据计算错误：itemid-" + itemid + ",clock-" + clock);
-                logger.error("--:" + e.getMessage());
-                e.printStackTrace();
+    		// 数据是否已存在
+    		TRmActValue tv = tRmActValueMapper.selectByPrimaryKey(id);
+            if(actualvalue < 0d){
+                TRmCalpointExValue tce = new TRmCalpointExValue();
+                tce.setItemid(itemid);
+                // 水数据实绩存在负数
+                tce.setExtype("11");
+                tce.setCurvalue(new BigDecimal(actualvalue));
+                tce.setClock(clock);
+                tce.setCreatetime(new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date()));
+                tce.setBz("实绩数据运算出现负数");
+                tRmCalpointExValueService.add(tce);
             }
-        }
-        return null;
-    }
+    		try {
+    			if(tv!=null){
+    	            tv.setActualvalue(new BigDecimal(actualvalue));
+    	            tv.setApportvalue(BigDecimalUtil.add(tv.getCorrectvalue()!=null?tv.getCorrectvalue().doubleValue():0d, actualvalue).setScale(digits, BigDecimal.ROUND_HALF_UP));
+    	            // 折标值
+    	            tv.setStdvalue(BigDecimalUtil.mul(zbxs, tv.getApportvalue().doubleValue()).setScale(digits, BigDecimal.ROUND_HALF_UP));
+    	            //单耗值
+    	            tv.setUcvalue(BigDecimalUtil.divide(tv.getApportvalue().doubleValue(), sjcl, digits2.intValue()));
+    	            tv.setUptime(DateUtils.dateStr(new Date(),"yyyy-MM-dd HH:mm:ss"));
+    	            tv.setUserid(opuser);
+    	            tRmActValueMapper.updateByPrimaryKeySelective(tv);
+    			}else{
+    	            TRmActValue tRmActValue = new TRmActValue();
+    	            tRmActValue.setItemid(itemid);
+    	            tRmActValue.setClock(clock);
+    	            tRmActValue.setTimegranid(timegranid);
+    	            //计算值
+    	            tRmActValue.setActualvalue(new BigDecimal(actualvalue));
+    	            //修正值
+    	            tRmActValue.setCorrectvalue(new BigDecimal(0));
+    	            //最终值
+    	            tRmActValue.setApportvalue(new BigDecimal(actualvalue));
+    	            //折标值
+    	            tRmActValue.setStdvalue(BigDecimalUtil.mul(zbxs, actualvalue).setScale(digits, BigDecimal.ROUND_HALF_UP));
+    	            //单耗值
+    	            tRmActValue.setUcvalue(BigDecimalUtil.divide(actualvalue, sjcl, digits2.intValue()));
+    	            tRmActValue.setCrman(opuser);
+    	            tRmActValue.setRecTime(DateUtils.dateStr(new Date(),"yyyy-MM-dd HH:mm:ss"));
+    	            //修改次数
+    	            // tRmActValue.setModifyflag(new Short("0"));
+    	            tRmActValueMapper.insert(tRmActValue);
+    			}
+    		} catch (Exception e) {
+				logger.error("实绩数据计算错误：itemid-" + itemid + ",clock-" + clock);
+				logger.error("--:" + e.getMessage());
+				e.printStackTrace();
+			}
+		}
+		return null;
+	}
 
     @Override
     public int getCount(Map<String, Object> params) {

src/main/java/com/steerinfo/ems/trmcalpoint/service/impl/TRmCalpointServiceImpl.java

@@ -19,6 +19,8 @@ import com.steerinfo.ems.emswaihoursumtab1.mapper.EmsWAiHourSumTab1Mapper;
 import com.steerinfo.ems.emswaihoursumtab1.model.EmsWAiHourSumTab1;
 import com.steerinfo.ems.emswaihoursumtab1org.mapper.EmsWAiHourSumTab1OrgMapper;
 import com.steerinfo.ems.emswaihoursumtab1org.model.EmsWAiHourSumTab1Org;
+import com.steerinfo.ems.emswebsocketlog.model.EmsWebsocketLog;
+import com.steerinfo.ems.emswebsocketlog.service.IEmsWebsocketLogService;
 import com.steerinfo.ems.formula.mapper.FormulaMapper;
 import com.steerinfo.ems.trmcalpoint.mapper.TRmCalpointMapper;
 import com.steerinfo.ems.trmcalpoint.model.TRmCalpoint;
@@ -305,6 +307,12 @@ public class TRmCalpointServiceImpl extends BaseServiceImpl<TRmCalpoint, String>
         return pageInfo;
     }
 
+    @Autowired
+    IEmsWebsocketLogService emsWebsocketLogService;
+    /**
+     *     每一种消息类型发送只存储一次
+     */
+    StringBuffer[] socketMessages;
     @Override
     /**
      *  动力、水小时表定时统计（自动补全24小时内的小时用量值）
@@ -320,6 +328,11 @@ public class TRmCalpointServiceImpl extends BaseServiceImpl<TRmCalpoint, String>
         List<TRmCalpoint> l = tRmCalpointMapper.selectLikeByParameters(m);
         int size = 0;
         if (l != null && l.size() > 0) {
+            List<EmsWebsocketLog> websocketLogs =new ArrayList<>();
+            socketMessages = new StringBuffer[12];
+            for(int i=0;i<socketMessages.length ;i++){
+                socketMessages[i] = new StringBuffer();
+            }
             size = l.size();
             Calendar cal = Calendar.getInstance();
             cal.add(Calendar.HOUR_OF_DAY, -2);
@@ -467,8 +480,36 @@ public class TRmCalpointServiceImpl extends BaseServiceImpl<TRmCalpoint, String>
                     tce.setCreatetime(new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date()));
                     tce.setBz("历史用量值更新失败，clock：" + clock1 + ",tag:" + tag + ",table:" + table);
                     tRmCalpointExValueService.add(tce);
+                    socketMessages[7].append(itemid + ",");
                 }
             }
+            for(int o =0;o<socketMessages.length; o++){
+                if(socketMessages[o] != null && socketMessages[o].length()>0
+                        && !"null".equals(socketMessages[o].toString())
+                        && !"".equals(socketMessages[o].toString()))
+                {
+                    switch (o){
+                        case 1: socketMessages[1].append("十分钟数据变小"); break;
+                        case 2: socketMessages[2].append("配置不能为空"); break;
+                        case 3: socketMessages[3].append("十分钟表字段配置错误"); break;
+                        case 4: socketMessages[4].append("准点值读取失败"); break;
+                        case 5: socketMessages[5].append("十分钟数据不足以统计"); break;
+                        case 7: socketMessages[7].append("历史用量值更新失败"); break;
+                        case 8: socketMessages[8].append("十分钟数据查询错误"); break;
+                        case 9: socketMessages[9].append("用量数据增大超过限值"); break;
+                        case 10: socketMessages[10].append("用量数据低于最小值"); break;
+                    }
+                    EmsWebsocketLog websocketLog = new EmsWebsocketLog();
+                    websocketLog.setMessage(socketMessages[o].toString());
+                    websocketLog.setTitle("计控处");
+                    websocketLog.setState("0");
+                    websocketLog.setTips("计量点异常数据通知");
+                    websocketLogs.add(websocketLog);
+                }
+            }
+            if (websocketLogs != null && websocketLogs.size() > 0) {
+                emsWebsocketLogService.pushMessageByDataException(websocketLogs);
+            }
         }
         logger.info(new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date()) + " 动力、水小时表统计完毕,个数：" + size);
     }
@@ -677,6 +718,7 @@ public class TRmCalpointServiceImpl extends BaseServiceImpl<TRmCalpoint, String>
             tce.setCreatetime(new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date()));
             tce.setBz("配置不能为空");
             tRmCalpointExValueService.add(tce);
+            socketMessages[2].append(itemid + ",");
             return "配置不能为空";
         }
         String[] tens = tenvs.split("\\.");
@@ -688,6 +730,7 @@ public class TRmCalpointServiceImpl extends BaseServiceImpl<TRmCalpoint, String>
             tce.setCreatetime(new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date()));
             tce.setBz("十分钟表字段配置错误");
             tRmCalpointExValueService.add(tce);
+            socketMessages[3].append(itemid + ",");
             return "十分钟表字段配置错误";
         }
         String tenTab = tens[0];
@@ -718,6 +761,7 @@ public class TRmCalpointServiceImpl extends BaseServiceImpl<TRmCalpoint, String>
             tce.setCreatetime(new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date()));
             tce.setBz("十分钟数据查询错误，clock：" + clock1 + ",col:" + tenCol + ",table:" + tenTab);
             tRmCalpointExValueService.add(tce);
+            socketMessages[8].append(itemid + ",");
             return "十分钟数据查询错误";
         }
         if (lt == null || lt.size() < 1) {
@@ -728,6 +772,7 @@ public class TRmCalpointServiceImpl extends BaseServiceImpl<TRmCalpoint, String>
             tce.setCreatetime(new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date()));
             tce.setBz("十分钟数据不足以统计，clock：" + clock1 + ",col:" + tenCol + ",table:" + tenTab);
             tRmCalpointExValueService.add(tce);
+            socketMessages[5].append(itemid + ",");
             return "十分钟数据不足以统计";
         } else if (lt.size() == 1) {
             TRmCalpointExValue tce = new TRmCalpointExValue();
@@ -737,6 +782,7 @@ public class TRmCalpointServiceImpl extends BaseServiceImpl<TRmCalpoint, String>
             tce.setCreatetime(new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date()));
             tce.setBz("十分钟数据不足以统计，clock：" + clock1 + ",col:" + tenCol + ",table:" + tenTab);
             tRmCalpointExValueService.add(tce);
+            socketMessages[5].append(itemid + ",");
             // 当前小时准点值，水准点起始值从10分钟开始计算
             if (tc.getEnergytypeid().equalsIgnoreCase("W")) {
                 sql = "select " + tenCol + " from " + tenTab + " where to_char(tim, 'YYYY-MM-DD HH24:mi') = '" + clock + ":10'";
@@ -774,6 +820,7 @@ public class TRmCalpointServiceImpl extends BaseServiceImpl<TRmCalpoint, String>
                 tce.setCreatetime(new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date()));
                 tce.setBz("准点值读取失败，clock：" + clock + ",col:" + tenCol + ",table:" + tenTab);
                 tRmCalpointExValueService.add(tce);
+                socketMessages[4].append(itemid + ",");
                 logger.error("准点数据查询失败，clock:" + clock);
             }
         } else {
@@ -815,6 +862,7 @@ public class TRmCalpointServiceImpl extends BaseServiceImpl<TRmCalpoint, String>
                                 //tce.setBz("十分钟水数据增大超过500，clock：" + clock1 + ",col:" + tenCol + ",table:" + tenTab);
                                 tce.setBz("用量数据增大超过限值"+maxValue+"，clock：" + clock1 + ",col:" + tenCol + ",table:" + tenTab);
                                 tRmCalpointExValueService.add(tce);
+                                socketMessages[9].append(itemid + ",");
                             }else if(tenval.doubleValue() < new BigDecimal(minValue).doubleValue()){
                                 // 记录异常数据
                                 TRmCalpointExValue tce = new TRmCalpointExValue();
@@ -828,6 +876,7 @@ public class TRmCalpointServiceImpl extends BaseServiceImpl<TRmCalpoint, String>
                                 //tce.setBz("十分钟水数据增大超过500，clock：" + clock1 + ",col:" + tenCol + ",table:" + tenTab);
                                 tce.setBz("用量数据低于最小值"+minValue+"，clock：" + clock1 + ",col:" + tenCol + ",table:" + tenTab);
                                 tRmCalpointExValueService.add(tce);
+                                socketMessages[10].append(itemid + ",");
                             }
                         } else {
                             if (tc.getEnergytypeid().equalsIgnoreCase("W")) {
@@ -851,6 +900,7 @@ public class TRmCalpointServiceImpl extends BaseServiceImpl<TRmCalpoint, String>
                             tce.setCreatetime(new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date()));
                             tce.setBz("十分钟数据变小，clock：" + clock1 + ",col:" + tenCol + ",table:" + tenTab);
                             tRmCalpointExValueService.add(tce);
+                            socketMessages[1].append(itemid + ",");
                         }
                     //} else {
                     //    // 大于等于0
@@ -936,6 +986,7 @@ public class TRmCalpointServiceImpl extends BaseServiceImpl<TRmCalpoint, String>
                 tce.setCreatetime(new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date()));
                 tce.setBz("准点值读取失败，clock：" + clock + ",col:" + tenCol + ",table:" + tenTab);
                 tRmCalpointExValueService.add(tce);
+                socketMessages[4].append(itemid + ",");
                 logger.error("准点数据查询失败，clock:" + clock);
             }
         }

src/main/java/com/steerinfo/ftp/securitytype/mapper/SecurityTypeMapper.xml

@@ -82,9 +82,9 @@
         and SECURITY_NAME LIKE '%${securityName}%'
       </if>
       <if test="securityInfo != null and securityInfo != ''">
-        and SECURITY_INFO is null
+        and (SECURITY_INFO is null
         OR SECURITY_INFO = ''
-        OR REGEXP_LIKE(SECURITY_INFO,'(${securityInfo})')
+        OR REGEXP_LIKE(SECURITY_INFO,'(${securityInfo})'))
       </if>
       <if test="seqno != null">
         and SEQNO = #{seqno}