即时消息时间出现负数的问题修改

yangys

2025-11-18 8e944cfabb253fc2556588e308e282586043f7b0

即时消息时间出现负数的问题修改

 smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/mapper/StateMapper.java

@@ -14,10 +14,18 @@
     * æœ€åŽä¸€ä¸ªä¸æ˜¯æŒ‡å®šå€¼çš„数据
     * @param workstationId å·¥ä½id
     * @param value æŒ‡å®šå€¼
     * @param beforeTime åœ¨æŒ‡å®šæ—¶é—´ä¹‹å‰
     * @return çŠ¶æ€è®°å½•
     */
    StateVO lastStateNotEqValue(@Param("workstationId")long workstationId, @Param("value")Integer value);
    StateVO lastStateNotEqValueLtTime(@Param("workstationId")long workstationId, @Param("value")Integer value,@Param("beforeTime")long beforeTime);

    /**
     * æŸ¥è¯¢å¤§äºŽæŒ‡å®šæ—¶é—´ç¬¬ä¸€ä¸ªçŠ¶æ€å€¼
     * @param workstationId å·¥ä½id
     * @param value æŒ‡å®šå€¼
     * @param time æ—¶é—´æˆ³(大于该时间的数据)
     * @return çŠ¶æ€æ•°æ®å¯¹è±¡
     */
    StateVO firstStateEqValueGtTime(@Param("workstationId")long workstationId, @Param("value")Integer value, @Param("time")Long time);

    StateVO firstStateEqValue(@Param("workstationId")long workstationId, @Param("value")Integer value);

 smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/service/RealTimeDataService.java

@@ -58,7 +58,8 @@
            }*/
            Integer val = Integer.parseInt(statusDTO.getV());

            StateVO diffStatusVO = stateMapper.lastStateNotEqValue(workstationId,val);
            //StateVO diffStatusVO = stateMapper.lastStateNotEqValue(workstationId,val);
            StateVO diffStatusVO = stateMapper.lastStateNotEqValueLtTime(workstationId,val,statusDTO.getT());
            StateVO tempStatusVO;
            if(diffStatusVO != null) {
                tempStatusVO = stateMapper.firstStateEqValueGtTime(workstationId, val, diffStatusVO.getTime());

 smart-man-boot/src/main/java/com/qianwen/smartman/modules/smis/service/impl/WorkstationServiceImpl.java

@@ -605,7 +605,7 @@
    @Override 
    public IPage<WorkstationRealTimeStatusVO> getRealTimeStatus(WorkstationRealTimeStatusDTO dto, Query query) {
        List<String> workStationGroupIdList = dto.getWorkStationGroupIdList();
        if (workStationGroupIdList.size() == 1) {
        if (workStationGroupIdList !=null && workStationGroupIdList.size() == 1) {
            List<String> workStationGroupIdByParentList = getCommonGroupIds(workStationGroupIdList, new ArrayList<>()).stream().map(item -> {
                return String.valueOf(item.getId());
            }).collect(Collectors.toList());
@@ -673,7 +673,7 @@

    @Override 
    public IPage<Workstation> listWorkStationOnShiftIndex(List<String> ids, LocalDate localDate, Query query, Integer shift, Integer type) {
        return ((WorkstationMapper) this.baseMapper).listWorkStationOnShiftIndex(Condition.getPage(query), Integer.valueOf(localDate.getYear()), DateUtil.formatDate(localDate), shift, type, ids);
        return this.baseMapper.listWorkStationOnShiftIndex(Condition.getPage(query), localDate.getYear(), DateUtil.formatDate(localDate), shift, type, ids);
    }

    @Override 
@@ -1202,7 +1202,6 @@
            if (Func.isEmpty(i.getMachineId())) {
                filter = false;
            }

            List<RealTimeStatusVO> properties = realTimePropertiesMap.get(i.getId());
            if (Func.isNotEmpty(deviceStatus)) {
                if (Func.isEmpty(properties)) {

 smart-man-boot/src/main/resources/application-dev.yml

@@ -1,14 +1,15 @@
# redis
redis:
  host: 120.46.212.231
  host: localhost
  port: 6379
  password: Kknd_1234
  password: root
  database: 2
  ssl: false
# database config
datasource:
  type: mysql
  url: 120.46.212.231
  #url: 120.46.212.231
  url: localhost
  port: 3306
  database: smartman
  username: qwmdc

 smart-man-boot/src/main/resources/application-test.yml

@@ -3,7 +3,7 @@
  host: 120.46.212.231
  port: 6379
  password: root
  database: 11
  database: 2
  ssl: false
# database config
datasource:

 smart-man-boot/src/main/resources/com/qianwen/smartman/modules/mdc/mapper/StateMapper.xml

@@ -26,8 +26,8 @@
    <sql id="all_columns">
        workstation_id,value_collect,calendar_code,factory_year,factory_month,factory_date,factory_week,shift_index,shift_time_type,wcs,rps,is_fix_point,is_sync,is_plan,feedback_point_type,feedback_id,is_deleted,employee_id
    </sql>
    <select id="lastStateNotEqValue" resultMap="voResultMap">
        select <include refid="all_columns" /> from root.f2.state_${workstationId} where is_fix_point=false and is_deleted=false and wcs &lt;&gt;#{value} and wcs &gt; 0 order by time desc limit 1 align by device
    <select id="lastStateNotEqValueLtTime" resultMap="voResultMap">
        select <include refid="all_columns" /> from root.f2.state_${workstationId} where is_fix_point=false and is_deleted=false and wcs &lt;&gt;#{value} and wcs &gt; 0 and time &lt; #{beforeTime} order by time desc limit 1 align by device
    </select>

    <select id="firstStateEqValueGtTime" resultMap="voResultMap">

 smart-man-boot/src/main/resources/com/qianwen/smartman/modules/smis/mapper/WorkstationMapper.xml

@@ -139,6 +139,7 @@
        WHERE w.is_deleted = 0
        AND pc.is_deleted = 0
        AND pdc.is_deleted = 0

        AND w.type = #{type}
        <if test="ids != null and ids.size() > 0">
            AND w.id IN

 smart-man-boot/src/main/resources/rebel.xml

ÎļþÒÑɾ³ý