1

src/main/java/com/hisense/monitormanage/config/CachingConfig.java

@@ -26,8 +26,11 @@ public class CachingConfig {
 
     @Bean
     public EhCacheManagerFactoryBean ehcache() {
+
         EhCacheManagerFactoryBean cacheManagerFactoryBean = new EhCacheManagerFactoryBean();
+
         cacheManagerFactoryBean.setConfigLocation(new ClassPathResource("ehcache.xml"));
+
         return cacheManagerFactoryBean;
     }
 }

src/main/java/com/hisense/monitormanage/config/GlobalCorsConfig.java

@@ -25,6 +25,7 @@ public class GlobalCorsConfig {
         config.addExposedHeader("*");
         //2. 添加映射路径
         UrlBasedCorsConfigurationSource corsConfigurationSource = new UrlBasedCorsConfigurationSource();
+
         corsConfigurationSource.registerCorsConfiguration("/**",config);
         //3. 返回新的CorsFilter
         return new CorsFilter(corsConfigurationSource);

src/main/java/com/hisense/monitormanage/config/RestClient.java

@@ -12,12 +12,15 @@ import java.net.SocketAddress;
 @Configuration
 public class RestClient {
 
-
     @Bean
     public static RestTemplate restTemplate() {
+
         SimpleClientHttpRequestFactory requestFactory = new SimpleClientHttpRequestFactory();
+
         requestFactory.setConnectTimeout(30000);
+
         requestFactory.setReadTimeout(30000);
+
         requestFactory.setOutputStreaming(false);
 
         /*SocketAddress address = new InetSocketAddress("15.2.23.141", 8888);
@@ -25,7 +28,9 @@ public class RestClient {
         requestFactory.setProxy(proxy);*/
 
         RestTemplate restTemplate = new RestTemplate();
+
         restTemplate.setRequestFactory(requestFactory);
+
         return restTemplate;
     }
 

src/main/java/com/hisense/monitormanage/config/ScheduleConfig.java

@@ -9,6 +9,7 @@ import java.util.concurrent.Executors;
 @Configuration
 //所有的定时任务都放在一个线程池中，定时任务启动时使用不同的线程
 public class ScheduleConfig implements SchedulingConfigurer {
+
     @Override
     public void configureTasks(ScheduledTaskRegistrar scheduledTaskRegistrar) {
         //设定一个长度10的定时任务线程池

src/main/java/com/hisense/monitormanage/config/SwaggerConfig.java

@@ -26,6 +26,7 @@ public class SwaggerConfig {
 
     @Value("${swagger.enable:false}")
     private boolean enable;
+
     @Bean
     public Docket createRestApi(){
         return new Docket(DocumentationType.SWAGGER_2)
@@ -50,5 +51,4 @@ public class SwaggerConfig {
                 .description("API 描述")
                 .build();
     }
-
 }

src/main/java/com/hisense/monitormanage/controller/BuildingController.java

@@ -17,7 +17,6 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
-import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -33,6 +32,7 @@ import java.util.Map;
 @RequestMapping("api/project/building")
 @RestController
 public class BuildingController {
+
     @Autowired
     private BuildingRecordsService buildingRecordsService;
 
@@ -85,14 +85,14 @@ public class BuildingController {
     @GetMapping("selectWeekPmAndNoice")
     @ApiOperation("查询近7天工地噪声和扬尘的信息")
     public Result selectWeekPmAndNoice(String buildLicense){
-        List<BuildingRecordsDtos> recordsDtos = buildingRecordsMapper.selectWeekPmAndNoice(buildLicense);
-        recordsDtos.forEach(record ->{
+        List<BuildingRecordsDtos> records = buildingRecordsMapper.selectWeekPmAndNoice(buildLicense);
+        records.forEach(record ->{
             if (record.getPm10() == null && record.getNoice() == null){
                 record.setPm10(0);
                 record.setNoice(0);
             }
         });
-        Result success = Result.success(recordsDtos);
+        Result success = Result.success(records);
         return success;
     }
 

src/main/java/com/hisense/monitormanage/dto/BuildingRecordsDto.java

@@ -4,18 +4,33 @@ import lombok.Data;
 
 @Data
 public class BuildingRecordsDto {
+
     private String projectName;//工地名称
+
     private String buildLicense;//建筑编号
+
     private String pushTime;//推送时间
+
     private String appid;
+
     private String sgwz;//施工位置
+
     private double jd;//经度
+
     private double wd;//纬度
+
     private String ssdq;//所属区域
+
     private double pm10;//扬尘
+
     private double noice;//噪声
+
     private String yjsg;//夜间施工
+
     private String picUrl;//图片路径
+
     private String channelCode;//摄像头编号
+
     private String channelName;//摄像头名称
+
 }

src/main/java/com/hisense/monitormanage/dto/BuildingRecordsDtos.java

@@ -4,7 +4,11 @@ import lombok.Data;
 
 @Data
 public class BuildingRecordsDtos {
+
     private String pushTime;
+
     private Integer pm10;
+
     private Integer noice;
+
 }

src/main/java/com/hisense/monitormanage/dto/CameraChannelDto1.java

@@ -4,6 +4,7 @@ import lombok.Data;
 
 @Data
 public class CameraChannelDto1 {
+
     private Long idtCameraChannel;
 
     private String channelCode;

src/main/java/com/hisense/monitormanage/dto/ChannelLabelDto.java

@@ -17,7 +17,4 @@ public class ChannelLabelDto {
 
     private String nodeName;
 
-
-
-
 }

src/main/java/com/hisense/monitormanage/dto/ChannelPictureDto.java

@@ -9,8 +9,11 @@ import java.util.Date;
 public class ChannelPictureDto {
 
     private String ssqh;
+
     private String xmmc;
+
     private String xmdz;
+
     private String channelCode;
 
     private String PicUrl;
@@ -18,7 +21,4 @@ public class ChannelPictureDto {
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
     private Date insertTime;
 
-
-
-
 }

src/main/java/com/hisense/monitormanage/dto/ChengguanDto.java

@@ -7,8 +7,10 @@ import lombok.Data;
 @Data
 public class ChengguanDto extends Camera {
 
-
     private String id;
+
     private String xmdz;
+
     private String xmmc;
+
 }

src/main/java/com/hisense/monitormanage/dto/EventDto.java

@@ -7,19 +7,34 @@ import java.math.BigDecimal;
 
 @Data
 public class EventDto {
+
     private String eventCnName;
+
     private String eventNewName;
+
     private String eventSerial;
+
     private String color;
+
     private String vehicle;
+
     private String classes;
+
     private String cameraName;
+
     private String district;
+
     private BigDecimal latitude;
+
     private BigDecimal longitude;
+
     private String imageUrl;
+
     private String taskId;
+
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
     private String captureTime;
+
     private String trackEvent;
+
 }

src/main/java/com/hisense/monitormanage/dto/KeyAreaDto.java

@@ -4,9 +4,15 @@ import lombok.Data;
 
 @Data
 public class KeyAreaDto {
+
     private String type;
+
     private String areaName;
+
     private String location;
+
     private String allNums;
+
     private String timeId;
+
 }

src/main/java/com/hisense/monitormanage/dto/PassengerFlowDto.java

@@ -4,11 +4,19 @@ import lombok.Data;
 
 @Data
 public class PassengerFlowDto {
+
     private String hourId;
+
     private String timeId;
+
     private String longitude;
+
     private String latitude;
+
     private String allNums;
+
     private String localNums;
+
     private String nonlocalNums;
+
 }

src/main/java/com/hisense/monitormanage/dto/PeopleRecognizeDto.java

@@ -7,16 +7,28 @@ import java.util.Date;
 
 @Data
 public class PeopleRecognizeDto {
+
     private String channelCode;
+
     private String channelName;
+
     private String picUrl;
+
     private Integer personNum;
+
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
     private Date insertTime;
+
     private String gpsX;
+
     private String gpsY;
+
     private Integer status;//1在线；0离线
+
     private String nodeName;
+
     private String newNodeName;
+
     private Integer checkStatus;//1正常；0异常
+
 }

src/main/java/com/hisense/monitormanage/dto/PictureDto.java

@@ -9,18 +9,22 @@ import java.util.Date;
 public class PictureDto {
 
     private String ssqh;
+
     private String xmmc;
+
     private String xmdz;
+
     private String channelCode;
+
     private String name;
+
     private String longitude;
+
     private String latitude;
+
     private String pic;
 
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
     private Date captureTime;
 
-
-
-
 }

src/main/java/com/hisense/monitormanage/dto/ScenicCameraDto.java

@@ -7,7 +7,6 @@ import lombok.Data;
 @Data
 public class ScenicCameraDto extends Camera {
 
-
     /**
      * 景区编码
      */
@@ -16,7 +15,6 @@ public class ScenicCameraDto extends Camera {
      * 摄像头名称
      */
     private String name;
-
     /**
      * 景区名
      */
@@ -25,9 +23,9 @@ public class ScenicCameraDto extends Camera {
      * 管理单位
      */
     private String gldw;
-
     /**
      * 识别出来的人数
      */
     private Integer personNum;
+
 }

src/main/java/com/hisense/monitormanage/dto/UserLoginDto.java

@@ -4,6 +4,9 @@ import lombok.Data;
 
 @Data
 public class UserLoginDto {
+
     private String username;
+
     private String status;
+
 }

src/main/java/com/hisense/monitormanage/dto/WaterCameraDto.java

@@ -4,12 +4,21 @@ import lombok.Data;
 
 @Data
 public class WaterCameraDto {
+
     private String waterPointName;
+
     private String ssqy;
+
     private String illustrate;
+
     private String videoSurveillance;
+
     private String videoCapture;
+
     private String channelName;
+
     private String channelCode;
+
     private Integer count;
+
 }

src/main/java/com/hisense/monitormanage/dto/WaterPointDto.java

@@ -6,29 +6,55 @@ import java.math.BigDecimal;
 
 @Data
 public class WaterPointDto {
+
     private String waterPointId;
+
     private String waterPointName;//积水点名称
+
     private String districtId;//所属区域ID
+
     private String address;//地址
+
     private String pointType;//积水点类型1：路段；2：桥下；3：洞内；4：小区
+
     private String uuid;//地址坐标ID
+
     private BigDecimal longitude;//经度
+
     private BigDecimal latitude;//纬度
+
     private String charge;//负责人
+
     private String chargeTel;//负责人电话
+
     private String remark;//备注
+
     private String delFlag;//删除状态
+
     private String createdDate;//创建时间
+
     private String createdBy;//创建人ID
+
     private String updatedDate;//更新时间
+
     private String updatedBy;//更新人ID
+
     private String reportOrigin;//上报来源：auditorReport--水务集团上报；commonReport--群众上报；case--城管案例；video--视频感知
+
     private String isEasyPoint;//是否易积水点；0是 1否
+
     private String dispFlag;//0未处置 1处置中 2处置完成
+
     private String auditFlag;//审核状态；0未审核; 1审核不通过;2审核通过
+
     private String upNum;//点赞数量
+
     private String underNum;//点踩数量
+
     private String addressDesc;//详细地址描述
+
     private String waterPointDesc;//现场情况说明
+
     private String pointLevel;//积水点等级1：重度；2：中度；3：轻度；4：无积水
+
 }

src/main/java/com/hisense/monitormanage/dto/WaterPointDtos.java

@@ -4,8 +4,13 @@ import lombok.Data;
 
 @Data
 public class WaterPointDtos {
+
     private String reportOrigin;
+
     private String ssqy;
+
     private Integer count;
+
     private String pointLevel;
+
 }

src/main/java/com/hisense/monitormanage/entity/Booth.java

@@ -6,14 +6,25 @@ import lombok.Data;
 @Data
 @TableName("t_booth")
 public class Booth {
+
     private String serial;
+
     private String area;
+
     private String boothName;
+
     private String location;
+
     private String manageTime;
+
     private String captureTime;
+
     private String channelCode;
+
     private String gpsX;
+
     private String gpsY;
+
     private String channelName;
+
 }

src/main/java/com/hisense/monitormanage/entity/BuildingRecords.java

@@ -24,20 +24,28 @@ import java.time.LocalDateTime;
 @TableName("t_building_records")
 @ApiModel("工地实时数据")
 public class BuildingRecords {
+
     @TableId
     @ApiModelProperty("id")
     private Integer id;
+
     @ApiModelProperty("项目名称")
     private String projectName;
+
     @ApiModelProperty("项目建筑批准编号")
     private String buildLicense;
+
     @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
     @ApiModelProperty("数据上传时间")
     private LocalDateTime pushTime;
+
     @ApiModelProperty("appid")
     private String appid;
+
     @ApiModelProperty("pm10值")
     private double pm10;
+
     @ApiModelProperty("噪音值")
     private double noice;
+
 }

src/main/java/com/hisense/monitormanage/entity/BuildingSite.java

@@ -18,12 +18,20 @@ import lombok.NoArgsConstructor;
 @NoArgsConstructor
 @TableName("t_building_new_site")
 public class BuildingSite {
+
     @TableId
     private Integer id;
+
     private String gdmc;
+
     private String sgwz;
+
     private double jd;
+
     private double wd;
+
     private String ssdq;
+
     private String yjsg;
+
 }

src/main/java/com/hisense/monitormanage/entity/Camera.java

@@ -14,13 +14,18 @@ public class Camera {
 
     @TableId
     private String code;
+
     private String name;
+
     private String description;
 
     private String longitude;
+
     private String latitude;
 
     @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
     private Date captureTime;
+
     private String pic;
+
 }

src/main/java/com/hisense/monitormanage/entity/CameraCheck.java

@@ -14,16 +14,9 @@ import lombok.Setter;
 @Getter
 @Setter
 public class CameraCheck {
-    private String cameraType;
-    private String channelCode;
-//    private String channelName;
-//    private String channelSn;
-//    private String channelType;
-//    private String deviceCode;
-//    private String deviceIp;
-//    private String deviceName;
-//    @JsonFormat(pattern="yyyyMMdd'T'HHmmss'Z'")
-//    private ZonedDateTime checkTime;
 
+    private String cameraType;
+
+    private String channelCode;
 
 }

src/main/java/com/hisense/monitormanage/entity/CameraOrganization.java

@@ -7,6 +7,7 @@ import lombok.Data;
 @Data
 @TableName("t_camera_organization")
 public class CameraOrganization {
+
     @TableId
     private String id;
 
@@ -18,5 +19,4 @@ public class CameraOrganization {
 
     private Integer subCount;
 
-
 }

src/main/java/com/hisense/monitormanage/entity/CameraScenic.java

@@ -11,6 +11,7 @@ public class CameraScenic {
 
     @TableId
     private String cameraId;
+
     private Integer personNum;
 
 }

src/main/java/com/hisense/monitormanage/entity/CaseCityLaw.java

@@ -22,39 +22,62 @@ import java.time.LocalDateTime;
 @NoArgsConstructor
 @TableName("t_case_cityLaw")
 public class CaseCityLaw {
+
     @TableId(type = IdType.ASSIGN_ID)
     private Long id;
+
     @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
     private LocalDateTime ajjlsj;
+
     private String dzms;
+
     private String wtms;
+
     private String wtlybs;
+
     private String wtlymc;
+
     private String ajlxbs;
+
     private String ajlxmc;
+
     private String dlbs;
+
     private String dlmc;
+
     private String xlbs;
+
     private String xlmc;
+
     private String qbs;
+
     private String qmc;
+
     private String jdbs;
+
     private String jdmc;
+
     private String sqbs;
+
     private String sqmc;
+
     private String xzb;
+
     private String yzb;
+
     @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
     private LocalDateTime pqsj;
+
     @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
     private LocalDateTime ajjssj;
+
     @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
     private LocalDateTime ajzfsj;
+
     private String czsxcqjaaqjacqwjayqja;
+
     private String sbtpsl;
+
     private String cztpsl;
 
-
-
-
 }

src/main/java/com/hisense/monitormanage/entity/ChannelPicture.java

@@ -10,6 +10,7 @@ import java.util.Date;
 @Data
 @TableName("t_channel_picture")
 public class ChannelPicture {
+
     @TableId
     private String id;
 

src/main/java/com/hisense/monitormanage/entity/Event.java

@@ -10,20 +10,35 @@ import java.math.BigDecimal;
 @Data
 @TableName("t_event")
 public class Event {
+
     @TableId
     private String id;
+
     private String eventCnName;
+
     private String eventSerial;
+
     private String color;
+
     private String vehicle;
+
     private String classes;
+
     private String cameraName;
+
     private String district;
+
     private BigDecimal latitude;
+
     private BigDecimal longitude;
+
     private String imageUrl;
+
     private String taskId;
+
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
     private String captureTime;
+
     private String trackEvent;
+
 }

src/main/java/com/hisense/monitormanage/entity/KeyArea.java

@@ -7,13 +7,22 @@ import lombok.Data;
 @Data
 @TableName("t_key_area")
 public class KeyArea {
+
     @TableId
     private Integer id;
+
     private String type;//类型
+
     private String name;//名称
+
     private String location;//位置
+
     private String serviceTime;//投用时间
+
     private String management;//管理单位
+
     private String scenicLevel;//景区级别
+
     private String about;//简介
+
 }

src/main/java/com/hisense/monitormanage/entity/KeyAreaLocation.java

@@ -6,7 +6,11 @@ import lombok.Data;
 @Data
 @TableName("t_key_area_location")
 public class KeyAreaLocation {
+
     private Integer areaId;
+
     private Double longitude;
+
     private Double latitude;
+
 }

src/main/java/com/hisense/monitormanage/entity/Label.java

@@ -7,11 +7,16 @@ import lombok.Data;
 @Data
 @TableName("t_label")
 public class Label {
+
     @TableId
     private Long id;
+
     private String labelCode;
+
     private String labelName;
+
     private String capturePatternn;
+
     private String city;
 
 }

src/main/java/com/hisense/monitormanage/entity/PassengerFlow.java

@@ -18,13 +18,22 @@ import lombok.NoArgsConstructor;
 @NoArgsConstructor
 @TableName("t_passenger_flow")
 public class PassengerFlow {
+
     @TableId
     private Integer id;
+
     private String hourId;
+
     private String timeId;
+
     private String longitude;
+
     private String latitude;
+
     private String allNums;
+
     private String localNums;
+
     private String nonlocalNums;
+
 }

src/main/java/com/hisense/monitormanage/entity/PassengerTest.java

@@ -7,10 +7,16 @@ import lombok.Data;
 @Data
 @TableName("t_passenger_test")
 public class PassengerTest {
+
     @TableId
     private Integer id;
+
     private double longitude;
+
     private double latitude;
+
     private String type;
+
     private String areaName;
+
 }

src/main/java/com/hisense/monitormanage/entity/PeopleRecognize.java

@@ -10,12 +10,19 @@ import java.util.Date;
 @Data
 @TableName("t_people_recognize")
 public class PeopleRecognize {
+
     @TableId
     private String id;
+
     private String channelCode;
+
     private String channelName;
+
     private String picUrl;
+
     private Integer personNum;
+
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
     private Date insertTime;
+
 }

src/main/java/com/hisense/monitormanage/entity/Picture.java

@@ -10,5 +10,7 @@ public class Picture {
 
     @JsonFormat(pattern="yyyy-MM-dd mm:HH:ss",timezone = "GMT+8")
     private Date captureTime;
+
     private String pic;
+
 }

src/main/java/com/hisense/monitormanage/entity/Project.java

@@ -14,17 +14,28 @@ public class Project {
 
     @TableId
     private String id;
+
     private String ssqh;
+
     private String xmmc;
+
     private String xmdz;
+
     private String ghxkzbh;
+
     private String fzsj;
+
     private String xkmj;
+
     private String lzs;
+
     private String xmxz;
+
     private String jsdw;
+
     private String dwdz;
 
     @TableField(exist = false)
     private List<Picture> pics;
+
 }

src/main/java/com/hisense/monitormanage/entity/Result.java

@@ -9,8 +9,11 @@ import lombok.Data;
 public class Result<T> {
 
     private int code;
+
     private String message;
+
     private T data;
+
     private int count;
 
     static public Result success(){
@@ -19,6 +22,7 @@ public class Result<T> {
                 .message("success")
                 .build();
     }
+
     static public Result success(Object obj){
         return Result.builder()
                 .code(1)
@@ -26,10 +30,12 @@ public class Result<T> {
                 .data(obj)
                 .build();
     }
+
     static public Result error(String errMsg){
         return Result.builder()
                 .code(0)
                 .message(errMsg)
                 .build();
     }
+
 }

src/main/java/com/hisense/monitormanage/entity/RoadData.java

@@ -21,22 +21,39 @@ import java.time.LocalDateTime;
 @NoArgsConstructor
 @TableName("t_road_data")
 public class RoadData {
+
     @TableId
     private Integer id;
+
     private String regionName;
+
     private String streetName;
+
     private String roadName;
+
     private String start;
+
     private String end;
+
     private double lng;
+
     private double lat;
+
     private double pm10;
+
     private double pm25;
+
     private Integer descPm10Rank;
+
     private Integer ascPm10Rank;
+
     private Integer descPm25Rank;
+
     private Integer ascPm25Rank;
+
     private String points;
+
     @JsonFormat(pattern="yyyy-MM-dd mm:HH:ss",timezone = "GMT+8")
     private LocalDateTime dt;
+
 }

src/main/java/com/hisense/monitormanage/entity/Sanitation.java

@@ -24,42 +24,60 @@ import java.time.LocalDateTime;
 @TableName("t_sanitation_info")
 @ApiModel("环卫车辆基础数据")
 public class Sanitation {
+
     @TableId
     @ApiModelProperty("id")
     private Integer id;
+
     @ApiModelProperty("车牌号")
     private String cph;
+
     @ApiModelProperty("驾驶员")
     private String jsy;
+
     @JsonFormat(pattern="yyyy-MM-dd mm:HH:ss",timezone = "GMT+8")
     @ApiModelProperty("购买日期")
     private LocalDateTime gmri;
+
     @ApiModelProperty("车辆类型")
     private String cllx;
+
     @ApiModelProperty("所属区域编号")
     private String ssqybh;
+
     @ApiModelProperty("所属环卫公司编号")
     private String sshwgsbh;
+
     @ApiModelProperty("备注")
     private String bz;
+
     @ApiModelProperty("是否考核")
     private Integer sfkh;
+
     @ApiModelProperty("车辆编号")
     private String clbh;
+
     @ApiModelProperty("吨数")
     private String ds;
+
     @ApiModelProperty("是否加装GPS并连入市监管平台")
     private String sfjzgpsblrsjgpt;
+
     @ApiModelProperty("简介")
     private String jj;
+
     @ApiModelProperty("车辆型号")
     private String clxh;
+
     @ApiModelProperty("车辆大类")
     private String cldl;
+
     @ApiModelProperty("是否机扫")
     private Integer sfjs;
+
     @ApiModelProperty("是否洒水")
     private Integer sfss;
+
     @ApiModelProperty("是否冲洗")
     private Integer sfcx;
 

src/main/java/com/hisense/monitormanage/entity/SanitationRoad.java

@@ -20,51 +20,96 @@ import lombok.NoArgsConstructor;
 @TableName("t_sanitation_road")
 @ApiModel("环卫道路数据")
 public class SanitationRoad {
+
     @TableField
     private Integer id;
+
     private String bh;
+
     private String dlmc;
+
     private String qdlkdlmc;
+
     private String zdlkdlmc;
+
     private String zcgdlxzc;
+
     private String bjdj;
+
     private double dlzd;
+
     private double dlkd;
+
     private double dlzmj;
+
     private double cxdmj;
+
     private double rxdmj;
+
     private double jsmj;
+
     private double ssmj;
+
     private double gycxmj;
+
     private Integer bjysl;
+
     private Integer gpxsl;
+
     private String ssqybh;
+
     private String ssjdbsc;
+
     private String sshwgsbh;
+
     private String zbjh;
+
     private String sfqy;
+
     private String bz;
+
     private String bh1;
+
     private Integer dtdlhzkd;
+
     private String zcgd;
+
     private String jsqz;
+
     private String cxqz;
+
     private String jj;
+
     private String tplj;
+
     private String zbdfxbz0zx1fx;
+
     private String fxzbxxid;
+
     private String ys;
+
     private double btmx;
+
     private Integer jsts;
+
     private String jspc;
+
     private Integer sfjs0bjs1js;
+
     private Integer sfss0bss1ss;
+
     private Integer sfcx0bcx1cx;
+
     private String sspc;
+
     private String cxpc;
+
     private Integer ssts;
+
     private Integer cxts;
+
     private String sfkh;
 
+    private String updatetime;
 
 }

src/main/java/com/hisense/monitormanage/entity/SanitationTask.java

@@ -24,44 +24,63 @@ import java.time.LocalDateTime;
 @TableName("t_sanitation_task")
 @ApiModel("环卫车辆作业数据")
 public class SanitationTask {
+
     @TableId
     @ApiModelProperty("id")
     private Integer id;
+
     @ApiModelProperty("道路名称")
     private String dlmc;
+
     @ApiModelProperty("开始道路")
     private String ksdl;
+
     @ApiModelProperty("终止道路")
     private String zzdl;
+
     @ApiModelProperty("所属区市")
     private String ssqs;
+
     @ApiModelProperty("车牌号")
     private String cph;
+
     @ApiModelProperty("作业完成率")
     private double zywcl;
+
     @JsonFormat(pattern="yyyy-MM-dd mm:HH:ss",timezone = "GMT+8")
     @ApiModelProperty("作业日期")
     private LocalDateTime zyrq;
+
     @ApiModelProperty("作业类型")
     private String zylx;
+
     @ApiModelProperty("作业时间")
     private String zysj;
+
     @ApiModelProperty("作业趟数")
     private double zyts;
+
     @ApiModelProperty("作业频次")
     private double zypc;
+
     @ApiModelProperty("作业长度")
     private double zyzd;
+
     @ApiModelProperty("作业宽度")
     private double zykd;
+
     @ApiModelProperty("作业面积")
     private double zymj;
+
     @ApiModelProperty("未作业点数")
     private double wzyds;
+
     @ApiModelProperty("作业超速点数")
     private double zycsds;
+
     @ApiModelProperty("作业GPS点数")
     private double zygpsds;
+
     @JsonFormat(pattern="yyyy-MM-dd mm:HH:ss",timezone = "GMT+8")
     @ApiModelProperty("上传时间")
     private LocalDateTime updatetime;

src/main/java/com/hisense/monitormanage/entity/SedimentTrail.java

@@ -21,21 +21,35 @@ import java.time.LocalDateTime;
 @NoArgsConstructor
 @TableName("t_trail_sediment")
 public class SedimentTrail{
+
     @TableId
     private Integer id;
+
     private double speed;
+
     private String simCardNum;
+
     @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
     private LocalDateTime uploadtime;
+
     private double coordinateX;
+
     private double coordinateY;
+
     private double longitude;
+
     private double latitude;
+
     @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
     private LocalDateTime recordTime;
+
     private double angle;
+
     @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
     private LocalDateTime updateTime;
+
     private String status;
+
     private double fuel;
+
 }

src/main/java/com/hisense/monitormanage/entity/TestCode.java

@@ -1,11 +1,12 @@
 package com.hisense.monitormanage.entity;
 
-import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
 
 @Data
 @TableName("t_test_code")
 public class TestCode {
+
     private String channelCode;
+
 }

src/main/java/com/hisense/monitormanage/entity/TrailSanitation.java

@@ -21,25 +21,44 @@ import java.time.LocalDateTime;
 @NoArgsConstructor
 @TableName("t_trail_sanitation")
 public class TrailSanitation {
+
     @TableId
     private Integer id;
+
     private String simkh;
+
     private String cph;
+
     private String wz;
+
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
     private LocalDateTime fssj;
+
     private double jd;
+
     private double wd;
+
     private double sd;
+
     private Integer fx;
+
     private String zt;
+
     private double yl;
+
     private double lc;
+
     private double yl2;
+
     private Integer sfzx;
+
     private Integer xh;
+
     private String bjzt;
+
     private double gd;
+
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
     private LocalDateTime updatetime;
+
 }

src/main/java/com/hisense/monitormanage/entity/UserLogin.java

@@ -7,10 +7,12 @@ import lombok.Data;
 @Data
 @TableName("t_user_login")
 public class UserLogin {
+
     @TableId
     private Integer id;
 
     private String username;
 
     private String password;
+
 }

src/main/java/com/hisense/monitormanage/entity/WCamera.java

@@ -1,18 +1,24 @@
 package com.hisense.monitormanage.entity;
 
-import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
 
 @Data
 @TableName("w_camera")
 public class WCamera {
+
     private Integer waterId;
+
     private String ChannelCode;
+
     private String channelName;
+
     private String gpsX;
+
     private String gpsY;
+
     private String illustrate;
+
     private String videoCapture;
 
 }

src/main/java/com/hisense/monitormanage/entity/WaterPoint.java

@@ -8,28 +8,53 @@ import java.math.BigDecimal;
 @Data
 @TableName("water_point")
 public class WaterPoint {
+
     private String waterPointId;
+
     private String waterPointName;//积水点名称
+
     private String districtId;//所属区域ID
+
     private String address;//地址
+
     private String pointType;//积水点类型1：路段；2：桥下；3：洞内；4：小区
+
     private String uuid;//地址坐标ID
+
     private BigDecimal longitude;//经度
+
     private BigDecimal latitude;//纬度
+
     private String charge;//负责人
+
     private String chargeTel;//负责人电话
+
     private String remark;//备注
+
     private String delFlag;//删除状态
+
     private String createdDate;//创建时间
+
     private String createdBy;//创建人ID
+
     private String updatedDate;//更新时间
+
     private String updatedBy;//更新人ID
+
     private String reportOrigin;//上报来源：auditorReport--水务集团上报；commonReport--群众上报；case--城管案例；video--视频感知
+
     private String isEasyPoint;//是否易积水点；0是 1否
+
     private String dispFlag;//0未处置 1处置中 2处置完成
+
     private String auditFlag;//审核状态；0未审核; 1审核不通过;2审核通过
+
     private String upNum;//点赞数量
+
     private String underNum;//点踩数量
+
     private String addressDesc;//详细地址描述
+
     private String waterPointDesc;//现场情况说明
+
 }

src/main/java/com/hisense/monitormanage/mapper/BoothMapper.java

@@ -12,4 +12,5 @@ public interface BoothMapper extends BaseMapper<Booth> {
 
     @Select("select * from t_booth where capture_time = #{captureTime}")
     List<Booth> selectBooth(String captureTime);
+
 }

src/main/java/com/hisense/monitormanage/mapper/BuildingRecordsMapper.java

@@ -20,6 +20,7 @@ import java.util.Map;
  */
 @Repository
 public interface BuildingRecordsMapper extends BaseMapper<BuildingRecords> {
+
     public void batchSave(@Param("list") List<Map> list);
 
     void batchUpdate(@Param("list") List<Map> list);

src/main/java/com/hisense/monitormanage/mapper/CameraChannelMapper.java

@@ -58,6 +58,6 @@ public interface CameraChannelMapper extends BaseMapper<CameraChannel> {
 
     List<CameraChannelNLDto> selectNLAll(@Param("page") Integer page,@Param("pageSize") Integer pageSize);
 
-    @Select("SELECT * FROM t_camera_channel WHERE channel_code < '183_37028301831321234380' AND channel_code > '183_37028301831321232834' ORDER BY channel_code DESC\n" )
+    @Select("SELECT * FROM t_camera_channel WHERE channel_code < '183_37028301831321232723' AND channel_code > '183_37028301831321231067' ORDER BY channel_code DESC" )
     List<CameraChannel> selectCameraChannel();
 }

src/main/java/com/hisense/monitormanage/mapper/CaseCityLawMapper.java

@@ -16,6 +16,7 @@ import java.util.Map;
  */
 @Repository
 public interface CaseCityLawMapper extends BaseMapper<CaseCityLaw> {
-    public void batchSave(List<Map> list);
-    public void singleSave(Map map);
+
+    void batchSave(List<Map> list);
+
 }

src/main/java/com/hisense/monitormanage/mapper/PassengerFlowMapper.java

@@ -13,7 +13,9 @@ import java.util.Map;
 
 @Repository
 public interface PassengerFlowMapper extends BaseMapper<PassengerFlow> {
+
     void batchSave(List<Map> list);
+
     PassengerFlow getByMaxId();
 
     List<PassengerFlow> selectByTime(String timeId);

src/main/java/com/hisense/monitormanage/mapper/PeopleRecognizeMapper.java

@@ -10,6 +10,7 @@ import java.util.List;
 
 @Repository
 public interface PeopleRecognizeMapper extends BaseMapper<PeopleRecognize> {
+
     @Select("select pr.*,cc.* from t_camera_channel cc JOIN t_people_recognize pr ON cc.channel_code = pr.channel_code")
     List<PeopleRecognizeDto> selectPeopleRecognize();
 

src/main/java/com/hisense/monitormanage/mapper/RoadDataMapper.java

@@ -18,7 +18,8 @@ import java.util.Map;
  */
 @Repository
 public interface RoadDataMapper extends BaseMapper<RoadData> {
-    public void batchSave(List<Map> list);
+
+    void batchSave(List<Map> list);
 
     List<RoadData> selectRoadData(@Param("page") Integer page,@Param("pageSize") Integer pageSize);
 

src/main/java/com/hisense/monitormanage/mapper/SanitationMapper.java

@@ -17,7 +17,9 @@ import java.util.Map;
  */
 @Repository
 public interface SanitationMapper extends BaseMapper<Sanitation> {
-    void batchSave(@Param("list") List<Map> list);
+
     void batchSaveSanitationRoad(@Param("list") List<Map> list);
+
     void batchSaveSanitationTask(@Param("list") List<Map> list);
+
 }

src/main/java/com/hisense/monitormanage/mapper/SedimentTrailMapper.java

@@ -16,5 +16,7 @@ import java.util.Map;
  */
 @Repository
 public interface SedimentTrailMapper extends BaseMapper<SedimentTrail> {
-    public void batchaSave(List<Map> list);
+
+    void batchaSave(List<Map> list);
+
 }

src/main/java/com/hisense/monitormanage/mapper/TrailSanitationMapper.java

@@ -11,7 +11,8 @@ import java.util.Map;
 
 @Repository
 public interface TrailSanitationMapper extends BaseMapper<TrailSanitation> {
-    public void batchaSave(List<Map> list);
+
+    void batchaSave(List<Map> list);
 
     @Select("select * from t_trail_sanitation")
     List<TrailSanitation> selectAllTrailSanitation();

src/main/java/com/hisense/monitormanage/mapper/WaterPointMapper.java

@@ -12,6 +12,7 @@ import java.util.List;
 
 @Repository
 public interface WaterPointMapper extends BaseMapper<WaterPoint> {
+
     @Select("select * from water_point wp LEFT JOIN water_point_report wpr ON wp.water_point_id = wpr.water_point_id WHERE wp.audit_flag = '2' and wp.disp_flag in (0,1)")
     List<WaterPointDto> selectWaterPoint();
 

src/main/java/com/hisense/monitormanage/service/BuildingRecordsService.java

@@ -28,8 +28,10 @@ import java.util.Map;
 @Service
 @Slf4j
 public class BuildingRecordsService {
+
     @Autowired
     private BuildingRecordsMapper buildingRecordsMapper;
+
     @Autowired
     private RestTemplate restTemplate;
 
@@ -40,7 +42,6 @@ public class BuildingRecordsService {
         map.put("timestamp","");
         map.put("sign","");
         map.put("data","");
-
         ResponseEntity<JSONObject> responseEntity;
         List<Map> maps = new ArrayList<>();
         try{
@@ -65,7 +66,6 @@ public class BuildingRecordsService {
     public boolean getAndSaveRecords(){
         List<Map> maps = this.getRecords();
         boolean result = false;
-
         if(maps.size() > 0){
             List<List<Map>> lists = Lists.partition(maps,200);
             try{
@@ -83,7 +83,6 @@ public class BuildingRecordsService {
     public boolean getUpdateRecords(){
         List<Map> maps = this.getRecords();
         boolean result = false;
-
         if(maps.size() > 0){
             List<List<Map>> lists = Lists.partition(maps,200);
             try{
@@ -104,6 +103,4 @@ public class BuildingRecordsService {
         list = buildingRecordsMapper.selectList(wrapper);
         return list;
     }
-
-
 }

src/main/java/com/hisense/monitormanage/service/MonitorService.java

@@ -307,7 +307,7 @@ public class MonitorService {
     /**
      * 所有摄像头抓图 sql持续更新
      */
-    @Scheduled(cron = "0 0 6 * * ?")
+    //@Scheduled(cron = "0 0 6 * * ?")
     public void CameraScreenshot () {
         try {
             log.info("[monitor-capture]: start capture");

src/main/java/com/hisense/monitormanage/service/SanitationService.java

@@ -35,17 +35,6 @@ public class SanitationService {
     @Autowired
     private SanitationTaskMapper sanitationTaskMapper;
 
-
-    public Result saveSantation(){
-        List<Map> list = qidiService.resCatalogApplyHJWSBase();
-        if(list.size() > 0){
-            List<List<Map>> maps = Lists.partition(list,100);
-
-        }
-
-        return null;
-    }
-
     public Result saveSanitationRoad(){
         List<Map> list = qidiService.resCatalogApplyHJWSRoad();
         try{

src/main/resources/mapper/SanitationMapper.xml

@@ -1,26 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.hisense.monitormanage.mapper.SanitationMapper">
-    <insert id="batchSave" parameterType="java.util.List">
-        insert into t_sanitation_info
-            (cph,jsy,gmri,cllx,ssqybh,sshwgsbh,bz,sfkh,clbh,ds,sfjzgpsblrsjgpt,jj,
-             clxh,cldl,sfjs,sfss,sfcx
-             )
-        values
-        <foreach collection="list" item="item" separator=",">
-            (
-             #{item.cph},#{item.cph},#{item.cph},#{item.cph},#{item.cph},#{item.cph},
-            #{item.cph},#{item.cph},#{item.cph},#{item.cph},#{item.cph},#{item.cph}
-            )
-        </foreach>
-    </insert>
-
     <insert id="batchSaveSanitationRoad" parameterType="java.util.List">
         insert into t_sanitation_road
             (bh,dlmc,qdlkdlmc,zdlkdlmc,zcgdlxzc,bjdj,dlzd,dlkd,dlzmj,cxdmj,rxdmj,jsmj,ssmj,
                 gycxmj,bjysl,gpxsl,ssqybh,ssjdbsc,sshwgsbh,zbjh,sfqy,bh1,dtdlhzkd,
                 zcgd,jsqz,cxqz,jj,tplj,zbdfxbz0zx1fx,fxzbxxid,ys,btmx,jsts,jspc,
-                sfjs0bjs1js,sfss0bss1ss,sfcx0bcx1cx,sspc,cxpc,ssts,cxts,sfkh
+                sfjs0bjs1js,sfss0bss1ss,sfcx0bcx1cx,sspc,cxpc,ssts,cxts,sfkh,updatetime
             )
         values
         <foreach collection="list" item="item" separator=",">
@@ -31,7 +17,7 @@
              #{item.ZBJH},#{item.SFQY},#{item.BH1},#{item.DTDLHZKD},#{item.ZCGD},#{item.JSQZ},
              #{item.CXQZ},#{item.JJ},#{item.TPLJ},#{item.ZBDFXBZ0ZX1FX},#{item.FXZBXXID},#{item.YS},
              #{item.BTMX},#{item.JSTS},#{item.JSPC},#{item.SFJS0BJS1JS},#{item.SFSS0BSS1SS},#{item.SFCX0BCX1CX},
-             #{item.SSPC},#{item.CXPC},#{item.SSTS},#{item.CXTS},#{item.SFKH}
+             #{item.SSPC},#{item.CXPC},#{item.SSTS},#{item.CXTS},#{item.SFKH},#{item.updatetime}
             )
         </foreach>
     </insert>