[update] 优化信号机状态定时任务

signal-control-service/src/main/java/net/wanji/web/entity/TDeviceStatusLog.java

 package net.wanji.web.entity;
 
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
@@ -11,6 +13,7 @@ import java.util.Date;
  */
 @Data
 public class TDeviceStatusLog {
+    @TableId(type = IdType.AUTO)
     @ApiModelProperty(value = "id")
     private Integer id;
     @ApiModelProperty(value = "设备代码")

signal-control-service/src/main/java/net/wanji/web/task/SignalStatusTask.java

@@ -4,8 +4,9 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import net.wanji.common.framework.rest.JsonViewObject;
+import net.wanji.common.utils.tool.BeanMapUtils;
+import net.wanji.databus.vo.SignalStatusVO;
 import net.wanji.feign.service.UtcFeignClients;
-import net.wanji.web.dto.SignalStatusLogDTO;
 import net.wanji.web.entity.TCrossControlHist;
 import net.wanji.web.entity.TDeviceStatusInfo;
 import net.wanji.web.entity.TDeviceStatusLog;
@@ -18,6 +19,7 @@ import org.springframework.stereotype.Component;
 import org.springframework.transaction.annotation.Transactional;
 
 import java.util.List;
+import java.util.Map;
 import java.util.Objects;
 
 /**
@@ -42,11 +44,13 @@ public class SignalStatusTask {
                 log.error("定时任务同步信号机设备状态utcService调用异常");
                 return;
             }
-            List<SignalStatusLogDTO> content = (List<SignalStatusLogDTO>) jsonViewObject.getContent();
-            content.forEach(signalStatusLogDTO -> {
-                String signalId = signalStatusLogDTO.getSignalId();
-                Integer currentSignalStatus = signalStatusLogDTO.getStatus() == null ? 0 : signalStatusLogDTO.getStatus();
-                Integer currentFaultType = signalStatusLogDTO.getFaultType() == null ? 0 : signalStatusLogDTO.getFaultType();
+            List<Map<String, Object>> source = (List<Map<String, Object>>) jsonViewObject.getContent();
+            List<SignalStatusVO> content = BeanMapUtils.mapsToObjects(source, SignalStatusVO.class);
+            content.forEach(signalStatusVO -> {
+                String signalId = signalStatusVO.getSignalId();
+                String crossId = signalStatusVO.getCrossId();
+                Integer currentSignalStatus = signalStatusVO.getStatus() == null ? 0 : signalStatusVO.getStatus();
+                Integer currentFaultType = signalStatusVO.getFaultType() == null ? 0 : signalStatusVO.getFaultType();
 
                 // 更新数据库状态
                 LambdaQueryWrapper<TDeviceStatusInfo> lambdaQueryWrapper = new LambdaQueryWrapper<>();
@@ -58,9 +62,9 @@ public class SignalStatusTask {
                         tDeviceStatusInfo.setFaultType(currentFaultType);
                         tDeviceStatusMapper.updateById(tDeviceStatusInfo);
                     }
-                    insertDeviceStatusLog(signalStatusLogDTO, signalId, currentSignalStatus, currentFaultType);
+                    insertDeviceStatusLog(signalStatusVO, crossId, currentSignalStatus, currentFaultType);
                 }
-                insertControlHist(signalStatusLogDTO);
+                insertControlHist(signalStatusVO);
             });
         } catch (Exception e) {
             log.error("定时任务同步信号机设备状态远程utcService调用异常", e);
@@ -70,12 +74,12 @@ public class SignalStatusTask {
     /**
      * 插入控制历史表
      *
-     * @param signalStatusLogDTO
+     * @param signalStatusVO
      */
-    private void insertControlHist(SignalStatusLogDTO signalStatusLogDTO) {
+    private void insertControlHist(SignalStatusVO signalStatusVO) {
         // 更新控制历史表
-        String crossId = signalStatusLogDTO.getCrossId();
-        Integer controlType = signalStatusLogDTO.getControlType();
+        String crossId = signalStatusVO.getCrossId();
+        Integer controlType = signalStatusVO.getControlType();
         TCrossControlHist tCrossControlHist = controlHistMapper.selectRecentOne(crossId);
         if (Objects.nonNull(tCrossControlHist) && !Objects.equals(controlType, tCrossControlHist.getType())) {
             controlHistMapper.insertOne(crossId, controlType, "未知");
@@ -85,26 +89,28 @@ public class SignalStatusTask {
     /**
      * 信号机状态插入设备日志表
      *
-     * @param signalStatusLogDTO
-     * @param signalId
+     * @param signalStatusVO
+     * @param crossId
      * @param currentSignalStatus
      * @param currentFaultType
      */
-    private void insertDeviceStatusLog(SignalStatusLogDTO signalStatusLogDTO, String signalId, Integer currentSignalStatus, Integer currentFaultType) {
+    private void insertDeviceStatusLog(SignalStatusVO signalStatusVO, String crossId, Integer currentSignalStatus, Integer currentFaultType) {
         // 插入日志表
-        TDeviceStatusLog tDeviceStatusLogInfoDB = tDeviceStatusLogMapper.selectLastOne(signalId);
+        TDeviceStatusLog tDeviceStatusLogInfoDB = tDeviceStatusLogMapper.selectLastOne(crossId);
         // DB数据是故障，如果当前正常非故障，状态为  FaultType=100 故障已处理
         if (Objects.nonNull(tDeviceStatusLogInfoDB) || tDeviceStatusLogInfoDB.getFaultType() != 0 && currentFaultType == 0) {
             tDeviceStatusLogInfoDB.setStatus(currentSignalStatus);
             tDeviceStatusLogInfoDB.setFaultType(100);
+            tDeviceStatusLogInfoDB.setId(null);
             tDeviceStatusLogMapper.insert(tDeviceStatusLogInfoDB);
         } else {
             TDeviceStatusLog tDeviceStatusLog = new TDeviceStatusLog();
-            tDeviceStatusLog.setCode(signalId);
-            tDeviceStatusLog.setName(signalStatusLogDTO.getSignalId());
+            tDeviceStatusLog.setCode(crossId);
+            tDeviceStatusLog.setName(signalStatusVO.getSignalId());
             tDeviceStatusLog.setType(1);
-            tDeviceStatusLog.setStatus(signalStatusLogDTO.getStatus());
+            tDeviceStatusLog.setStatus(signalStatusVO.getStatus());
             tDeviceStatusLog.setFaultType(currentFaultType);
+            tDeviceStatusLog.setId(null);
             tDeviceStatusLogMapper.insert(tDeviceStatusLog);
         }
     }

signal-control-service/src/main/resources/mapper/TDeviceStatusLogMapper.xml

@@ -2,14 +2,24 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
 <mapper namespace="net.wanji.web.mapper.TDeviceStatusLogMapper">
 
-    <select id="selectLastOne">
+    <resultMap type="net.wanji.web.entity.TDeviceStatusLog" id="BaseResultMap">
+        <result property="id" column="id"/>
+        <result property="code" column="code"/>
+        <result property="name" column="name"/>
+        <result property="type" column="type"/>
+        <result property="status" column="status"/>
+        <result property="faultType" column="fault_type"/>
+        <result property="gmtCreate" column="gmt_create"/>
+    </resultMap>
+
+    <select id="selectLastOne" resultMap="BaseResultMap" parameterType="String">
         select id, code, name, type, status,fault_type, gmt_create
         from t_device_status_log
         <where>
             <if test="code != null and code != ''">
                 and code = #{code}
             </if>
-            and gmt_create = select max(gmt_create) from t_device_status_log
+            group by gmt_create desc limit 1
         </where>
     </select>
 </mapper>
\ No newline at end of file

signal-utc-service/src/main/java/net/wanji/utc/service/runninginfo/impl/HkRunningStatusServiceImpl.java

@@ -48,7 +48,7 @@ public class HkRunningStatusServiceImpl implements HkRunningStatusService {
                 JSONObject object = JSON.parseObject(strResult);
                 Object o = object.get("code");
                 // 多信号机情况下，跳过返回信息不成功的获取返回消息成功的信号机数据
-                if (!Objects.equals(o, 0)) {
+                if (!Objects.equals(String.valueOf(o), "0")) {
                     continue;
                 }
                 if (Constants.HK_SUCCESS_CODE.equals(object.getInteger(Constants.HK_CODE_KEY))) {
@@ -61,16 +61,19 @@ public class HkRunningStatusServiceImpl implements HkRunningStatusService {
                         po.setStatus(transferStatus(obj.getInteger("state")));
                         // 告警信息
                         Integer hasFault = obj.getInteger("hasFault");
-                        if (hasFault == 0) {
+//                        if (hasFault == 0) {
                             po.setFaultType(hasFault);
-                        }
+//                        }
                         // 从Redis中查询控制类型
                         String lightsStatusVOStr = redisUtil.getHash(RedisKeyConst.KEY_PREFIX + RedisKeyConst.LIGHTS_STATUS,
                                 baseCrossInfo.getManufacturerCode() + Constants.SEPARATOR_UNDER_LINE + po.getSignalId());
                         LightsStatusVO lightsStatusVO = JSON.parseObject(lightsStatusVOStr, LightsStatusVO.class);
+                        Integer controlType = 1;
+                        if (Objects.nonNull(lightsStatusVO)) {
                             String runMode = lightsStatusVO.getRunMode();
                             int runModeInt = Integer.parseInt(runMode);
-                        Integer controlType = HkControlModeEnum.getCodeByHkCode(runModeInt);
+                            controlType = HkControlModeEnum.getCodeByHkCode(runModeInt);
+                        }
                         po.setControlType(controlType);
                         result.add(po);
                     }

wj-common/src/main/java/net/wanji/common/utils/tool/BeanMapUtils.java

@@ -76,10 +76,10 @@ public class BeanMapUtils {
         try {
             bean = clazz.newInstance();
             for (Field field : getAllFields(clazz)) {
-                if (map.containsKey(humpToLine(field.getName()))) {
+                if (map.containsKey(field.getName())) {
                     boolean flag = field.isAccessible();
                     field.setAccessible(true);
-                    Object object = map.get(humpToLine(field.getName()));
+                    Object object = map.get(field.getName());
                     if (object != null) {
                         if (field.getType().isAssignableFrom(object.getClass())) {
                             field.set(bean, object);

wj-databus/src/main/resources/mapper/CrossInfoMapper.xml

@@ -257,4 +257,14 @@
                 #{id}
             </foreach>
     </select>
+
+    <select id="selectById" resultType="net.wanji.databus.po.CrossInfoPO">
+        select <include refid="baseColumn"/>
+        from t_base_cross_info
+        <where>
+            <if test="id != null and id != ''">
+                id = #{id}
+            </if>
+        </where>
+    </select>
 </mapper>
\ No newline at end of file