新增字段及查询调整

zrj

2024-06-06 d186525f28330a2efb560c4eb9358a0730fbfd8b

新增字段及查询调整

 skjcmanager/skjcmanager-common/src/main/java/cn/gistack/common/utils/IdUtils.java

New file
@@ -0,0 +1,21 @@
package cn.gistack.common.utils;

import java.util.UUID;

public class IdUtils {

    /**
     * 随机生成36位id
     * @return
     */
    public static String getIdBy36(){
        //生成uuid
        String randomId = UUID.randomUUID().toString();
        String trim = randomId.replaceAll("-", "");
        //再拼接4位
        long l = System.currentTimeMillis();
        String time = String.valueOf(l);
        String subTime = time.substring(time.length() - 4);
        return trim + subTime;
    }
}

 skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/hk/entity/HkStaffGaugeMon.java

@@ -2,13 +2,10 @@

import com.baomidou.mybatisplus.annotation.*;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import org.springframework.format.annotation.DateTimeFormat;

import java.io.Serializable;
import java.util.Date;

@@ -28,6 +25,12 @@
     */
    @TableId(value = "id")
    private String id;

    /**
     * 监测id
     */
    @ApiModelProperty(value = "监测id")
    private String gaugeMonId;

    /**
     * 水尺名称
@@ -68,6 +71,7 @@
    /**
     * 虚拟水尺的坐标
     */
    @ApiModelProperty(value = "虚拟水尺的坐标")
    private String markData;

    /**
@@ -137,6 +141,15 @@
    private Date updateTime;

    /**
     * 系统创建时间
     */
    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    @ApiModelProperty(value = "系统创建时间")
    @TableField(value = "sys_create_time",fill = FieldFill.INSERT)
    private Date sysCreateTime;

    /**
     * 删除状态
     */
    @ApiModelProperty(value = "删除状态")

 skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/hk/mapper/HkStaffGaugeMonMapper.xml

