数据库连接设置时区、工单下发返回重点点位标识、下发人、下发时间

xiangpei

2024-07-26 a106ddc2b1b25c8891cb0a15a775bd39b5bda2ff

数据库连接设置时区、工单下发返回重点点位标识、下发人、下发时间

 ycl-pojo/src/main/java/com/ycl/platform/domain/vo/WorkOrderVO.java

@@ -5,6 +5,7 @@
import com.ycl.platform.domain.entity.WorkOrder;

import java.time.LocalDateTime;
import java.util.Date;
import java.util.List;
import org.springframework.lang.NonNull;
import org.springframework.beans.BeanUtils;
@@ -41,6 +42,13 @@
     */
    private Integer pointId;

    private String pointTag;

    /**
     * 是否重点点位
     */
    private Boolean important;

    /** 故障类型 */
    private String errorType;

@@ -64,6 +72,13 @@
    /** 0未超时 1超时 */
    private Integer overtime;

    /** 下发时间 */
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    private Date distributeTime;

    /** 下发人 */
    private String realName;

    public static WorkOrderVO getVoByEntity(@NonNull WorkOrder entity, WorkOrderVO vo) {
        if(vo == null) {
            vo = new WorkOrderVO();

 ycl-server/src/main/java/com/ycl/platform/service/impl/WorkOrderServiceImpl.java

@@ -24,6 +24,7 @@
import com.ycl.utils.SecurityUtils;
import com.ycl.utils.redis.RedisCache;
import com.ycl.utils.uuid.IdUtils;
import constant.PointConfigConstants;
import enumeration.general.*;
import lombok.RequiredArgsConstructor;
import org.apache.commons.lang3.ArrayUtils;
@@ -63,6 +64,7 @@
    private final WorkOrderDistributeRecordMapper workOrderDistributeRecordMapper;

    private final String DISTRIBUTE_LOCK_KEY = "distributeLock";
    private final static String IMPORTANT = "important";

    @Autowired
    private RedisCache redisCache;
@@ -257,8 +259,12 @@
    @Override
    public Result distributePage(DistributeWorkOrderQuery query) {
        IPage<WorkOrderVO> page = PageUtil.getPage(query, WorkOrderVO.class);
        // todo 关键词搜索
        baseMapper.distributePage(page, query);
        page.getRecords().stream().forEach(workOrder -> {
            if (StringUtils.hasText(workOrder.getPointTag()) && workOrder.getPointTag().contains(IMPORTANT)) {
                workOrder.setImportant(Boolean.TRUE);
            }
        });
        return Result.ok().data(page).total(page.getTotal());
    }


 ycl-server/src/main/resources/application-dev.yml

@@ -7,7 +7,7 @@
  # 版权年份
  copyrightYear: 2024
  # 文件路径 示例（ Windows配置D:/zgyw/uploadPath，Linux配置 /home/zgyw/uploadPath）
  profile: D:/zgyw/uploadPath
  profile: E:/ycl/zgyw/uploadPath
  # 获取ip地址开关
  addressEnabled: false
  # 验证码类型 math 数字计算 char 字符验证
@@ -17,7 +17,7 @@
# 开发环境配置
server:
  # 服务器的HTTP端口，默认为8080
  port: 8080
  port: 8085
  servlet:
    # 应用的访问路径
    context-path: /
@@ -36,7 +36,7 @@
spring:
  # 数据源配置
  datasource:
    url: jdbc:mysql://101.35.247.188:3306/zgyw?useUnicode=true&characterEncoding=utf8&autoReconnect=true&useSSL=false
    url: jdbc:mysql://101.35.247.188:3306/zgyw?useUnicode=true&characterEncoding=utf8&autoReconnect=true&useSSL=false&serverTimezone=GMT%2B8
    username: root
    password: ycl@202466
    type: com.alibaba.druid.pool.DruidDataSource

 ycl-server/src/main/resources/application-prod.yml

@@ -36,7 +36,7 @@
spring:
  # 数据源配置
  datasource:
    url: jdbc:mysql://101.35.247.188:3306/zgyw?useUnicode=true&characterEncoding=utf8&autoReconnect=true&useSSL=false
    url: jdbc:mysql://101.35.247.188:3306/zgyw?useUnicode=true&characterEncoding=utf8&autoReconnect=true&useSSL=false&serverTimezone=GMT%2B8
    username: root
    password: ycl@202466
    type: com.alibaba.druid.pool.DruidDataSource

 ycl-server/src/main/resources/mapper/zgyw/WorkOrderMapper.xml

@@ -44,21 +44,27 @@

    <select id="distributePage" resultType="com.ycl.platform.domain.vo.WorkOrderVO">
        SELECT
        wo.*,
        u.unit_name,
        p.yw_person_name
            wo.*,
            u.unit_name,
            p.yw_person_name,
            yp.point_tag,
            odr.create_time as distributeTime,
            su.nick_name as realName
        FROM
        t_work_order wo
        LEFT JOIN t_yw_unit u ON wo.unit_id = u.id and u.deleted = 0
        LEFT JOIN t_yw_people p ON wo.yw_people_id = p.id and p.deleted = 0
        where
        wo.deleted = 0
        <if test="query.unitId != null">
            AND wo.unit_id = #{query.unitId}
        </if>
        <if test="query.status != null and query.status != ''">
            AND wo.status = #{query.status}
        </if>
            t_work_order wo
                LEFT JOIN t_yw_unit u ON wo.unit_id = u.id and u.deleted = 0
                LEFT JOIN t_yw_people p ON wo.yw_people_id = p.id and p.deleted = 0
                INNER JOIN t_yw_point yp ON yp.id = wo.point_id AND yp.deleted = 0
                LEFT JOIN t_work_order_distribute_record odr ON odr.work_order_id = wo.id AND odr.deleted = 0
                LEFT JOIN sys_user su ON su.user_id = odr.user_id
        WHERE
            wo.deleted = 0
            <if test="query.unitId != null">
                AND wo.unit_id = #{query.unitId}
            </if>
            <if test="query.status != null and query.status != ''">
                AND wo.status = #{query.status}
            </if>
        ORDER BY wo.create_time DESC
    </select>