Merge branch 'master' of http://192.168.2.241:3000/wangjian/tofly-dyrq

dyrqcar/src/main/java/com/tofly/dyrqcar/controller/CarMochaitomController.java

@@ -76,13 +76,13 @@ public class CarMochaitomController {
      * 修改运维部单车台账记录表
      * @param carMochaitom 运维部单车台账记录表
      * @return ResultRespone
-     */
+     *//*
     @ToFlyAppLog(title="修改运维部单车台账记录表" )
     @ApiOperation(value = "修改运维部单车台账记录表")
     @PutMapping
     public ResultRespone updateById(@RequestBody CarMochaitom carMochaitom) {
       return ResultRespone.success(carMochaitomService.updateById(carMochaitom));
-    }
+    }*/
 
     /**
      * 通过id删除运维部单车台账记录表

dyrqcar/src/main/java/com/tofly/dyrqcar/custom/controller/CustomCarMochaitomController.java

@@ -8,8 +8,10 @@ import com.tofly.common.log.annotation.ToFlyAppLog;
 import com.tofly.common.oauth.exception.ToflyDeniedException;
 import com.tofly.dyrqcar.custom.entity.CarMochaitomList;
 import com.tofly.dyrqcar.custom.entity.CarMochaitomSearch;
+import com.tofly.dyrqcar.custom.mapper.CustomCarMochaitomMapper;
 import com.tofly.dyrqcar.custom.service.CustomCarMochaitomService;
 import com.tofly.dyrqcar.entity.CarMochaitom;
+import com.tofly.dyrqcar.mapper.CarMochaitomMapper;
 import com.tofly.dyrqcar.service.CarMochaitomService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -31,6 +33,7 @@ public class CustomCarMochaitomController {
 
     private final CustomCarMochaitomService customCarMochaitomService;
     private final CarMochaitomService carMochaitomService;
+    private final CustomCarMochaitomMapper customCarMochaitomMapper;
 
     @ApiOperation(value = "根据车牌号模糊分页查询")
     @GetMapping("/numberpage")
@@ -48,15 +51,34 @@ public class CustomCarMochaitomController {
     @ApiOperation(value = "新增运维部单车台账记录表")
     @PostMapping
     public ResultRespone save(@RequestBody CarMochaitom carMochaitom) {
-        List<CarMochaitom> list = carMochaitomService.list(Wrappers.<CarMochaitom>lambdaQuery().eq(CarMochaitom::getUseTime, carMochaitom.getUseTime()).eq(CarMochaitom::getCarId, carMochaitom.getCarId()));
+       /* List<CarMochaitom> list = carMochaitomService.list(Wrappers.<CarMochaitom>lambdaQuery().eq(CarMochaitom::getUseTime, carMochaitom.getUseTime()).eq(CarMochaitom::getCarId, carMochaitom.getCarId()));
         list.forEach(k -> {
             if (carMochaitom.getUseTime().equals(k.getUseTime())) {
                 throw new ToflyDeniedException("该车辆在" + carMochaitom.getUseTime() + "月份已上报台账,仅可进行修改");
             }
-        });
+        });*/
+       int row = customCarMochaitomMapper.hasTime(carMochaitom.getUseTime(),carMochaitom.getCarId());
+       if(row > 0){
+           throw new ToflyDeniedException("该车辆在" + carMochaitom.getUseTime() + "月份已上报台账,仅可对当月其他信息进行修改");
+       }
         return ResultRespone.success(carMochaitomService.save(carMochaitom));
     }
 
+    /**
+     * 修改运维部单车台账记录表
+     * @param carMochaitom 运维部单车台账记录表
+     * @return ResultRespone
+     */
+    @ToFlyAppLog(title="修改运维部单车台账记录表" )
+    @ApiOperation(value = "修改运维部单车台账记录表")
+    @PutMapping
+    public ResultRespone updateById(@RequestBody CarMochaitom carMochaitom) {
+        if(StringUtil.isNotEmpty(carMochaitom.getUseTime())){
+            throw new ToflyDeniedException("该车辆在" + carMochaitom.getUseTime() + "月份已上报台账,不能修改上报月份,仅可对当月其他信息进行修改");
+        }
+        return ResultRespone.success(carMochaitomService.updateById(carMochaitom));
+    }
+
     @ToFlyAppLog(title = "管网运维部车辆费用统计")
     @ApiOperation(value = "管网运维部车辆费用统计")
     @GetMapping("/cost")