@@ -43,6 +43,9 @@
        <if test="hkStaffGaugeMon.endTime !=null and hkStaffGaugeMon.endTime !=''">
            AND DATE_FORMAT(shsgm.update_time,'%Y-%m-%d') &lt;= #{hkStaffGaugeMon.endTime}
        </if>
        <if test="hkStaffGaugeMon.sendTime !=null and hkStaffGaugeMon.sendTime !=''">
            AND DATE_FORMAT(shsgm.update_time,'%Y-%m-%d') &lt;= #{hkStaffGaugeMon.sendTime}
        </if>
        <if test="hkStaffGaugeMon.adCode != null and hkStaffGaugeMon.adCode !='' and hkStaffGaugeMon.adCode !='420000000000'">
            AND (b."ad_code" = #{hkStaffGaugeMon.adCode} or c."ad_code" =#{hkStaffGaugeMon.adCode} or d."ad_code" = #{hkStaffGaugeMon.adCode})
        </if>

 skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/hk/service/impl/HkStaffGaugeMonServiceImpl.java

@@ -1,5 +1,6 @@
package cn.gistack.sm.hk.service.impl;

import cn.gistack.common.utils.IdUtils;
import cn.gistack.sm.hk.entity.HkEvent;
import cn.gistack.sm.hk.entity.HkStaffGaugeMon;
import cn.gistack.sm.hk.mapper.HkStaffGaugeMonMapper;
@@ -64,33 +65,29 @@
        if (null!= jsonArray && jsonArray.size()>0) {
            for (int i = 0; i < jsonArray.size(); i++) {
                HkStaffGaugeMon hkStaffGaugeMon = new HkStaffGaugeMon();
                String id = jsonArray.getJSONObject(i).getString("id");
                // 查询是否已存在
                HkStaffGaugeMon staffGaugeMon = getById(id);
                if (null==staffGaugeMon) {
                    // 设置数据
                    hkStaffGaugeMon.setId(id);
                    hkStaffGaugeMon.setWaterGaugeName(jsonArray.getJSONObject(i).getString("waterGaugeName"));
                    hkStaffGaugeMon.setWaterGaugeCode(jsonArray.getJSONObject(i).getString("waterGaugeCode"));
                    hkStaffGaugeMon.setCameraIndexCode(jsonArray.getJSONObject(i).getString("cameraIndexCode"));
                    hkStaffGaugeMon.setCameraName(jsonArray.getJSONObject(i).getString("cameraName"));
                    hkStaffGaugeMon.setLocation(jsonArray.getJSONObject(i).getString("location"));
                    hkStaffGaugeMon.setMarkPic(jsonArray.getJSONObject(i).getString("markPic"));
                    hkStaffGaugeMon.setMarkData(jsonArray.getJSONObject(i).getString("markData"));
                    hkStaffGaugeMon.setCreateTime(jsonArray.getJSONObject(i).getDate("createTime"));
                    hkStaffGaugeMon.setConfigUpdateTime(jsonArray.getJSONObject(i).getDate("configUpdateTime"));
                    hkStaffGaugeMon.setUpdateTime(jsonArray.getJSONObject(i).getDate("updateTime"));
                    hkStaffGaugeMon.setDeleteStatus(jsonArray.getJSONObject(i).getInteger("deleteStatus"));
                    hkStaffGaugeMon.setCurrentPic(jsonArray.getJSONObject(i).getString("currentPic"));
                    hkStaffGaugeMon.setAlarmHeight(jsonArray.getJSONObject(i).getDouble("alarmHeight"));
                    hkStaffGaugeMon.setRemark1(jsonArray.getJSONObject(i).getString("remark1"));
                    hkStaffGaugeMon.setRemark2(jsonArray.getJSONObject(i).getString("remark2"));
                    hkStaffGaugeMon.setRemark3(jsonArray.getJSONObject(i).getString("remark3"));
                    hkStaffGaugeMon.setRemark4(jsonArray.getJSONObject(i).getString("remark4"));
                    hkStaffGaugeMon.setRemark5(jsonArray.getJSONObject(i).getString("remark5"));
                    // 保存
                    save(hkStaffGaugeMon);
                }
                // 设置数据
                hkStaffGaugeMon.setId(IdUtils.getIdBy36());
                hkStaffGaugeMon.setGaugeMonId(jsonArray.getJSONObject(i).getString("id"));
                hkStaffGaugeMon.setWaterGaugeName(jsonArray.getJSONObject(i).getString("waterGaugeName"));
                hkStaffGaugeMon.setWaterGaugeCode(jsonArray.getJSONObject(i).getString("waterGaugeCode"));
                hkStaffGaugeMon.setCameraIndexCode(jsonArray.getJSONObject(i).getString("cameraIndexCode"));
                hkStaffGaugeMon.setCameraName(jsonArray.getJSONObject(i).getString("cameraName"));
                hkStaffGaugeMon.setLocation(jsonArray.getJSONObject(i).getString("location"));
                hkStaffGaugeMon.setMarkPic(jsonArray.getJSONObject(i).getString("markPic"));
                hkStaffGaugeMon.setMarkData(jsonArray.getJSONObject(i).getString("markData"));
                hkStaffGaugeMon.setCreateTime(jsonArray.getJSONObject(i).getDate("createTime"));
                hkStaffGaugeMon.setConfigUpdateTime(jsonArray.getJSONObject(i).getDate("configUpdateTime"));
                hkStaffGaugeMon.setUpdateTime(jsonArray.getJSONObject(i).getDate("updateTime"));
                hkStaffGaugeMon.setDeleteStatus(jsonArray.getJSONObject(i).getInteger("deleteStatus"));
                hkStaffGaugeMon.setCurrentPic(jsonArray.getJSONObject(i).getString("currentPic"));
                hkStaffGaugeMon.setAlarmHeight(jsonArray.getJSONObject(i).getDouble("alarmHeight"));
                hkStaffGaugeMon.setRemark1(jsonArray.getJSONObject(i).getString("remark1"));
                hkStaffGaugeMon.setRemark2(jsonArray.getJSONObject(i).getString("remark2"));
                hkStaffGaugeMon.setRemark3(jsonArray.getJSONObject(i).getString("remark3"));
                hkStaffGaugeMon.setRemark4(jsonArray.getJSONObject(i).getString("remark4"));
                hkStaffGaugeMon.setRemark5(jsonArray.getJSONObject(i).getString("remark5"));
                // 保存
                save(hkStaffGaugeMon);
            }
        }
    }

 skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/hk/vo/HkStaffGaugeMonVO.java

@@ -16,6 +16,11 @@
     * 结束时间
     */
    private String endTime;

    /**
     * 发送时间
     */
    private String sendTime;
    /**
     * 水库编号
     */