From 720a57d40d6eac206fc138a8724ee093e6ee4130 Mon Sep 17 00:00:00 2001 From: wuweida <2918581207@qq.com> Date: Wed, 20 Jul 2022 13:36:55 +0800 Subject: [PATCH] 1 --- .../monitormanage/config/CachingConfig.java | 3 ++ .../config/GlobalCorsConfig.java | 1 + .../monitormanage/config/RestClient.java | 7 ++- .../monitormanage/config/ScheduleConfig.java | 1 + .../monitormanage/config/SwaggerConfig.java | 2 +- .../controller/BuildingController.java | 8 ++-- .../monitormanage/dto/BuildingRecordsDto.java | 15 +++++++ .../dto/BuildingRecordsDtos.java | 4 ++ .../monitormanage/dto/CameraChannelDto1.java | 1 + .../monitormanage/dto/ChannelLabelDto.java | 3 -- .../monitormanage/dto/ChannelPictureDto.java | 6 +-- .../monitormanage/dto/ChengguanDto.java | 4 +- .../hisense/monitormanage/dto/EventDto.java | 15 +++++++ .../hisense/monitormanage/dto/KeyAreaDto.java | 6 +++ .../monitormanage/dto/PassengerFlowDto.java | 8 ++++ .../monitormanage/dto/PeopleRecognizeDto.java | 12 +++++ .../hisense/monitormanage/dto/PictureDto.java | 10 +++-- .../monitormanage/dto/ScenicCameraDto.java | 4 +- .../monitormanage/dto/UserLoginDto.java | 3 ++ .../monitormanage/dto/WaterCameraDto.java | 9 ++++ .../monitormanage/dto/WaterPointDto.java | 26 +++++++++++ .../monitormanage/dto/WaterPointDtos.java | 5 +++ .../hisense/monitormanage/entity/Booth.java | 11 +++++ .../monitormanage/entity/BuildingRecords.java | 8 ++++ .../monitormanage/entity/BuildingSite.java | 8 ++++ .../hisense/monitormanage/entity/Camera.java | 5 +++ .../monitormanage/entity/CameraCheck.java | 13 ++---- .../entity/CameraOrganization.java | 2 +- .../monitormanage/entity/CameraScenic.java | 1 + .../monitormanage/entity/CaseCityLaw.java | 29 ++++++++++-- .../monitormanage/entity/ChannelPicture.java | 1 + .../hisense/monitormanage/entity/Event.java | 15 +++++++ .../hisense/monitormanage/entity/KeyArea.java | 9 ++++ .../monitormanage/entity/KeyAreaLocation.java | 4 ++ .../hisense/monitormanage/entity/Label.java | 5 +++ .../monitormanage/entity/PassengerFlow.java | 9 ++++ .../monitormanage/entity/PassengerTest.java | 6 +++ .../monitormanage/entity/PeopleRecognize.java | 7 +++ .../hisense/monitormanage/entity/Picture.java | 2 + .../hisense/monitormanage/entity/Project.java | 11 +++++ .../hisense/monitormanage/entity/Result.java | 6 +++ .../monitormanage/entity/RoadData.java | 17 +++++++ .../monitormanage/entity/Sanitation.java | 18 ++++++++ .../monitormanage/entity/SanitationRoad.java | 45 +++++++++++++++++++ .../monitormanage/entity/SanitationTask.java | 19 ++++++++ .../monitormanage/entity/SedimentTrail.java | 14 ++++++ .../monitormanage/entity/TestCode.java | 3 +- .../monitormanage/entity/TrailSanitation.java | 19 ++++++++ .../monitormanage/entity/UserLogin.java | 2 + .../hisense/monitormanage/entity/WCamera.java | 8 +++- .../monitormanage/entity/WaterPoint.java | 25 +++++++++++ .../monitormanage/mapper/BoothMapper.java | 1 + .../mapper/BuildingRecordsMapper.java | 1 + .../mapper/CameraChannelMapper.java | 2 +- .../mapper/CaseCityLawMapper.java | 5 ++- .../mapper/PassengerFlowMapper.java | 2 + .../mapper/PeopleRecognizeMapper.java | 1 + .../monitormanage/mapper/RoadDataMapper.java | 3 +- .../mapper/SanitationMapper.java | 4 +- .../mapper/SedimentTrailMapper.java | 4 +- .../mapper/TrailSanitationMapper.java | 3 +- .../mapper/WaterPointMapper.java | 1 + .../service/BuildingRecordsService.java | 7 +-- .../monitormanage/service/MonitorService.java | 2 +- .../service/SanitationService.java | 11 ----- .../resources/mapper/SanitationMapper.xml | 18 +------- 66 files changed, 465 insertions(+), 75 deletions(-) diff --git a/src/main/java/com/hisense/monitormanage/config/CachingConfig.java b/src/main/java/com/hisense/monitormanage/config/CachingConfig.java index 43af519..3d40fec 100644 --- a/src/main/java/com/hisense/monitormanage/config/CachingConfig.java +++ b/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; } } diff --git a/src/main/java/com/hisense/monitormanage/config/GlobalCorsConfig.java b/src/main/java/com/hisense/monitormanage/config/GlobalCorsConfig.java index 0119c0c..a673691 100644 --- a/src/main/java/com/hisense/monitormanage/config/GlobalCorsConfig.java +++ b/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); diff --git a/src/main/java/com/hisense/monitormanage/config/RestClient.java b/src/main/java/com/hisense/monitormanage/config/RestClient.java index ec53fea..6ca0e6a 100644 --- a/src/main/java/com/hisense/monitormanage/config/RestClient.java +++ b/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; } diff --git a/src/main/java/com/hisense/monitormanage/config/ScheduleConfig.java b/src/main/java/com/hisense/monitormanage/config/ScheduleConfig.java index d4e3bfa..ad035f5 100644 --- a/src/main/java/com/hisense/monitormanage/config/ScheduleConfig.java +++ b/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的定时任务线程池 diff --git a/src/main/java/com/hisense/monitormanage/config/SwaggerConfig.java b/src/main/java/com/hisense/monitormanage/config/SwaggerConfig.java index 74f95c0..4746ff3 100644 --- a/src/main/java/com/hisense/monitormanage/config/SwaggerConfig.java +++ b/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(); } - } diff --git a/src/main/java/com/hisense/monitormanage/controller/BuildingController.java b/src/main/java/com/hisense/monitormanage/controller/BuildingController.java index f1ecdfb..44bdff6 100644 --- a/src/main/java/com/hisense/monitormanage/controller/BuildingController.java +++ b/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 recordsDtos = buildingRecordsMapper.selectWeekPmAndNoice(buildLicense); - recordsDtos.forEach(record ->{ + List 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; } diff --git a/src/main/java/com/hisense/monitormanage/dto/BuildingRecordsDto.java b/src/main/java/com/hisense/monitormanage/dto/BuildingRecordsDto.java index c83b63f..a8c6d36 100644 --- a/src/main/java/com/hisense/monitormanage/dto/BuildingRecordsDto.java +++ b/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;//摄像头名称 + } diff --git a/src/main/java/com/hisense/monitormanage/dto/BuildingRecordsDtos.java b/src/main/java/com/hisense/monitormanage/dto/BuildingRecordsDtos.java index 5de2013..61f2e6d 100644 --- a/src/main/java/com/hisense/monitormanage/dto/BuildingRecordsDtos.java +++ b/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; + } diff --git a/src/main/java/com/hisense/monitormanage/dto/CameraChannelDto1.java b/src/main/java/com/hisense/monitormanage/dto/CameraChannelDto1.java index 3e908f0..4abce40 100644 --- a/src/main/java/com/hisense/monitormanage/dto/CameraChannelDto1.java +++ b/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; diff --git a/src/main/java/com/hisense/monitormanage/dto/ChannelLabelDto.java b/src/main/java/com/hisense/monitormanage/dto/ChannelLabelDto.java index be57d10..4a510f2 100644 --- a/src/main/java/com/hisense/monitormanage/dto/ChannelLabelDto.java +++ b/src/main/java/com/hisense/monitormanage/dto/ChannelLabelDto.java @@ -17,7 +17,4 @@ public class ChannelLabelDto { private String nodeName; - - - } diff --git a/src/main/java/com/hisense/monitormanage/dto/ChannelPictureDto.java b/src/main/java/com/hisense/monitormanage/dto/ChannelPictureDto.java index cd4855d..bf313a5 100644 --- a/src/main/java/com/hisense/monitormanage/dto/ChannelPictureDto.java +++ b/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; - - - } diff --git a/src/main/java/com/hisense/monitormanage/dto/ChengguanDto.java b/src/main/java/com/hisense/monitormanage/dto/ChengguanDto.java index c006be8..e975039 100644 --- a/src/main/java/com/hisense/monitormanage/dto/ChengguanDto.java +++ b/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; + } diff --git a/src/main/java/com/hisense/monitormanage/dto/EventDto.java b/src/main/java/com/hisense/monitormanage/dto/EventDto.java index bfe5bfd..da58105 100644 --- a/src/main/java/com/hisense/monitormanage/dto/EventDto.java +++ b/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; + } diff --git a/src/main/java/com/hisense/monitormanage/dto/KeyAreaDto.java b/src/main/java/com/hisense/monitormanage/dto/KeyAreaDto.java index 7778a8b..ca3e280 100644 --- a/src/main/java/com/hisense/monitormanage/dto/KeyAreaDto.java +++ b/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; + } diff --git a/src/main/java/com/hisense/monitormanage/dto/PassengerFlowDto.java b/src/main/java/com/hisense/monitormanage/dto/PassengerFlowDto.java index 4944a31..08d6e3f 100644 --- a/src/main/java/com/hisense/monitormanage/dto/PassengerFlowDto.java +++ b/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; + } diff --git a/src/main/java/com/hisense/monitormanage/dto/PeopleRecognizeDto.java b/src/main/java/com/hisense/monitormanage/dto/PeopleRecognizeDto.java index fa641c0..134c65a 100644 --- a/src/main/java/com/hisense/monitormanage/dto/PeopleRecognizeDto.java +++ b/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异常 + } diff --git a/src/main/java/com/hisense/monitormanage/dto/PictureDto.java b/src/main/java/com/hisense/monitormanage/dto/PictureDto.java index aa289fe..25a2654 100644 --- a/src/main/java/com/hisense/monitormanage/dto/PictureDto.java +++ b/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; - - - } diff --git a/src/main/java/com/hisense/monitormanage/dto/ScenicCameraDto.java b/src/main/java/com/hisense/monitormanage/dto/ScenicCameraDto.java index cab10d8..9cd8631 100644 --- a/src/main/java/com/hisense/monitormanage/dto/ScenicCameraDto.java +++ b/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; + } diff --git a/src/main/java/com/hisense/monitormanage/dto/UserLoginDto.java b/src/main/java/com/hisense/monitormanage/dto/UserLoginDto.java index 5bf0061..9de27c7 100644 --- a/src/main/java/com/hisense/monitormanage/dto/UserLoginDto.java +++ b/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; + } diff --git a/src/main/java/com/hisense/monitormanage/dto/WaterCameraDto.java b/src/main/java/com/hisense/monitormanage/dto/WaterCameraDto.java index ff224b5..4d69d7c 100644 --- a/src/main/java/com/hisense/monitormanage/dto/WaterCameraDto.java +++ b/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; + } diff --git a/src/main/java/com/hisense/monitormanage/dto/WaterPointDto.java b/src/main/java/com/hisense/monitormanage/dto/WaterPointDto.java index 7c8badc..4ced3cb 100644 --- a/src/main/java/com/hisense/monitormanage/dto/WaterPointDto.java +++ b/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：无积水 + } diff --git a/src/main/java/com/hisense/monitormanage/dto/WaterPointDtos.java b/src/main/java/com/hisense/monitormanage/dto/WaterPointDtos.java index b7766e2..1fc4558 100644 --- a/src/main/java/com/hisense/monitormanage/dto/WaterPointDtos.java +++ b/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; + } diff --git a/src/main/java/com/hisense/monitormanage/entity/Booth.java b/src/main/java/com/hisense/monitormanage/entity/Booth.java index 76bc7c6..7d7c016 100644 --- a/src/main/java/com/hisense/monitormanage/entity/Booth.java +++ b/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; + } diff --git a/src/main/java/com/hisense/monitormanage/entity/BuildingRecords.java b/src/main/java/com/hisense/monitormanage/entity/BuildingRecords.java index e052ee5..ef75703 100644 --- a/src/main/java/com/hisense/monitormanage/entity/BuildingRecords.java +++ b/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; + } diff --git a/src/main/java/com/hisense/monitormanage/entity/BuildingSite.java b/src/main/java/com/hisense/monitormanage/entity/BuildingSite.java index c7949be..9c46e46 100644 --- a/src/main/java/com/hisense/monitormanage/entity/BuildingSite.java +++ b/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; + } diff --git a/src/main/java/com/hisense/monitormanage/entity/Camera.java b/src/main/java/com/hisense/monitormanage/entity/Camera.java index 7c7270e..30511c0 100644 --- a/src/main/java/com/hisense/monitormanage/entity/Camera.java +++ b/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; + } diff --git a/src/main/java/com/hisense/monitormanage/entity/CameraCheck.java b/src/main/java/com/hisense/monitormanage/entity/CameraCheck.java index 3e32fd3..7255ca1 100644 --- a/src/main/java/com/hisense/monitormanage/entity/CameraCheck.java +++ b/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; } diff --git a/src/main/java/com/hisense/monitormanage/entity/CameraOrganization.java b/src/main/java/com/hisense/monitormanage/entity/CameraOrganization.java index 5a85729..77602a3 100644 --- a/src/main/java/com/hisense/monitormanage/entity/CameraOrganization.java +++ b/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; - } diff --git a/src/main/java/com/hisense/monitormanage/entity/CameraScenic.java b/src/main/java/com/hisense/monitormanage/entity/CameraScenic.java index 09dd250..654087c 100644 --- a/src/main/java/com/hisense/monitormanage/entity/CameraScenic.java +++ b/src/main/java/com/hisense/monitormanage/entity/CameraScenic.java @@ -11,6 +11,7 @@ public class CameraScenic { @TableId private String cameraId; + private Integer personNum; } diff --git a/src/main/java/com/hisense/monitormanage/entity/CaseCityLaw.java b/src/main/java/com/hisense/monitormanage/entity/CaseCityLaw.java index 2ed147f..c83c1fa 100644 --- a/src/main/java/com/hisense/monitormanage/entity/CaseCityLaw.java +++ b/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; - - - } diff --git a/src/main/java/com/hisense/monitormanage/entity/ChannelPicture.java b/src/main/java/com/hisense/monitormanage/entity/ChannelPicture.java index 94093f0..cbe39e4 100644 --- a/src/main/java/com/hisense/monitormanage/entity/ChannelPicture.java +++ b/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; diff --git a/src/main/java/com/hisense/monitormanage/entity/Event.java b/src/main/java/com/hisense/monitormanage/entity/Event.java index e543252..0064abd 100644 --- a/src/main/java/com/hisense/monitormanage/entity/Event.java +++ b/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; + } diff --git a/src/main/java/com/hisense/monitormanage/entity/KeyArea.java b/src/main/java/com/hisense/monitormanage/entity/KeyArea.java index f36bdc6..580a709 100644 --- a/src/main/java/com/hisense/monitormanage/entity/KeyArea.java +++ b/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;//简介 + } diff --git a/src/main/java/com/hisense/monitormanage/entity/KeyAreaLocation.java b/src/main/java/com/hisense/monitormanage/entity/KeyAreaLocation.java index ff66349..e2bf394 100644 --- a/src/main/java/com/hisense/monitormanage/entity/KeyAreaLocation.java +++ b/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; + } diff --git a/src/main/java/com/hisense/monitormanage/entity/Label.java b/src/main/java/com/hisense/monitormanage/entity/Label.java index 5619b0f..d2e1abe 100644 --- a/src/main/java/com/hisense/monitormanage/entity/Label.java +++ b/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; } diff --git a/src/main/java/com/hisense/monitormanage/entity/PassengerFlow.java b/src/main/java/com/hisense/monitormanage/entity/PassengerFlow.java index 9179367..4d8befa 100644 --- a/src/main/java/com/hisense/monitormanage/entity/PassengerFlow.java +++ b/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; + } diff --git a/src/main/java/com/hisense/monitormanage/entity/PassengerTest.java b/src/main/java/com/hisense/monitormanage/entity/PassengerTest.java index 8fde918..078e027 100644 --- a/src/main/java/com/hisense/monitormanage/entity/PassengerTest.java +++ b/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; + } diff --git a/src/main/java/com/hisense/monitormanage/entity/PeopleRecognize.java b/src/main/java/com/hisense/monitormanage/entity/PeopleRecognize.java index 6f26234..45ae57c 100644 --- a/src/main/java/com/hisense/monitormanage/entity/PeopleRecognize.java +++ b/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; + } diff --git a/src/main/java/com/hisense/monitormanage/entity/Picture.java b/src/main/java/com/hisense/monitormanage/entity/Picture.java index 0131e34..8b9455a 100644 --- a/src/main/java/com/hisense/monitormanage/entity/Picture.java +++ b/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; + } diff --git a/src/main/java/com/hisense/monitormanage/entity/Project.java b/src/main/java/com/hisense/monitormanage/entity/Project.java index 18fb390..3063ac2 100644 --- a/src/main/java/com/hisense/monitormanage/entity/Project.java +++ b/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 pics; + } diff --git a/src/main/java/com/hisense/monitormanage/entity/Result.java b/src/main/java/com/hisense/monitormanage/entity/Result.java index e7062c5..72a3ede 100644 --- a/src/main/java/com/hisense/monitormanage/entity/Result.java +++ b/src/main/java/com/hisense/monitormanage/entity/Result.java @@ -9,8 +9,11 @@ import lombok.Data; public class Result { private int code; + private String message; + private T data; + private int count; static public Result success(){ @@ -19,6 +22,7 @@ public class Result { .message("success") .build(); } + static public Result success(Object obj){ return Result.builder() .code(1) @@ -26,10 +30,12 @@ public class Result { .data(obj) .build(); } + static public Result error(String errMsg){ return Result.builder() .code(0) .message(errMsg) .build(); } + } diff --git a/src/main/java/com/hisense/monitormanage/entity/RoadData.java b/src/main/java/com/hisense/monitormanage/entity/RoadData.java index 804813a..b466874 100644 --- a/src/main/java/com/hisense/monitormanage/entity/RoadData.java +++ b/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; + } diff --git a/src/main/java/com/hisense/monitormanage/entity/Sanitation.java b/src/main/java/com/hisense/monitormanage/entity/Sanitation.java index c387a37..cf03a3a 100644 --- a/src/main/java/com/hisense/monitormanage/entity/Sanitation.java +++ b/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; diff --git a/src/main/java/com/hisense/monitormanage/entity/SanitationRoad.java b/src/main/java/com/hisense/monitormanage/entity/SanitationRoad.java index a05892f..1758a1e 100644 --- a/src/main/java/com/hisense/monitormanage/entity/SanitationRoad.java +++ b/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; } diff --git a/src/main/java/com/hisense/monitormanage/entity/SanitationTask.java b/src/main/java/com/hisense/monitormanage/entity/SanitationTask.java index 6e21be9..7c1e29a 100644 --- a/src/main/java/com/hisense/monitormanage/entity/SanitationTask.java +++ b/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; diff --git a/src/main/java/com/hisense/monitormanage/entity/SedimentTrail.java b/src/main/java/com/hisense/monitormanage/entity/SedimentTrail.java index b2b1f12..8dbd92e 100644 --- a/src/main/java/com/hisense/monitormanage/entity/SedimentTrail.java +++ b/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; + } diff --git a/src/main/java/com/hisense/monitormanage/entity/TestCode.java b/src/main/java/com/hisense/monitormanage/entity/TestCode.java index 29281e5..f2943c3 100644 --- a/src/main/java/com/hisense/monitormanage/entity/TestCode.java +++ b/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; + } diff --git a/src/main/java/com/hisense/monitormanage/entity/TrailSanitation.java b/src/main/java/com/hisense/monitormanage/entity/TrailSanitation.java index 6b4dd7f..25ce512 100644 --- a/src/main/java/com/hisense/monitormanage/entity/TrailSanitation.java +++ b/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; + } diff --git a/src/main/java/com/hisense/monitormanage/entity/UserLogin.java b/src/main/java/com/hisense/monitormanage/entity/UserLogin.java index aab7375..e1342ed 100644 --- a/src/main/java/com/hisense/monitormanage/entity/UserLogin.java +++ b/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; + } diff --git a/src/main/java/com/hisense/monitormanage/entity/WCamera.java b/src/main/java/com/hisense/monitormanage/entity/WCamera.java index b0113ac..9cff4f9 100644 --- a/src/main/java/com/hisense/monitormanage/entity/WCamera.java +++ b/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; } diff --git a/src/main/java/com/hisense/monitormanage/entity/WaterPoint.java b/src/main/java/com/hisense/monitormanage/entity/WaterPoint.java index 6e33906..a26c9e9 100644 --- a/src/main/java/com/hisense/monitormanage/entity/WaterPoint.java +++ b/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;//现场情况说明 + } diff --git a/src/main/java/com/hisense/monitormanage/mapper/BoothMapper.java b/src/main/java/com/hisense/monitormanage/mapper/BoothMapper.java index ec6cc74..5ae5f9d 100644 --- a/src/main/java/com/hisense/monitormanage/mapper/BoothMapper.java +++ b/src/main/java/com/hisense/monitormanage/mapper/BoothMapper.java @@ -12,4 +12,5 @@ public interface BoothMapper extends BaseMapper { @Select("select * from t_booth where capture_time = #{captureTime}") List selectBooth(String captureTime); + } diff --git a/src/main/java/com/hisense/monitormanage/mapper/BuildingRecordsMapper.java b/src/main/java/com/hisense/monitormanage/mapper/BuildingRecordsMapper.java index d236b72..c6b482a 100644 --- a/src/main/java/com/hisense/monitormanage/mapper/BuildingRecordsMapper.java +++ b/src/main/java/com/hisense/monitormanage/mapper/BuildingRecordsMapper.java @@ -20,6 +20,7 @@ import java.util.Map; */ @Repository public interface BuildingRecordsMapper extends BaseMapper { + public void batchSave(@Param("list") List list); void batchUpdate(@Param("list") List list); diff --git a/src/main/java/com/hisense/monitormanage/mapper/CameraChannelMapper.java b/src/main/java/com/hisense/monitormanage/mapper/CameraChannelMapper.java index 307c61c..0963fcf 100644 --- a/src/main/java/com/hisense/monitormanage/mapper/CameraChannelMapper.java +++ b/src/main/java/com/hisense/monitormanage/mapper/CameraChannelMapper.java @@ -58,6 +58,6 @@ public interface CameraChannelMapper extends BaseMapper { List 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 selectCameraChannel(); } diff --git a/src/main/java/com/hisense/monitormanage/mapper/CaseCityLawMapper.java b/src/main/java/com/hisense/monitormanage/mapper/CaseCityLawMapper.java index 2e711cf..d0bbfdf 100644 --- a/src/main/java/com/hisense/monitormanage/mapper/CaseCityLawMapper.java +++ b/src/main/java/com/hisense/monitormanage/mapper/CaseCityLawMapper.java @@ -16,6 +16,7 @@ import java.util.Map; */ @Repository public interface CaseCityLawMapper extends BaseMapper { - public void batchSave(List list); - public void singleSave(Map map); + + void batchSave(List list); + } diff --git a/src/main/java/com/hisense/monitormanage/mapper/PassengerFlowMapper.java b/src/main/java/com/hisense/monitormanage/mapper/PassengerFlowMapper.java index 95d591b..09ee7a9 100644 --- a/src/main/java/com/hisense/monitormanage/mapper/PassengerFlowMapper.java +++ b/src/main/java/com/hisense/monitormanage/mapper/PassengerFlowMapper.java @@ -13,7 +13,9 @@ import java.util.Map; @Repository public interface PassengerFlowMapper extends BaseMapper { + void batchSave(List list); + PassengerFlow getByMaxId(); List selectByTime(String timeId); diff --git a/src/main/java/com/hisense/monitormanage/mapper/PeopleRecognizeMapper.java b/src/main/java/com/hisense/monitormanage/mapper/PeopleRecognizeMapper.java index 076d814..c1db239 100644 --- a/src/main/java/com/hisense/monitormanage/mapper/PeopleRecognizeMapper.java +++ b/src/main/java/com/hisense/monitormanage/mapper/PeopleRecognizeMapper.java @@ -10,6 +10,7 @@ import java.util.List; @Repository public interface PeopleRecognizeMapper extends BaseMapper { + @Select("select pr.*,cc.* from t_camera_channel cc JOIN t_people_recognize pr ON cc.channel_code = pr.channel_code") List selectPeopleRecognize(); diff --git a/src/main/java/com/hisense/monitormanage/mapper/RoadDataMapper.java b/src/main/java/com/hisense/monitormanage/mapper/RoadDataMapper.java index 5900627..894ca69 100644 --- a/src/main/java/com/hisense/monitormanage/mapper/RoadDataMapper.java +++ b/src/main/java/com/hisense/monitormanage/mapper/RoadDataMapper.java @@ -18,7 +18,8 @@ import java.util.Map; */ @Repository public interface RoadDataMapper extends BaseMapper { - public void batchSave(List list); + + void batchSave(List list); List selectRoadData(@Param("page") Integer page,@Param("pageSize") Integer pageSize); diff --git a/src/main/java/com/hisense/monitormanage/mapper/SanitationMapper.java b/src/main/java/com/hisense/monitormanage/mapper/SanitationMapper.java index 20c3e08..7972ca1 100644 --- a/src/main/java/com/hisense/monitormanage/mapper/SanitationMapper.java +++ b/src/main/java/com/hisense/monitormanage/mapper/SanitationMapper.java @@ -17,7 +17,9 @@ import java.util.Map; */ @Repository public interface SanitationMapper extends BaseMapper { - void batchSave(@Param("list") List list); + void batchSaveSanitationRoad(@Param("list") List list); + void batchSaveSanitationTask(@Param("list") List list); + } diff --git a/src/main/java/com/hisense/monitormanage/mapper/SedimentTrailMapper.java b/src/main/java/com/hisense/monitormanage/mapper/SedimentTrailMapper.java index e4a7784..f605c64 100644 --- a/src/main/java/com/hisense/monitormanage/mapper/SedimentTrailMapper.java +++ b/src/main/java/com/hisense/monitormanage/mapper/SedimentTrailMapper.java @@ -16,5 +16,7 @@ import java.util.Map; */ @Repository public interface SedimentTrailMapper extends BaseMapper { - public void batchaSave(List list); + + void batchaSave(List list); + } diff --git a/src/main/java/com/hisense/monitormanage/mapper/TrailSanitationMapper.java b/src/main/java/com/hisense/monitormanage/mapper/TrailSanitationMapper.java index f4a2dd0..5f52fa6 100644 --- a/src/main/java/com/hisense/monitormanage/mapper/TrailSanitationMapper.java +++ b/src/main/java/com/hisense/monitormanage/mapper/TrailSanitationMapper.java @@ -11,7 +11,8 @@ import java.util.Map; @Repository public interface TrailSanitationMapper extends BaseMapper { - public void batchaSave(List list); + + void batchaSave(List list); @Select("select * from t_trail_sanitation") List selectAllTrailSanitation(); diff --git a/src/main/java/com/hisense/monitormanage/mapper/WaterPointMapper.java b/src/main/java/com/hisense/monitormanage/mapper/WaterPointMapper.java index 9fc7093..08abbc3 100644 --- a/src/main/java/com/hisense/monitormanage/mapper/WaterPointMapper.java +++ b/src/main/java/com/hisense/monitormanage/mapper/WaterPointMapper.java @@ -12,6 +12,7 @@ import java.util.List; @Repository public interface WaterPointMapper extends BaseMapper { + @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 selectWaterPoint(); diff --git a/src/main/java/com/hisense/monitormanage/service/BuildingRecordsService.java b/src/main/java/com/hisense/monitormanage/service/BuildingRecordsService.java index 617bbb5..cb2c9a6 100644 --- a/src/main/java/com/hisense/monitormanage/service/BuildingRecordsService.java +++ b/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 responseEntity; List maps = new ArrayList<>(); try{ @@ -65,7 +66,6 @@ public class BuildingRecordsService { public boolean getAndSaveRecords(){ List maps = this.getRecords(); boolean result = false; - if(maps.size() > 0){ List> lists = Lists.partition(maps,200); try{ @@ -83,7 +83,6 @@ public class BuildingRecordsService { public boolean getUpdateRecords(){ List maps = this.getRecords(); boolean result = false; - if(maps.size() > 0){ List> lists = Lists.partition(maps,200); try{ @@ -104,6 +103,4 @@ public class BuildingRecordsService { list = buildingRecordsMapper.selectList(wrapper); return list; } - - } diff --git a/src/main/java/com/hisense/monitormanage/service/MonitorService.java b/src/main/java/com/hisense/monitormanage/service/MonitorService.java index 81ef856..9e907b3 100644 --- a/src/main/java/com/hisense/monitormanage/service/MonitorService.java +++ b/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"); diff --git a/src/main/java/com/hisense/monitormanage/service/SanitationService.java b/src/main/java/com/hisense/monitormanage/service/SanitationService.java index 5315b2e..4e4162d 100644 --- a/src/main/java/com/hisense/monitormanage/service/SanitationService.java +++ b/src/main/java/com/hisense/monitormanage/service/SanitationService.java @@ -35,17 +35,6 @@ public class SanitationService { @Autowired private SanitationTaskMapper sanitationTaskMapper; - - public Result saveSantation(){ - List list = qidiService.resCatalogApplyHJWSBase(); - if(list.size() > 0){ - List> maps = Lists.partition(list,100); - - } - - return null; - } - public Result saveSanitationRoad(){ List list = qidiService.resCatalogApplyHJWSRoad(); try{ diff --git a/src/main/resources/mapper/SanitationMapper.xml b/src/main/resources/mapper/SanitationMapper.xml index fe694ef..08b4945 100644 --- a/src/main/resources/mapper/SanitationMapper.xml +++ b/src/main/resources/mapper/SanitationMapper.xml @@ -1,26 +1,12 @@ - - insert into t_sanitation_info - (cph,jsy,gmri,cllx,ssqybh,sshwgsbh,bz,sfkh,clbh,ds,sfjzgpsblrsjgpt,jj, - clxh,cldl,sfjs,sfss,sfcx - ) - values - - ( - #{item.cph},#{item.cph},#{item.cph},#{item.cph},#{item.cph},#{item.cph}, - #{item.cph},#{item.cph},#{item.cph},#{item.cph},#{item.cph},#{item.cph} - ) - - - 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 @@ -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} )