dyrqcar/src/main/java/com/tofly/dyrqcar/custom/mapper/CustomCarMochaitomMapper.java

@@ -20,4 +20,6 @@ public interface CustomCarMochaitomMapper extends BaseMapper<CustomCarMochaitom>
     List<CarMochaitomCount> pageCount(@Param("carMochaitomSql") CarMochaitomSql carMochaitomSql);
 
     List<CarMochaitom> getList(@Param("carMochaitomSql") CarMochaitomSql carMochaitomSql);
+
+    int hasTime(@Param("useTime") String useTime,@Param("carId") Long carId);
 }

dyrqcar/src/main/java/com/tofly/dyrqcar/entity/DeptCar.java

@@ -12,7 +12,9 @@ import lombok.Data;
 import lombok.EqualsAndHashCode;
 import com.tofly.common.core.constant.ToflySqlCondition;
 import com.tofly.common.entity.CommonCode;
+
 import java.util.Date;
+
 import com.fasterxml.jackson.annotation.JsonFormat;
 import org.springframework.format.annotation.DateTimeFormat;
 
@@ -28,27 +30,27 @@ import java.util.stream.Collectors;
  */
 @Data
 @EqualsAndHashCode(callSuper = true)
-@TableName(value="TF_DEPT_CAR",resultMap = "deptCarMap")
+@TableName(value = "TF_DEPT_CAR", resultMap = "deptCarMap")
 @KeySequence("TF_DEPT_CAR")
 @ApiModel
 public class DeptCar extends Model<DeptCar> {
     private static final long serialVersionUID = 1L;
 
-        /**
+    /**
      * 文件路径
      */
-            @ApiModelProperty(value = "文件路径")
-                private String filePath;
-                /**
+    @ApiModelProperty(value = "文件路径")
+    private String filePath;
+    /**
      * 文件名称
      */
-            @ApiModelProperty(value = "文件名称")
-                private String fileName;
-                /**
+    @ApiModelProperty(value = "文件名称")
+    private String fileName;
+    /**
      * 文件类型(0:照片,1:语音,2:其他)
      */
-            @ApiModelProperty(value = "文件类型(0:照片,1:语音,2:其他)")
-                private String fileType;
+    @ApiModelProperty(value = "文件类型(0:照片,1:语音,2:其他)")
+    private String fileType;
     /**
      * 状态(0:目录,1:文件)
      */
@@ -56,48 +58,52 @@ public class DeptCar extends Model<DeptCar> {
     private String state;
     @ApiModelProperty(hidden = true)
     private String stateName;
-                /**
+    /**
      * 主键
      */
-        @TableId(value = "ID",type= IdType.INPUT)
-            @ApiModelProperty(value = "主键")
-                private Long id;
-                /**
+    @TableId(value = "ID", type = IdType.INPUT)
+    @ApiModelProperty(value = "主键")
+    private Long id;
+    /**
      * 名称
      */
-            @ApiModelProperty(value = "名称")
-                private String name;
-                /**
+    @ApiModelProperty(value = "名称")
+    private String name;
+    /**
      * 创建人
      */
-            @ApiModelProperty(value = "创建人")
-                private Long creatUser;
-            @ApiModelProperty(hidden = true)
-            private String creatUserName;
-                /**
+    @ApiModelProperty(value = "创建人")
+    private Long creatUser;
+    @ApiModelProperty(hidden = true)
+    private String creatUserName;
+    /**
      * 创建时间
      */
-            @ApiModelProperty(value = "创建时间")
-        @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
-    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
-                private Date creatTime;
-                /**
+    @ApiModelProperty(value = "创建时间")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date creatTime;
+    /**
      * 修改时间
      */
-            @ApiModelProperty(value = "修改时间")
-        @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
-    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
-            private Date updateTime;
-                /**
+    @ApiModelProperty(value = "修改时间")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date updateTime;
+    /**
      * 层级ID
      */
-            @ApiModelProperty(value = "层级ID")
-                private Long parentId;
-                /**
+    @ApiModelProperty(value = "层级ID")
+    private Long parentId;
+    /**
      * 删除标记
      */
-            @TableLogic
-        @ApiModelProperty(value = "删除标记")
-                private String delFlag;
-            
+    @TableLogic
+    @ApiModelProperty(value = "删除标记")
+    private String delFlag;
+    /*
+     * 排序
+     */
+    @ApiModelProperty(value = "排序")
+    private Short sort;
 }

dyrqcar/src/main/resources/customMapper/CustomCarMochaitomMapper.xml

@@ -80,4 +80,9 @@
         </if>
          order by to_date(use_time,'yyyy-MM')
     </select>
+
+    <select id="hasTime" resultType="java.lang.Integer">
+        select count(1) from tf_car_mochaitom where DEL_FLAG = 1
+        and USE_TIME = #{useTime} and CAR_ID = #{carId}
+    </select>
 </mapper>

dyrqcar/src/main/resources/mapper/DeptCarMapper.xml

@@ -15,8 +15,9 @@
         <result property="parentId" column="PARENT_ID"/>
         <result property="delFlag" column="DEL_FLAG"/>
         <result property="state" column="STATE"/>
+        <result property="sort" column="SORT"/>
         <association property="stateName" column="STATE" select="getStateName"/>
-        <association property="creatUserName" column="CREATE_USER"
+        <association property="creatUserName" column="CREAT_USER"
                      select="com.tofly.common.mapper.ToflyCodeCommonMapper.getUserName"/>
     </resultMap>
 

src/main/java/com/tofly/dyrq/custom/controller/CustomDevopsEquipmentController.java

@@ -9,6 +9,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.tofly.common.core.entity.ResultRespone;
 import com.tofly.common.log.annotation.ToFlyAppLog;
 import com.tofly.common.oauth.util.SecurityUtils;
+import com.tofly.dyrq.custom.entity.DevopHistory;
 import com.tofly.dyrq.custom.service.CustomDevopsEquipmentService;
 import com.tofly.dyrq.entity.DevopsEquipment;
 import com.tofly.dyrq.mapper.DevopsEquipmentMapper;
@@ -44,7 +45,6 @@ import java.util.Map;
 @Api(tags="管网运维部工具类设备清单录入表接口")
 public class CustomDevopsEquipmentController {
     private final CustomDevopsEquipmentService customDevopsEquipmentService;
-    private final DevopsEquipmentMapper devopsEquipmentMapper;
 
     @ToFlyAppLog(title="通过Excel批量导入数据" )
     @ApiOperation(value = "通过Excel批量导入数据")
@@ -79,10 +79,9 @@ public class CustomDevopsEquipmentController {
      * @param page 分页对象
      * @return
      *//*
-    @GetMapping("/pagehistory")
+    @PostMapping("/pagenew")
     @ApiOperation(value = "分页历史查询")
-    public ResultRespone getDevopsEquipmentPage(Page page,@ModelAttribute DevopsEquipment) {
-        Page<Map> result = page.setRecords(devopsEquipmentMapper.getHistory(page));
-        return ResultRespone.success(result);
+    public ResultRespone getHistoryPage(Page page, @ModelAttribute DevopHistory devopHistory) {
+        return ResultRespone.success(customDevopsEquipmentService.getHistory(page,devopHistory));
     }*/
 }

src/main/java/com/tofly/dyrq/custom/controller/CustomTroubleController.java

@@ -157,10 +157,10 @@ public class CustomTroubleController {
 //        }
         if("1".equals(undertakerHandle.getState())){
             if (undertakerHandle.getTroubleTypeid() == null) {
-                throw new ToflyDeniedException("隐患类型ID");
+                throw new ToflyDeniedException("隐患类型不能为空");
             }
             if (undertakerHandle.getLevelid() == null) {
-                throw new ToflyDeniedException("隐患级别");
+                throw new ToflyDeniedException("隐患级别不能为空");
             }
         }
 

src/main/java/com/tofly/dyrq/custom/entity/DevopHistory.java

@@ -0,0 +1,9 @@
+package com.tofly.dyrq.custom.entity;
+
+import lombok.Data;
+
+@Data
+public class DevopHistory {
+    private String delFlag;
+    private String historyFlag;
+}

src/main/java/com/tofly/dyrq/custom/service/CustomDevopsEquipmentService.java

@@ -4,12 +4,15 @@
  */
 package com.tofly.dyrq.custom.service;
 
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.tofly.common.core.entity.ResultRespone;
+import com.tofly.dyrq.custom.entity.DevopHistory;
 import org.apache.poi.ss.formula.functions.T;
 import org.springframework.web.multipart.MultipartFile;
 
 import java.io.OutputStream;
 import java.util.List;
+import java.util.Map;
 
 /**
  * 管网运维部工具类设备清单录入表
@@ -21,4 +24,6 @@ public interface CustomDevopsEquipmentService{
     boolean uploadExcel(MultipartFile file);
 
     void exportExcel(String ids, OutputStream out,String fileName);
+
+    Page<Map> getHistory(Page page, DevopHistory devopHistory);
 }

src/main/java/com/tofly/dyrq/custom/service/impl/CustomDevopsEquipmentServiceImpl.java

@@ -2,10 +2,12 @@ package com.tofly.dyrq.custom.service.impl;
 
 import com.alibaba.fastjson.JSONArray;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.tofly.common.core.util.StringUtil;
 import com.tofly.common.core.util.io.ExcelUtil;
 import com.tofly.common.oauth.exception.ToflyDeniedException;
+import com.tofly.dyrq.custom.entity.DevopHistory;
 import com.tofly.dyrq.custom.service.CustomDevopsEquipmentService;
 import com.tofly.dyrq.entity.DevopsEquipment;
 import com.tofly.dyrq.mapper.DevopsEquipmentMapper;
@@ -669,6 +671,14 @@ public class CustomDevopsEquipmentServiceImpl implements CustomDevopsEquipmentSe
         }
     }
 
+    @Override
+    public Page<Map> getHistory(Page page, DevopHistory devopHistory) {
+        devopHistory.setDelFlag("0");
+        devopHistory.setHistoryFlag("1");
+        Page<Map> result = page.setRecords(devopsEquipmentMapper.getHistory(page,devopHistory));
+        return result;
+    }
+
     /**
      * 获取现在时间
      *

src/main/java/com/tofly/dyrq/entity/EpmtSystem.java

@@ -12,7 +12,9 @@ import lombok.Data;
 import lombok.EqualsAndHashCode;
 import com.tofly.common.core.constant.ToflySqlCondition;
 import com.tofly.common.entity.CommonCode;
+
 import java.util.Date;
+
 import com.fasterxml.jackson.annotation.JsonFormat;
 import org.springframework.format.annotation.DateTimeFormat;
 
@@ -28,70 +30,70 @@ import java.util.stream.Collectors;
  */
 @Data
 @EqualsAndHashCode(callSuper = true)
-@TableName(value="TF_EPMT_SYSTEM",resultMap = "epmtSystemMap")
+@TableName(value = "TF_EPMT_SYSTEM", resultMap = "epmtSystemMap")
 @KeySequence("TF_EPMT_SYSTEM")
 @ApiModel
 public class EpmtSystem extends Model<EpmtSystem> {
     private static final long serialVersionUID = 1L;
 
-        /**
+    /**
      * 主键
      */
-        @TableId(value = "ID",type= IdType.INPUT)
-            @ApiModelProperty(value = "主键")
-                private Long id;
-                /**
+    @TableId(value = "ID", type = IdType.INPUT)
+    @ApiModelProperty(value = "主键")
+    private Long id;
+    /**
      * 名称
      */
-            @ApiModelProperty(value = "名称")
-                private String name;
-                /**
+    @ApiModelProperty(value = "名称")
+    private String name;
+    /**
      * 创建人
      */
-            @ApiModelProperty(value = "创建人")
-                private Long creatUser;
+    @ApiModelProperty(value = "创建人")
+    private Long creatUser;
     @ApiModelProperty(hidden = true)
     private String creatUserName;
-                /**
+    /**
      * 创建时间
      */
-            @ApiModelProperty(value = "创建时间")
-        @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
-    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
-                private Date creatTime;
-                /**
+    @ApiModelProperty(value = "创建时间")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date creatTime;
+    /**
      * 修改时间
      */
-            @ApiModelProperty(value = "修改时间")
-        @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
-    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
-            private Date updateTime;
-                /**
+    @ApiModelProperty(value = "修改时间")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date updateTime;
+    /**
      * 层级ID
      */
-            @ApiModelProperty(value = "层级ID")
-                private Long parentId;
-                /**
+    @ApiModelProperty(value = "层级ID")
+    private Long parentId;
+    /**
      * 文件路径
      */
-            @ApiModelProperty(value = "文件路径")
-                private String filePath;
-                /**
+    @ApiModelProperty(value = "文件路径")
+    private String filePath;
+    /**
      * 删除标记
      */
-            @TableLogic
-        @ApiModelProperty(value = "删除标记")
-                private String delFlag;
-                /**
+    @TableLogic
+    @ApiModelProperty(value = "删除标记")
+    private String delFlag;
+    /**
      * 文件名称
      */
-            @ApiModelProperty(value = "文件名称")
-                private String fileName;
-                /**
+    @ApiModelProperty(value = "文件名称")
+    private String fileName;
+    /**
      * 文件类型(0:照片,1:语音,2:其他)
      */
-            @ApiModelProperty(value = "文件类型(0:照片,1:语音,2:其他)")
-                private String fileType;
+    @ApiModelProperty(value = "文件类型(0:照片,1:语音,2:其他)")
+    private String fileType;
     /**
      * 状态(0:目录,1:文件)
      */
@@ -99,4 +101,9 @@ public class EpmtSystem extends Model<EpmtSystem> {
     private String state;
     @ApiModelProperty(hidden = true)
     private String stateName;
+    /*
+     * 排序
+     */
+    @ApiModelProperty(value = "排序")
+    private Short sort;
 }

src/main/java/com/tofly/dyrq/entity/TfSysSetting.java

@@ -12,6 +12,7 @@ import lombok.Data;
 import lombok.EqualsAndHashCode;
 import com.tofly.common.core.constant.ToflySqlCondition;
 import com.tofly.common.entity.CommonCode;
+
 import java.math.BigDecimal;
 
 import java.util.List;
@@ -26,138 +27,142 @@ import java.util.stream.Collectors;
  */
 @Data
 @EqualsAndHashCode(callSuper = true)
-@TableName(value="TF_SYS_SETTING",resultMap = "tfSysSettingMap")
+@TableName(value = "TF_SYS_SETTING", resultMap = "tfSysSettingMap")
 @KeySequence("TF_SYS_SETTING")
 @ApiModel
 public class TfSysSetting extends Model<TfSysSetting> {
     private static final long serialVersionUID = 1L;
 
-        /**
+    /**
      * 删除标记
      */
-            @TableLogic
-        @ApiModelProperty(value = "删除标记")
-                private String delFlag;
-                /**
+    @TableLogic
+    @ApiModelProperty(value = "删除标记")
+    private String delFlag;
+    /**
      * 最大时速
      */
-            @ApiModelProperty(value = "最大时速")
-                private BigDecimal maxSpeed;
-                /**
+    @ApiModelProperty(value = "最大时速")
+    private BigDecimal maxSpeed;
+    /**
      * 轨迹最大精度(定位最大有效精度)
      */
-            @ApiModelProperty(value = "轨迹最大精度(定位最大有效精度)")
-                private BigDecimal trackMaxAccuracy;
-                /**
+    @ApiModelProperty(value = "轨迹最大精度(定位最大有效精度)")
+    private BigDecimal trackMaxAccuracy;
+    /**
      * 轨迹最大速度
      */
-            @ApiModelProperty(value = "轨迹最大速度")
-                private BigDecimal trackMaxSpeed;
-                /**
+    @ApiModelProperty(value = "轨迹最大速度")
+    private BigDecimal trackMaxSpeed;
+    /**
      * 车辆最大速度(最快参考速度)
      */
-            @ApiModelProperty(value = "车辆最大速度(最快参考速度)")
-                private BigDecimal carMaxSpeed;
-                /**
+    @ApiModelProperty(value = "车辆最大速度(最快参考速度)")
+    private BigDecimal carMaxSpeed;
+    /**
      * 图片水印(0:是,1:否)
      */
-            @ApiModelProperty(value = "图片水印(0:是,1:否)")
-                private String imageWatermark;
-                /**
+    @ApiModelProperty(value = "图片水印(0:是,1:否)")
+    private String imageWatermark;
+    /**
      * 主键值
      */
-        @TableId(value = "ID",type= IdType.INPUT)
-            @ApiModelProperty(value = "主键值")
-                private Long id;
-                /**
+    @TableId(value = "ID", type = IdType.INPUT)
+    @ApiModelProperty(value = "主键值")
+    private Long id;
+    /**
      * gps上传频率间隔 单位秒
      */
-            @ApiModelProperty(value = "gps上传频率间隔 单位秒")
-                private BigDecimal uploadRate;
-                /**
+    @ApiModelProperty(value = "gps上传频率间隔 单位秒")
+    private BigDecimal uploadRate;
+    /**
      * 服务器IP
      */
-            @ApiModelProperty(value = "服务器IP")
-                private String serverIp;
-                /**
+    @ApiModelProperty(value = "服务器IP")
+    private String serverIp;
+    /**
      * 端口设置
      */
-            @ApiModelProperty(value = "端口设置")
-                private String serverPort;
-                /**
+    @ApiModelProperty(value = "端口设置")
+    private String serverPort;
+    /**
      * 终端地图服务地址
      */
-            @ApiModelProperty(value = "终端地图服务地址")
-                private String mapService;
-                /**
+    @ApiModelProperty(value = "终端地图服务地址")
+    private String mapService;
+    /**
      * 到位最小距离 单位米(人巡最大容差)
      */
-            @ApiModelProperty(value = "到位最小距离 单位米(人巡最大容差)")
-                private BigDecimal minDistanceInPlace;
-                /**
+    @ApiModelProperty(value = "到位最小距离 单位米(人巡最大容差)")
+    private BigDecimal minDistanceInPlace;
+    /**
      * 轨迹分段点数
      */
-            @ApiModelProperty(value = "轨迹分段点数")
-                private BigDecimal sectionPointNum;
-                /**
+    @ApiModelProperty(value = "轨迹分段点数")
+    private BigDecimal sectionPointNum;
+    /**
      * 刷新间隔
      */
-            @ApiModelProperty(value = "刷新间隔")
-                private BigDecimal refreshInternal;
-                /**
+    @ApiModelProperty(value = "刷新间隔")
+    private BigDecimal refreshInternal;
+    /**
      * 轨迹线颜色
      */
-            @ApiModelProperty(value = "轨迹线颜色")
-                private String trailLineColor;
-                /**
+    @ApiModelProperty(value = "轨迹线颜色")
+    private String trailLineColor;
+    /**
      * 轨迹线细度
      */
-            @ApiModelProperty(value = "轨迹线细度")
-                private String trailLineWidth;
-                /**
+    @ApiModelProperty(value = "轨迹线细度")
+    private String trailLineWidth;
+    /**
      * 轨迹点颜色
      */
-            @ApiModelProperty(value = "轨迹点颜色")
-                private String trailPointColor;
-                /**
+    @ApiModelProperty(value = "轨迹点颜色")
+    private String trailPointColor;
+    /**
      * 轨迹点细度
      */
-            @ApiModelProperty(value = "轨迹点细度")
-                private String trailPointWidth;
-                /**
+    @ApiModelProperty(value = "轨迹点细度")
+    private String trailPointWidth;
+    /**
      * 部署网站名字
      */
-            @ApiModelProperty(value = "部署网站名字")
-                private String deployWebName;
-                /**
+    @ApiModelProperty(value = "部署网站名字")
+    private String deployWebName;
+    /**
      * 车辆到位最小距离 单位米(车巡最大容差)
      */
-            @ApiModelProperty(value = "车辆到位最小距离 单位米(车巡最大容差)")
-                private BigDecimal carMinDistanceInPlace;
-                /**
+    @ApiModelProperty(value = "车辆到位最小距离 单位米(车巡最大容差)")
+    private BigDecimal carMinDistanceInPlace;
+    /**
      * 车辆刷新间隔
      */
-            @ApiModelProperty(value = "车辆刷新间隔")
-                private BigDecimal carRefreshInternal;
-                /**
+    @ApiModelProperty(value = "车辆刷新间隔")
+    private BigDecimal carRefreshInternal;
+    /**
      * 人轨迹颜色
      */
-            @ApiModelProperty(value = "人轨迹颜色")
-                private String trailPersonColor;
-                /**
+    @ApiModelProperty(value = "人轨迹颜色")
+    private String trailPersonColor;
+    /**
      * 车辆轨迹颜色
      */
-            @ApiModelProperty(value = "车辆轨迹颜色")
-                private String trailCarColor;
-                /**
+    @ApiModelProperty(value = "车辆轨迹颜色")
+    private String trailCarColor;
+    /**
      * 工地监护范围
      */
-            @ApiModelProperty(value = "工地监护范围")
-                private BigDecimal buildRange;
-                /**
+    @ApiModelProperty(value = "工地监护范围")
+    private BigDecimal buildRange;
+    /**
      * 安排计划切割线地长度
      */
-            @ApiModelProperty(value = "安排计划切割线地长度")
-                private BigDecimal cuttingLine;
-            
+    @ApiModelProperty(value = "安排计划切割线地长度")
+    private BigDecimal cuttingLine;
+    /**
+     * 人巡录入设备到位最大容差
+     */
+    @ApiModelProperty(value = "人巡录入设备到位最大容差")
+    private BigDecimal minDistanceInDevice;
 }

src/main/java/com/tofly/dyrq/mapper/DevopsEquipmentMapper.java

@@ -6,6 +6,7 @@ package com.tofly.dyrq.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.tofly.dyrq.custom.entity.DevopHistory;
 import com.tofly.dyrq.entity.DevopsEquipment;
 import org.apache.ibatis.annotations.Param;
 
@@ -26,7 +27,7 @@ public interface DevopsEquipmentMapper extends BaseMapper<DevopsEquipment> {
 
     List<DevopsEquipment> getAll();
 
-    List<DevopsEquipment> getHistory(Page page);
+    List<DevopsEquipment> getHistory(Page page, @Param("devopHistory")DevopHistory devopHistory);
 
     void updateAll();
 

src/main/resources/mapper/DevopsEquipmentMapper.xml

@@ -79,6 +79,6 @@
     </update>
 
     <select id="getHistory" resultMap="devopsEquipmentMap">
-        select * from tf_devops_equipment where DEL_FLAG = 0 and HISTORY_FLAG = 1
+        select * from tf_devops_equipment where DEL_FLAG = #{devopHistory.delFlag} and HISTORY_FLAG = #{devopHistory.historyFlag}
     </select>
 </mapper>

src/main/resources/mapper/EpmtArchivesMapper.xml

@@ -16,7 +16,7 @@
         <result property="fileType" column="FILE_TYPE"/>
         <result property="state" column="STATE"/>
         <association property="stateName" column="STATE" select="getStateName"/>
-        <association property="creatUserName" column="CREATE_USER"
+        <association property="creatUserName" column="CREAT_USER"
                      select="com.tofly.common.mapper.ToflyCodeCommonMapper.getUserName"/>
     </resultMap>
 

src/main/resources/mapper/EpmtBudgetMapper.xml

@@ -16,7 +16,7 @@
         <result property="fileType" column="FILE_TYPE"/>
         <result property="state" column="STATE"/>
         <association property="stateName" column="STATE" select="getStateName"/>
-        <association property="creatUserName" column="CREATE_USER"
+        <association property="creatUserName" column="CREAT_USER"
                      select="com.tofly.common.mapper.ToflyCodeCommonMapper.getUserName"/>
     </resultMap>
 

src/main/resources/mapper/EpmtSystemMapper.xml

@@ -15,8 +15,9 @@
         <result property="fileName" column="FILE_NAME"/>
         <result property="fileType" column="FILE_TYPE"/>
         <result property="state" column="STATE"/>
+        <result property="sort" column="SORT"/>
         <association property="stateName" column="STATE" select="getStateName"/>
-        <association property="creatUserName" column="CREATE_USER"
+        <association property="creatUserName" column="CREAT_USER"
                      select="com.tofly.common.mapper.ToflyCodeCommonMapper.getUserName"/>
     </resultMap>
 

src/main/resources/mapper/TfSysSettingMapper.xml

@@ -3,33 +3,33 @@
 
 <mapper namespace="com.tofly.dyrq.mapper.TfSysSettingMapper">
 
-  <resultMap id="tfSysSettingMap" type="com.tofly.dyrq.entity.TfSysSetting">
-                <id property="id" column="ID"/>
-                                                                                                                                                                                                                        <result property="uploadRate" column="UPLOAD_RATE"/>
-                      <result property="serverIp" column="SERVER_IP"/>
-                      <result property="serverPort" column="SERVER_PORT"/>
-                      <result property="mapService" column="MAP_SERVICE"/>
-                      <result property="minDistanceInPlace" column="MIN_DISTANCE_IN_PLACE"/>
-                      <result property="sectionPointNum" column="SECTION_POINT_NUM"/>
-                      <result property="refreshInternal" column="REFRESH_INTERNAL"/>
-                      <result property="trailLineColor" column="TRAIL_LINE_COLOR"/>
-                      <result property="trailLineWidth" column="TRAIL_LINE_WIDTH"/>
-                      <result property="trailPointColor" column="TRAIL_POINT_COLOR"/>
-                      <result property="trailPointWidth" column="TRAIL_POINT_WIDTH"/>
-                      <result property="deployWebName" column="DEPLOY_WEB_NAME"/>
-                      <result property="carMinDistanceInPlace" column="CAR_MIN_DISTANCE_IN_PLACE"/>
-                      <result property="carRefreshInternal" column="CAR_REFRESH_INTERNAL"/>
-                      <result property="trailPersonColor" column="TRAIL_PERSON_COLOR"/>
-                      <result property="trailCarColor" column="TRAIL_CAR_COLOR"/>
-                      <result property="buildRange" column="BUILD_RANGE"/>
-                      <result property="cuttingLine" column="CUTTING_LINE"/>
-                        <result property="maxSpeed" column="MAX_SPEED"/>
-                        <result property="trackMaxAccuracy" column="TRACK_MAX_ACCURACY"/>
-                        <result property="trackMaxSpeed" column="TRACK_MAX_SPEED"/>
-                        <result property="carMaxSpeed" column="CAR_MAX_SPEED"/>
-                        <result property="imageWatermark" column="IMAGE_WATERMARK"/>
-                                                                                                                                                                                                                                                                                                                                                                                                                </resultMap>
+    <resultMap id="tfSysSettingMap" type="com.tofly.dyrq.entity.TfSysSetting">
+        <id property="id" column="ID"/>
+        <result property="uploadRate" column="UPLOAD_RATE"/>
+        <result property="serverIp" column="SERVER_IP"/>
+        <result property="serverPort" column="SERVER_PORT"/>
+        <result property="mapService" column="MAP_SERVICE"/>
+        <result property="minDistanceInPlace" column="MIN_DISTANCE_IN_PLACE"/>
+        <result property="sectionPointNum" column="SECTION_POINT_NUM"/>
+        <result property="refreshInternal" column="REFRESH_INTERNAL"/>
+        <result property="trailLineColor" column="TRAIL_LINE_COLOR"/>
+        <result property="trailLineWidth" column="TRAIL_LINE_WIDTH"/>
+        <result property="trailPointColor" column="TRAIL_POINT_COLOR"/>
+        <result property="trailPointWidth" column="TRAIL_POINT_WIDTH"/>
+        <result property="deployWebName" column="DEPLOY_WEB_NAME"/>
+        <result property="carMinDistanceInPlace" column="CAR_MIN_DISTANCE_IN_PLACE"/>
+        <result property="carRefreshInternal" column="CAR_REFRESH_INTERNAL"/>
+        <result property="trailPersonColor" column="TRAIL_PERSON_COLOR"/>
+        <result property="trailCarColor" column="TRAIL_CAR_COLOR"/>
+        <result property="buildRange" column="BUILD_RANGE"/>
+        <result property="cuttingLine" column="CUTTING_LINE"/>
+        <result property="maxSpeed" column="MAX_SPEED"/>
+        <result property="trackMaxAccuracy" column="TRACK_MAX_ACCURACY"/>
+        <result property="trackMaxSpeed" column="TRACK_MAX_SPEED"/>
+        <result property="carMaxSpeed" column="CAR_MAX_SPEED"/>
+        <result property="imageWatermark" column="IMAGE_WATERMARK"/>
+        <result property="minDistanceInDevice" column="MIN_DISTANCE_IN_DEVICE"/>
+    </resultMap>
 
 
-                                                                                                                    
 </mapper>