Merge remote-tracking branch 'origin/master'

signal-optimize-service/src/main/java/net/wanji/opt/entity/syslog/SysOptimizeLog.java

@@ -51,4 +51,9 @@ public class SysOptimizeLog implements Serializable {
      * 请求时间
      */
     private String queryTime;
+
+    /**
+     * 请求信息
+     */
+    private String dataInfo;
 }

signal-optimize-service/src/main/java/net/wanji/opt/servicev2/syslog/impl/SysLogServerImpl.java

@@ -32,15 +32,49 @@ public class SysLogServerImpl extends ServiceImpl<SysLogMapper, SysOptimizeLog>
     @Override
     public JSONObject findSysOptimizeLog(String crossId,String startTime,String endTime,Integer pageNum,Integer pageSize) {
         List<SysOptimizeLog> list = sysLogMapper.findSysOptimizeLog(crossId,startTime,endTime);
+        List<SysOptimizeLog> results =  new ArrayList<>();
+        for(SysOptimizeLog temp : list){
+            switch (temp.getCommandType()) {
+                case "1":
+                    JSONObject temp1 = JSONObject.parseObject(temp.getDataInfo());
+                    if (temp1.get("command").equals(1)) {
+                        temp.setCommandType("步进控制");
+                    } else if (temp1.get("command").equals(0)) {
+                        temp.setCommandType("步进恢复");
+                    }
+                    break;
+                case "2":
+                    temp.setCommandType("恢复时间表");
+                    break;
+                case "3":
+                    JSONObject temp2 = JSONObject.parseObject(temp.getDataInfo());
+                    if (temp2.get("command").equals(1)) {
+                        temp.setCommandType("相位锁定");
+                    } else if (temp2.get("command").equals(0)) {
+                        temp.setCommandType("相位解锁");
+                    }
+                    break;
+                case "4":
+                    temp.setCommandType("临时方案下发");
+                    break;
+                case "5":
+                    temp.setCommandType("定时任务恢复失败");
+                    break;
+                default:
+                    temp.setCommandType("其它操作");
+                    break;
+            }
+            results.add(temp);
+        }
         List<SysOptimizeLog> collect = new ArrayList<>();
-        if(CollectionUtils.isNotEmpty(list)){
-            collect = list.stream().skip((pageNum - 1) * pageSize).limit(pageSize).collect(Collectors.toList());
+        if(CollectionUtils.isNotEmpty(results)){
+            collect = results.stream().skip((pageNum - 1) * pageSize).limit(pageSize).collect(Collectors.toList());
         }
         JSONObject result = new JSONObject();
-        result.put("fullDataList",list);
+        result.put("fullDataList",results);
         result.put("pageList",collect);
-        result.put("totalPage",Math.ceil((double) list.size() / pageSize));
-        result.put("totalSize",list.size());
+        result.put("totalPage",Math.ceil((double) results.size() / pageSize));
+        result.put("totalSize",results.size());
         return result;
     }
 }

signal-optimize-service/src/main/resources/mapper/syslog/SysLogMapper.xml

@@ -10,11 +10,12 @@
         <result property="commandType" column="command_type"></result>
         <result property="commandResult" column="command_result"></result>
         <result property="queryTime" column="query_time"></result>
+        <result property="dataInfo" column="data_info"></result>
     </resultMap>
 
     <select id="findSysOptimizeLog" resultMap="SysOptimizeLogMap" parameterType="String">
-        SELECT t.query_time,t.ip ,t.cross_id,t1.name ,t.`operate-user`,
-               case t.command_type when 1 then '步进控制/恢复(公用)' when 2 then '恢复时间表(公用)' when 3 then '相位锁定/解锁(公用)' when 4 then '临时方案下发(公用)' when 5 then '定时任务恢复失败' end as command_type ,
+        SELECT t.query_time,t.ip ,t.cross_id,t1.name ,t.`operate-user`,t.data_info,
+               t.command_type ,
                case t.command_result when 1 then '成功' when 2 then '失败' when 3 then '停止失败任务解锁' end as command_result
         FROM t_signal_utc_jinan.t_signal_command_log t
         left join t_signal_utc_jinan.t_cross_info t1 on t.cross_id = t1.id