diff --git a/casic-service-car/pom.xml b/casic-service-car/pom.xml index 9448507..e7752ee 100644 --- a/casic-service-car/pom.xml +++ b/casic-service-car/pom.xml @@ -45,6 +45,11 @@ ${pro.version} + org.springframework.boot + spring-boot-starter-quartz + 2.0.0.RELEASE + + com.casic casic-car-support 1.0.0 diff --git a/casic-service-car/pom.xml b/casic-service-car/pom.xml index 9448507..e7752ee 100644 --- a/casic-service-car/pom.xml +++ b/casic-service-car/pom.xml @@ -45,6 +45,11 @@ ${pro.version} + org.springframework.boot + spring-boot-starter-quartz + 2.0.0.RELEASE + + com.casic casic-car-support 1.0.0 diff --git a/casic-service-car/src/main/java/com/casic/missiles/modular/system/alarm/strategy/job/SanitationAlarmTask.java b/casic-service-car/src/main/java/com/casic/missiles/modular/system/alarm/strategy/job/SanitationAlarmTask.java new file mode 100644 index 0000000..ac8e7f5 --- /dev/null +++ b/casic-service-car/src/main/java/com/casic/missiles/modular/system/alarm/strategy/job/SanitationAlarmTask.java @@ -0,0 +1,33 @@ +package com.casic.missiles.modular.system.alarm.strategy.job; + + +import com.casic.missiles.modular.system.service.ISanitationCarService; +import lombok.extern.slf4j.Slf4j; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.scheduling.annotation.Scheduled; +import org.springframework.stereotype.Component; + +/** + * @ClassName MonitorDataCalculateJob + * @Description 监测数据监测接口 + * @Author lwh + * @Date 2021/2/5 11:20 + * @Version 1.0 + */ +@Slf4j +@Component +public class SanitationAlarmTask { + + @Autowired + private ISanitationCarService carService; + + /** + * + * 每6小时计算一次采集数据 + */ + @Scheduled(cron = "0 */10 * * * ?") + public void execute() { + System.out.println("task --------------------"); + carService.trackInspection(); + } +} \ No newline at end of file diff --git a/casic-service-car/pom.xml b/casic-service-car/pom.xml index 9448507..e7752ee 100644 --- a/casic-service-car/pom.xml +++ b/casic-service-car/pom.xml @@ -45,6 +45,11 @@ ${pro.version} + org.springframework.boot + spring-boot-starter-quartz + 2.0.0.RELEASE + + com.casic casic-car-support 1.0.0 diff --git a/casic-service-car/src/main/java/com/casic/missiles/modular/system/alarm/strategy/job/SanitationAlarmTask.java b/casic-service-car/src/main/java/com/casic/missiles/modular/system/alarm/strategy/job/SanitationAlarmTask.java new file mode 100644 index 0000000..ac8e7f5 --- /dev/null +++ b/casic-service-car/src/main/java/com/casic/missiles/modular/system/alarm/strategy/job/SanitationAlarmTask.java @@ -0,0 +1,33 @@ +package com.casic.missiles.modular.system.alarm.strategy.job; + + +import com.casic.missiles.modular.system.service.ISanitationCarService; +import lombok.extern.slf4j.Slf4j; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.scheduling.annotation.Scheduled; +import org.springframework.stereotype.Component; + +/** + * @ClassName MonitorDataCalculateJob + * @Description 监测数据监测接口 + * @Author lwh + * @Date 2021/2/5 11:20 + * @Version 1.0 + */ +@Slf4j +@Component +public class SanitationAlarmTask { + + @Autowired + private ISanitationCarService carService; + + /** + * + * 每6小时计算一次采集数据 + */ + @Scheduled(cron = "0 */10 * * * ?") + public void execute() { + System.out.println("task --------------------"); + carService.trackInspection(); + } +} \ No newline at end of file diff --git a/casic-service-person/src/main/java/com/casic/missiles/modular/standingBook/controller/ToiletController.java b/casic-service-person/src/main/java/com/casic/missiles/modular/standingBook/controller/ToiletController.java index 10e49c3..95c75c6 100644 --- a/casic-service-person/src/main/java/com/casic/missiles/modular/standingBook/controller/ToiletController.java +++ b/casic-service-person/src/main/java/com/casic/missiles/modular/standingBook/controller/ToiletController.java @@ -87,10 +87,10 @@ @RequestMapping("/listPage") @ResponseBody - public Object listPage(String keywords, String owner, String position) { + public Object listPage(String keywords, String owner, String position,String toiletType) { Page page = new PageFactory().defaultPage(); - List toiletList = iToiletService.listPage(page, keywords, owner, position); + List toiletList = iToiletService.listPage(page, keywords, owner, position,toiletType); List toiletDtoList = ToiletDto.ConvertToDtoList(toiletList, iCommonPermissionService); Page page1 = new PageFactory().defaultPage(); page1.setRecords(toiletDtoList); @@ -123,8 +123,8 @@ @SneakyThrows @RequestMapping("/export") @ResponseBody - public Object expExcel(String keywords, String owner, String position, HttpServletRequest request, HttpServletResponse response) { - iToiletService.ExpExcelData(keywords, owner, position, response, request); + public Object expExcel(String keywords, String owner, String position,String toiletType, HttpServletRequest request, HttpServletResponse response) { + iToiletService.ExpExcelData(keywords, owner, position,toiletType, response, request); return ResponseData.success(); } diff --git a/casic-service-car/pom.xml b/casic-service-car/pom.xml index 9448507..e7752ee 100644 --- a/casic-service-car/pom.xml +++ b/casic-service-car/pom.xml @@ -45,6 +45,11 @@ ${pro.version} + org.springframework.boot + spring-boot-starter-quartz + 2.0.0.RELEASE + + com.casic casic-car-support 1.0.0 diff --git a/casic-service-car/src/main/java/com/casic/missiles/modular/system/alarm/strategy/job/SanitationAlarmTask.java b/casic-service-car/src/main/java/com/casic/missiles/modular/system/alarm/strategy/job/SanitationAlarmTask.java new file mode 100644 index 0000000..ac8e7f5 --- /dev/null +++ b/casic-service-car/src/main/java/com/casic/missiles/modular/system/alarm/strategy/job/SanitationAlarmTask.java @@ -0,0 +1,33 @@ +package com.casic.missiles.modular.system.alarm.strategy.job; + + +import com.casic.missiles.modular.system.service.ISanitationCarService; +import lombok.extern.slf4j.Slf4j; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.scheduling.annotation.Scheduled; +import org.springframework.stereotype.Component; + +/** + * @ClassName MonitorDataCalculateJob + * @Description 监测数据监测接口 + * @Author lwh + * @Date 2021/2/5 11:20 + * @Version 1.0 + */ +@Slf4j +@Component +public class SanitationAlarmTask { + + @Autowired + private ISanitationCarService carService; + + /** + * + * 每6小时计算一次采集数据 + */ + @Scheduled(cron = "0 */10 * * * ?") + public void execute() { + System.out.println("task --------------------"); + carService.trackInspection(); + } +} \ No newline at end of file diff --git a/casic-service-person/src/main/java/com/casic/missiles/modular/standingBook/controller/ToiletController.java b/casic-service-person/src/main/java/com/casic/missiles/modular/standingBook/controller/ToiletController.java index 10e49c3..95c75c6 100644 --- a/casic-service-person/src/main/java/com/casic/missiles/modular/standingBook/controller/ToiletController.java +++ b/casic-service-person/src/main/java/com/casic/missiles/modular/standingBook/controller/ToiletController.java @@ -87,10 +87,10 @@ @RequestMapping("/listPage") @ResponseBody - public Object listPage(String keywords, String owner, String position) { + public Object listPage(String keywords, String owner, String position,String toiletType) { Page page = new PageFactory().defaultPage(); - List toiletList = iToiletService.listPage(page, keywords, owner, position); + List toiletList = iToiletService.listPage(page, keywords, owner, position,toiletType); List toiletDtoList = ToiletDto.ConvertToDtoList(toiletList, iCommonPermissionService); Page page1 = new PageFactory().defaultPage(); page1.setRecords(toiletDtoList); @@ -123,8 +123,8 @@ @SneakyThrows @RequestMapping("/export") @ResponseBody - public Object expExcel(String keywords, String owner, String position, HttpServletRequest request, HttpServletResponse response) { - iToiletService.ExpExcelData(keywords, owner, position, response, request); + public Object expExcel(String keywords, String owner, String position,String toiletType, HttpServletRequest request, HttpServletResponse response) { + iToiletService.ExpExcelData(keywords, owner, position,toiletType, response, request); return ResponseData.success(); } diff --git a/casic-service-person/src/main/java/com/casic/missiles/modular/standingBook/dao/ToiletMapper.java b/casic-service-person/src/main/java/com/casic/missiles/modular/standingBook/dao/ToiletMapper.java index 280d358..c5d1ef3 100644 --- a/casic-service-person/src/main/java/com/casic/missiles/modular/standingBook/dao/ToiletMapper.java +++ b/casic-service-person/src/main/java/com/casic/missiles/modular/standingBook/dao/ToiletMapper.java @@ -10,5 +10,5 @@ public interface ToiletMapper extends BaseMapper { List listPage(@Param("page") Page page, @Param("keywords") String keywords, - @Param("owner") String owner, @Param("position") String position); + @Param("owner") String owner, @Param("position") String position, @Param("toiletType")String toiletType); } diff --git a/casic-service-car/pom.xml b/casic-service-car/pom.xml index 9448507..e7752ee 100644 --- a/casic-service-car/pom.xml +++ b/casic-service-car/pom.xml @@ -45,6 +45,11 @@ ${pro.version} + org.springframework.boot + spring-boot-starter-quartz + 2.0.0.RELEASE + + com.casic casic-car-support 1.0.0 diff --git a/casic-service-car/src/main/java/com/casic/missiles/modular/system/alarm/strategy/job/SanitationAlarmTask.java b/casic-service-car/src/main/java/com/casic/missiles/modular/system/alarm/strategy/job/SanitationAlarmTask.java new file mode 100644 index 0000000..ac8e7f5 --- /dev/null +++ b/casic-service-car/src/main/java/com/casic/missiles/modular/system/alarm/strategy/job/SanitationAlarmTask.java @@ -0,0 +1,33 @@ +package com.casic.missiles.modular.system.alarm.strategy.job; + + +import com.casic.missiles.modular.system.service.ISanitationCarService; +import lombok.extern.slf4j.Slf4j; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.scheduling.annotation.Scheduled; +import org.springframework.stereotype.Component; + +/** + * @ClassName MonitorDataCalculateJob + * @Description 监测数据监测接口 + * @Author lwh + * @Date 2021/2/5 11:20 + * @Version 1.0 + */ +@Slf4j +@Component +public class SanitationAlarmTask { + + @Autowired + private ISanitationCarService carService; + + /** + * + * 每6小时计算一次采集数据 + */ + @Scheduled(cron = "0 */10 * * * ?") + public void execute() { + System.out.println("task --------------------"); + carService.trackInspection(); + } +} \ No newline at end of file diff --git a/casic-service-person/src/main/java/com/casic/missiles/modular/standingBook/controller/ToiletController.java b/casic-service-person/src/main/java/com/casic/missiles/modular/standingBook/controller/ToiletController.java index 10e49c3..95c75c6 100644 --- a/casic-service-person/src/main/java/com/casic/missiles/modular/standingBook/controller/ToiletController.java +++ b/casic-service-person/src/main/java/com/casic/missiles/modular/standingBook/controller/ToiletController.java @@ -87,10 +87,10 @@ @RequestMapping("/listPage") @ResponseBody - public Object listPage(String keywords, String owner, String position) { + public Object listPage(String keywords, String owner, String position,String toiletType) { Page page = new PageFactory().defaultPage(); - List toiletList = iToiletService.listPage(page, keywords, owner, position); + List toiletList = iToiletService.listPage(page, keywords, owner, position,toiletType); List toiletDtoList = ToiletDto.ConvertToDtoList(toiletList, iCommonPermissionService); Page page1 = new PageFactory().defaultPage(); page1.setRecords(toiletDtoList); @@ -123,8 +123,8 @@ @SneakyThrows @RequestMapping("/export") @ResponseBody - public Object expExcel(String keywords, String owner, String position, HttpServletRequest request, HttpServletResponse response) { - iToiletService.ExpExcelData(keywords, owner, position, response, request); + public Object expExcel(String keywords, String owner, String position,String toiletType, HttpServletRequest request, HttpServletResponse response) { + iToiletService.ExpExcelData(keywords, owner, position,toiletType, response, request); return ResponseData.success(); } diff --git a/casic-service-person/src/main/java/com/casic/missiles/modular/standingBook/dao/ToiletMapper.java b/casic-service-person/src/main/java/com/casic/missiles/modular/standingBook/dao/ToiletMapper.java index 280d358..c5d1ef3 100644 --- a/casic-service-person/src/main/java/com/casic/missiles/modular/standingBook/dao/ToiletMapper.java +++ b/casic-service-person/src/main/java/com/casic/missiles/modular/standingBook/dao/ToiletMapper.java @@ -10,5 +10,5 @@ public interface ToiletMapper extends BaseMapper { List listPage(@Param("page") Page page, @Param("keywords") String keywords, - @Param("owner") String owner, @Param("position") String position); + @Param("owner") String owner, @Param("position") String position, @Param("toiletType")String toiletType); } diff --git a/casic-service-person/src/main/java/com/casic/missiles/modular/standingBook/dao/mapping/ToiletMapper.xml b/casic-service-person/src/main/java/com/casic/missiles/modular/standingBook/dao/mapping/ToiletMapper.xml index fa631d1..b270a94 100644 --- a/casic-service-person/src/main/java/com/casic/missiles/modular/standingBook/dao/mapping/ToiletMapper.xml +++ b/casic-service-person/src/main/java/com/casic/missiles/modular/standingBook/dao/mapping/ToiletMapper.xml @@ -47,6 +47,8 @@ and POSITION like CONCAT('%',#{position},'%') - + + and toilet_Type = #{toiletType} + \ No newline at end of file diff --git a/casic-service-car/pom.xml b/casic-service-car/pom.xml index 9448507..e7752ee 100644 --- a/casic-service-car/pom.xml +++ b/casic-service-car/pom.xml @@ -45,6 +45,11 @@ ${pro.version} + org.springframework.boot + spring-boot-starter-quartz + 2.0.0.RELEASE + + com.casic casic-car-support 1.0.0 diff --git a/casic-service-car/src/main/java/com/casic/missiles/modular/system/alarm/strategy/job/SanitationAlarmTask.java b/casic-service-car/src/main/java/com/casic/missiles/modular/system/alarm/strategy/job/SanitationAlarmTask.java new file mode 100644 index 0000000..ac8e7f5 --- /dev/null +++ b/casic-service-car/src/main/java/com/casic/missiles/modular/system/alarm/strategy/job/SanitationAlarmTask.java @@ -0,0 +1,33 @@ +package com.casic.missiles.modular.system.alarm.strategy.job; + + +import com.casic.missiles.modular.system.service.ISanitationCarService; +import lombok.extern.slf4j.Slf4j; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.scheduling.annotation.Scheduled; +import org.springframework.stereotype.Component; + +/** + * @ClassName MonitorDataCalculateJob + * @Description 监测数据监测接口 + * @Author lwh + * @Date 2021/2/5 11:20 + * @Version 1.0 + */ +@Slf4j +@Component +public class SanitationAlarmTask { + + @Autowired + private ISanitationCarService carService; + + /** + * + * 每6小时计算一次采集数据 + */ + @Scheduled(cron = "0 */10 * * * ?") + public void execute() { + System.out.println("task --------------------"); + carService.trackInspection(); + } +} \ No newline at end of file diff --git a/casic-service-person/src/main/java/com/casic/missiles/modular/standingBook/controller/ToiletController.java b/casic-service-person/src/main/java/com/casic/missiles/modular/standingBook/controller/ToiletController.java index 10e49c3..95c75c6 100644 --- a/casic-service-person/src/main/java/com/casic/missiles/modular/standingBook/controller/ToiletController.java +++ b/casic-service-person/src/main/java/com/casic/missiles/modular/standingBook/controller/ToiletController.java @@ -87,10 +87,10 @@ @RequestMapping("/listPage") @ResponseBody - public Object listPage(String keywords, String owner, String position) { + public Object listPage(String keywords, String owner, String position,String toiletType) { Page page = new PageFactory().defaultPage(); - List toiletList = iToiletService.listPage(page, keywords, owner, position); + List toiletList = iToiletService.listPage(page, keywords, owner, position,toiletType); List toiletDtoList = ToiletDto.ConvertToDtoList(toiletList, iCommonPermissionService); Page page1 = new PageFactory().defaultPage(); page1.setRecords(toiletDtoList); @@ -123,8 +123,8 @@ @SneakyThrows @RequestMapping("/export") @ResponseBody - public Object expExcel(String keywords, String owner, String position, HttpServletRequest request, HttpServletResponse response) { - iToiletService.ExpExcelData(keywords, owner, position, response, request); + public Object expExcel(String keywords, String owner, String position,String toiletType, HttpServletRequest request, HttpServletResponse response) { + iToiletService.ExpExcelData(keywords, owner, position,toiletType, response, request); return ResponseData.success(); } diff --git a/casic-service-person/src/main/java/com/casic/missiles/modular/standingBook/dao/ToiletMapper.java b/casic-service-person/src/main/java/com/casic/missiles/modular/standingBook/dao/ToiletMapper.java index 280d358..c5d1ef3 100644 --- a/casic-service-person/src/main/java/com/casic/missiles/modular/standingBook/dao/ToiletMapper.java +++ b/casic-service-person/src/main/java/com/casic/missiles/modular/standingBook/dao/ToiletMapper.java @@ -10,5 +10,5 @@ public interface ToiletMapper extends BaseMapper { List listPage(@Param("page") Page page, @Param("keywords") String keywords, - @Param("owner") String owner, @Param("position") String position); + @Param("owner") String owner, @Param("position") String position, @Param("toiletType")String toiletType); } diff --git a/casic-service-person/src/main/java/com/casic/missiles/modular/standingBook/dao/mapping/ToiletMapper.xml b/casic-service-person/src/main/java/com/casic/missiles/modular/standingBook/dao/mapping/ToiletMapper.xml index fa631d1..b270a94 100644 --- a/casic-service-person/src/main/java/com/casic/missiles/modular/standingBook/dao/mapping/ToiletMapper.xml +++ b/casic-service-person/src/main/java/com/casic/missiles/modular/standingBook/dao/mapping/ToiletMapper.xml @@ -47,6 +47,8 @@ and POSITION like CONCAT('%',#{position},'%') - + + and toilet_Type = #{toiletType} + \ No newline at end of file diff --git a/casic-service-person/src/main/java/com/casic/missiles/modular/standingBook/dto/ToiletDto.java b/casic-service-person/src/main/java/com/casic/missiles/modular/standingBook/dto/ToiletDto.java index b36aa93..ea20edb 100644 --- a/casic-service-person/src/main/java/com/casic/missiles/modular/standingBook/dto/ToiletDto.java +++ b/casic-service-person/src/main/java/com/casic/missiles/modular/standingBook/dto/ToiletDto.java @@ -1,15 +1,14 @@ package com.casic.missiles.modular.standingBook.dto; import com.casic.missiles.core.common.service.ICommonPermissionService; -import com.casic.missiles.core.common.service.ICommonPersonService; -import com.casic.missiles.core.util.Convert; +import com.casic.missiles.core.util.ToolUtil; import com.casic.missiles.modular.standingBook.model.Toilet; import lombok.Data; -import java.math.BigInteger; import java.text.SimpleDateFormat; import java.util.ArrayList; import java.util.List; + @Data public class ToiletDto { @@ -30,40 +29,43 @@ private String owner; private String photo; private String area; - + private String toiletTypeName; + private String toiletType; static SimpleDateFormat dft = new SimpleDateFormat("yyyy-MM-dd"); - public static ToiletDto ConvertToDto(Toilet toilet, ICommonPermissionService iCommonPermissionService){ + public static ToiletDto ConvertToDto(Toilet toilet, ICommonPermissionService iCommonPermissionService) { - ToiletDto toiletDto=new ToiletDto(); + ToiletDto toiletDto = new ToiletDto(); toiletDto.setId(toilet.getId()); toiletDto.setName(toilet.getName()); toiletDto.setCode(toilet.getCode()); toiletDto.setPosition(toilet.getPosition()); - toiletDto.setLng(toilet.getLng()==null?"":toilet.getLng().toString()); - toiletDto.setLat(toilet.getLat()==null?"":toilet.getLat().toString()); - toiletDto.setTs(toilet.getTs()==null?"":dft.format(toilet.getTs())); + toiletDto.setLng(toilet.getLng() == null ? "" : toilet.getLng().toString()); + toiletDto.setLat(toilet.getLat() == null ? "" : toilet.getLat().toString()); + toiletDto.setTs(toilet.getTs() == null ? "" : dft.format(toilet.getTs())); toiletDto.setResponsiblePerson(toilet.getResponsiblePerson()); toiletDto.setResponsiblePersonTel(toilet.getResponsiblePersonTel()); - toiletDto.setDeptId(toilet.getDeptId()==null?"":toilet.getDeptId().toString()); + toiletDto.setDeptId(toilet.getDeptId() == null ? "" : toilet.getDeptId().toString()); toiletDto.setNotes(toilet.getNotes()); - toiletDto.setUpdateTime(toilet.getUpdateTime()==null?"":dft.format(toilet.getUpdateTime())); - toiletDto.setCreateTime(toilet.getCreateTime()==null?"":dft.format(toilet.getCreateTime())); + toiletDto.setUpdateTime(toilet.getUpdateTime() == null ? "" : dft.format(toilet.getUpdateTime())); + toiletDto.setCreateTime(toilet.getCreateTime() == null ? "" : dft.format(toilet.getCreateTime())); toiletDto.setDelFlag(toilet.getDelFlag()); toiletDto.setOwner(toilet.getOwner()); toiletDto.setPhoto(toilet.getPhoto()); - toiletDto.setArea(toilet.getArea()==null?"":toilet.getArea().toString()); - + toiletDto.setArea(toilet.getArea() == null ? "" : toilet.getArea().toString()); + if (ToolUtil.isNotEmpty(toilet.getToiletType())) { + toiletDto.setToiletTypeName(iCommonPermissionService.getDictNameByCode("toiletType", toilet.getToiletType())); + } return toiletDto; } - public static List ConvertToDtoList(List toiletList, ICommonPermissionService iCommonPermissionService){ + public static List ConvertToDtoList(List toiletList, ICommonPermissionService iCommonPermissionService) { - List toiletDtoList=new ArrayList<>(); - for(Toilet toilet:toiletList){ - toiletDtoList.add(ConvertToDto(toilet,iCommonPermissionService)); + List toiletDtoList = new ArrayList<>(); + for (Toilet toilet : toiletList) { + toiletDtoList.add(ConvertToDto(toilet, iCommonPermissionService)); } return toiletDtoList; diff --git a/casic-service-car/pom.xml b/casic-service-car/pom.xml index 9448507..e7752ee 100644 --- a/casic-service-car/pom.xml +++ b/casic-service-car/pom.xml @@ -45,6 +45,11 @@ ${pro.version} + org.springframework.boot + spring-boot-starter-quartz + 2.0.0.RELEASE + + com.casic casic-car-support 1.0.0 diff --git a/casic-service-car/src/main/java/com/casic/missiles/modular/system/alarm/strategy/job/SanitationAlarmTask.java b/casic-service-car/src/main/java/com/casic/missiles/modular/system/alarm/strategy/job/SanitationAlarmTask.java new file mode 100644 index 0000000..ac8e7f5 --- /dev/null +++ b/casic-service-car/src/main/java/com/casic/missiles/modular/system/alarm/strategy/job/SanitationAlarmTask.java @@ -0,0 +1,33 @@ +package com.casic.missiles.modular.system.alarm.strategy.job; + + +import com.casic.missiles.modular.system.service.ISanitationCarService; +import lombok.extern.slf4j.Slf4j; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.scheduling.annotation.Scheduled; +import org.springframework.stereotype.Component; + +/** + * @ClassName MonitorDataCalculateJob + * @Description 监测数据监测接口 + * @Author lwh + * @Date 2021/2/5 11:20 + * @Version 1.0 + */ +@Slf4j +@Component +public class SanitationAlarmTask { + + @Autowired + private ISanitationCarService carService; + + /** + * + * 每6小时计算一次采集数据 + */ + @Scheduled(cron = "0 */10 * * * ?") + public void execute() { + System.out.println("task --------------------"); + carService.trackInspection(); + } +} \ No newline at end of file diff --git a/casic-service-person/src/main/java/com/casic/missiles/modular/standingBook/controller/ToiletController.java b/casic-service-person/src/main/java/com/casic/missiles/modular/standingBook/controller/ToiletController.java index 10e49c3..95c75c6 100644 --- a/casic-service-person/src/main/java/com/casic/missiles/modular/standingBook/controller/ToiletController.java +++ b/casic-service-person/src/main/java/com/casic/missiles/modular/standingBook/controller/ToiletController.java @@ -87,10 +87,10 @@ @RequestMapping("/listPage") @ResponseBody - public Object listPage(String keywords, String owner, String position) { + public Object listPage(String keywords, String owner, String position,String toiletType) { Page page = new PageFactory().defaultPage(); - List toiletList = iToiletService.listPage(page, keywords, owner, position); + List toiletList = iToiletService.listPage(page, keywords, owner, position,toiletType); List toiletDtoList = ToiletDto.ConvertToDtoList(toiletList, iCommonPermissionService); Page page1 = new PageFactory().defaultPage(); page1.setRecords(toiletDtoList); @@ -123,8 +123,8 @@ @SneakyThrows @RequestMapping("/export") @ResponseBody - public Object expExcel(String keywords, String owner, String position, HttpServletRequest request, HttpServletResponse response) { - iToiletService.ExpExcelData(keywords, owner, position, response, request); + public Object expExcel(String keywords, String owner, String position,String toiletType, HttpServletRequest request, HttpServletResponse response) { + iToiletService.ExpExcelData(keywords, owner, position,toiletType, response, request); return ResponseData.success(); } diff --git a/casic-service-person/src/main/java/com/casic/missiles/modular/standingBook/dao/ToiletMapper.java b/casic-service-person/src/main/java/com/casic/missiles/modular/standingBook/dao/ToiletMapper.java index 280d358..c5d1ef3 100644 --- a/casic-service-person/src/main/java/com/casic/missiles/modular/standingBook/dao/ToiletMapper.java +++ b/casic-service-person/src/main/java/com/casic/missiles/modular/standingBook/dao/ToiletMapper.java @@ -10,5 +10,5 @@ public interface ToiletMapper extends BaseMapper { List listPage(@Param("page") Page page, @Param("keywords") String keywords, - @Param("owner") String owner, @Param("position") String position); + @Param("owner") String owner, @Param("position") String position, @Param("toiletType")String toiletType); } diff --git a/casic-service-person/src/main/java/com/casic/missiles/modular/standingBook/dao/mapping/ToiletMapper.xml b/casic-service-person/src/main/java/com/casic/missiles/modular/standingBook/dao/mapping/ToiletMapper.xml index fa631d1..b270a94 100644 --- a/casic-service-person/src/main/java/com/casic/missiles/modular/standingBook/dao/mapping/ToiletMapper.xml +++ b/casic-service-person/src/main/java/com/casic/missiles/modular/standingBook/dao/mapping/ToiletMapper.xml @@ -47,6 +47,8 @@ and POSITION like CONCAT('%',#{position},'%') - + + and toilet_Type = #{toiletType} + \ No newline at end of file diff --git a/casic-service-person/src/main/java/com/casic/missiles/modular/standingBook/dto/ToiletDto.java b/casic-service-person/src/main/java/com/casic/missiles/modular/standingBook/dto/ToiletDto.java index b36aa93..ea20edb 100644 --- a/casic-service-person/src/main/java/com/casic/missiles/modular/standingBook/dto/ToiletDto.java +++ b/casic-service-person/src/main/java/com/casic/missiles/modular/standingBook/dto/ToiletDto.java @@ -1,15 +1,14 @@ package com.casic.missiles.modular.standingBook.dto; import com.casic.missiles.core.common.service.ICommonPermissionService; -import com.casic.missiles.core.common.service.ICommonPersonService; -import com.casic.missiles.core.util.Convert; +import com.casic.missiles.core.util.ToolUtil; import com.casic.missiles.modular.standingBook.model.Toilet; import lombok.Data; -import java.math.BigInteger; import java.text.SimpleDateFormat; import java.util.ArrayList; import java.util.List; + @Data public class ToiletDto { @@ -30,40 +29,43 @@ private String owner; private String photo; private String area; - + private String toiletTypeName; + private String toiletType; static SimpleDateFormat dft = new SimpleDateFormat("yyyy-MM-dd"); - public static ToiletDto ConvertToDto(Toilet toilet, ICommonPermissionService iCommonPermissionService){ + public static ToiletDto ConvertToDto(Toilet toilet, ICommonPermissionService iCommonPermissionService) { - ToiletDto toiletDto=new ToiletDto(); + ToiletDto toiletDto = new ToiletDto(); toiletDto.setId(toilet.getId()); toiletDto.setName(toilet.getName()); toiletDto.setCode(toilet.getCode()); toiletDto.setPosition(toilet.getPosition()); - toiletDto.setLng(toilet.getLng()==null?"":toilet.getLng().toString()); - toiletDto.setLat(toilet.getLat()==null?"":toilet.getLat().toString()); - toiletDto.setTs(toilet.getTs()==null?"":dft.format(toilet.getTs())); + toiletDto.setLng(toilet.getLng() == null ? "" : toilet.getLng().toString()); + toiletDto.setLat(toilet.getLat() == null ? "" : toilet.getLat().toString()); + toiletDto.setTs(toilet.getTs() == null ? "" : dft.format(toilet.getTs())); toiletDto.setResponsiblePerson(toilet.getResponsiblePerson()); toiletDto.setResponsiblePersonTel(toilet.getResponsiblePersonTel()); - toiletDto.setDeptId(toilet.getDeptId()==null?"":toilet.getDeptId().toString()); + toiletDto.setDeptId(toilet.getDeptId() == null ? "" : toilet.getDeptId().toString()); toiletDto.setNotes(toilet.getNotes()); - toiletDto.setUpdateTime(toilet.getUpdateTime()==null?"":dft.format(toilet.getUpdateTime())); - toiletDto.setCreateTime(toilet.getCreateTime()==null?"":dft.format(toilet.getCreateTime())); + toiletDto.setUpdateTime(toilet.getUpdateTime() == null ? "" : dft.format(toilet.getUpdateTime())); + toiletDto.setCreateTime(toilet.getCreateTime() == null ? "" : dft.format(toilet.getCreateTime())); toiletDto.setDelFlag(toilet.getDelFlag()); toiletDto.setOwner(toilet.getOwner()); toiletDto.setPhoto(toilet.getPhoto()); - toiletDto.setArea(toilet.getArea()==null?"":toilet.getArea().toString()); - + toiletDto.setArea(toilet.getArea() == null ? "" : toilet.getArea().toString()); + if (ToolUtil.isNotEmpty(toilet.getToiletType())) { + toiletDto.setToiletTypeName(iCommonPermissionService.getDictNameByCode("toiletType", toilet.getToiletType())); + } return toiletDto; } - public static List ConvertToDtoList(List toiletList, ICommonPermissionService iCommonPermissionService){ + public static List ConvertToDtoList(List toiletList, ICommonPermissionService iCommonPermissionService) { - List toiletDtoList=new ArrayList<>(); - for(Toilet toilet:toiletList){ - toiletDtoList.add(ConvertToDto(toilet,iCommonPermissionService)); + List toiletDtoList = new ArrayList<>(); + for (Toilet toilet : toiletList) { + toiletDtoList.add(ConvertToDto(toilet, iCommonPermissionService)); } return toiletDtoList; diff --git a/casic-service-person/src/main/java/com/casic/missiles/modular/standingBook/model/Toilet.java b/casic-service-person/src/main/java/com/casic/missiles/modular/standingBook/model/Toilet.java index 73d5941..89aae23 100644 --- a/casic-service-person/src/main/java/com/casic/missiles/modular/standingBook/model/Toilet.java +++ b/casic-service-person/src/main/java/com/casic/missiles/modular/standingBook/model/Toilet.java @@ -73,6 +73,7 @@ @TableField("AREA") private BigDecimal area; - + @TableField("toilet_type") + private String toiletType; } \ No newline at end of file diff --git a/casic-service-car/pom.xml b/casic-service-car/pom.xml index 9448507..e7752ee 100644 --- a/casic-service-car/pom.xml +++ b/casic-service-car/pom.xml @@ -45,6 +45,11 @@ ${pro.version} + org.springframework.boot + spring-boot-starter-quartz + 2.0.0.RELEASE + + com.casic casic-car-support 1.0.0 diff --git a/casic-service-car/src/main/java/com/casic/missiles/modular/system/alarm/strategy/job/SanitationAlarmTask.java b/casic-service-car/src/main/java/com/casic/missiles/modular/system/alarm/strategy/job/SanitationAlarmTask.java new file mode 100644 index 0000000..ac8e7f5 --- /dev/null +++ b/casic-service-car/src/main/java/com/casic/missiles/modular/system/alarm/strategy/job/SanitationAlarmTask.java @@ -0,0 +1,33 @@ +package com.casic.missiles.modular.system.alarm.strategy.job; + + +import com.casic.missiles.modular.system.service.ISanitationCarService; +import lombok.extern.slf4j.Slf4j; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.scheduling.annotation.Scheduled; +import org.springframework.stereotype.Component; + +/** + * @ClassName MonitorDataCalculateJob + * @Description 监测数据监测接口 + * @Author lwh + * @Date 2021/2/5 11:20 + * @Version 1.0 + */ +@Slf4j +@Component +public class SanitationAlarmTask { + + @Autowired + private ISanitationCarService carService; + + /** + * + * 每6小时计算一次采集数据 + */ + @Scheduled(cron = "0 */10 * * * ?") + public void execute() { + System.out.println("task --------------------"); + carService.trackInspection(); + } +} \ No newline at end of file diff --git a/casic-service-person/src/main/java/com/casic/missiles/modular/standingBook/controller/ToiletController.java b/casic-service-person/src/main/java/com/casic/missiles/modular/standingBook/controller/ToiletController.java index 10e49c3..95c75c6 100644 --- a/casic-service-person/src/main/java/com/casic/missiles/modular/standingBook/controller/ToiletController.java +++ b/casic-service-person/src/main/java/com/casic/missiles/modular/standingBook/controller/ToiletController.java @@ -87,10 +87,10 @@ @RequestMapping("/listPage") @ResponseBody - public Object listPage(String keywords, String owner, String position) { + public Object listPage(String keywords, String owner, String position,String toiletType) { Page page = new PageFactory().defaultPage(); - List toiletList = iToiletService.listPage(page, keywords, owner, position); + List toiletList = iToiletService.listPage(page, keywords, owner, position,toiletType); List toiletDtoList = ToiletDto.ConvertToDtoList(toiletList, iCommonPermissionService); Page page1 = new PageFactory().defaultPage(); page1.setRecords(toiletDtoList); @@ -123,8 +123,8 @@ @SneakyThrows @RequestMapping("/export") @ResponseBody - public Object expExcel(String keywords, String owner, String position, HttpServletRequest request, HttpServletResponse response) { - iToiletService.ExpExcelData(keywords, owner, position, response, request); + public Object expExcel(String keywords, String owner, String position,String toiletType, HttpServletRequest request, HttpServletResponse response) { + iToiletService.ExpExcelData(keywords, owner, position,toiletType, response, request); return ResponseData.success(); } diff --git a/casic-service-person/src/main/java/com/casic/missiles/modular/standingBook/dao/ToiletMapper.java b/casic-service-person/src/main/java/com/casic/missiles/modular/standingBook/dao/ToiletMapper.java index 280d358..c5d1ef3 100644 --- a/casic-service-person/src/main/java/com/casic/missiles/modular/standingBook/dao/ToiletMapper.java +++ b/casic-service-person/src/main/java/com/casic/missiles/modular/standingBook/dao/ToiletMapper.java @@ -10,5 +10,5 @@ public interface ToiletMapper extends BaseMapper { List listPage(@Param("page") Page page, @Param("keywords") String keywords, - @Param("owner") String owner, @Param("position") String position); + @Param("owner") String owner, @Param("position") String position, @Param("toiletType")String toiletType); } diff --git a/casic-service-person/src/main/java/com/casic/missiles/modular/standingBook/dao/mapping/ToiletMapper.xml b/casic-service-person/src/main/java/com/casic/missiles/modular/standingBook/dao/mapping/ToiletMapper.xml index fa631d1..b270a94 100644 --- a/casic-service-person/src/main/java/com/casic/missiles/modular/standingBook/dao/mapping/ToiletMapper.xml +++ b/casic-service-person/src/main/java/com/casic/missiles/modular/standingBook/dao/mapping/ToiletMapper.xml @@ -47,6 +47,8 @@ and POSITION like CONCAT('%',#{position},'%') - + + and toilet_Type = #{toiletType} + \ No newline at end of file diff --git a/casic-service-person/src/main/java/com/casic/missiles/modular/standingBook/dto/ToiletDto.java b/casic-service-person/src/main/java/com/casic/missiles/modular/standingBook/dto/ToiletDto.java index b36aa93..ea20edb 100644 --- a/casic-service-person/src/main/java/com/casic/missiles/modular/standingBook/dto/ToiletDto.java +++ b/casic-service-person/src/main/java/com/casic/missiles/modular/standingBook/dto/ToiletDto.java @@ -1,15 +1,14 @@ package com.casic.missiles.modular.standingBook.dto; import com.casic.missiles.core.common.service.ICommonPermissionService; -import com.casic.missiles.core.common.service.ICommonPersonService; -import com.casic.missiles.core.util.Convert; +import com.casic.missiles.core.util.ToolUtil; import com.casic.missiles.modular.standingBook.model.Toilet; import lombok.Data; -import java.math.BigInteger; import java.text.SimpleDateFormat; import java.util.ArrayList; import java.util.List; + @Data public class ToiletDto { @@ -30,40 +29,43 @@ private String owner; private String photo; private String area; - + private String toiletTypeName; + private String toiletType; static SimpleDateFormat dft = new SimpleDateFormat("yyyy-MM-dd"); - public static ToiletDto ConvertToDto(Toilet toilet, ICommonPermissionService iCommonPermissionService){ + public static ToiletDto ConvertToDto(Toilet toilet, ICommonPermissionService iCommonPermissionService) { - ToiletDto toiletDto=new ToiletDto(); + ToiletDto toiletDto = new ToiletDto(); toiletDto.setId(toilet.getId()); toiletDto.setName(toilet.getName()); toiletDto.setCode(toilet.getCode()); toiletDto.setPosition(toilet.getPosition()); - toiletDto.setLng(toilet.getLng()==null?"":toilet.getLng().toString()); - toiletDto.setLat(toilet.getLat()==null?"":toilet.getLat().toString()); - toiletDto.setTs(toilet.getTs()==null?"":dft.format(toilet.getTs())); + toiletDto.setLng(toilet.getLng() == null ? "" : toilet.getLng().toString()); + toiletDto.setLat(toilet.getLat() == null ? "" : toilet.getLat().toString()); + toiletDto.setTs(toilet.getTs() == null ? "" : dft.format(toilet.getTs())); toiletDto.setResponsiblePerson(toilet.getResponsiblePerson()); toiletDto.setResponsiblePersonTel(toilet.getResponsiblePersonTel()); - toiletDto.setDeptId(toilet.getDeptId()==null?"":toilet.getDeptId().toString()); + toiletDto.setDeptId(toilet.getDeptId() == null ? "" : toilet.getDeptId().toString()); toiletDto.setNotes(toilet.getNotes()); - toiletDto.setUpdateTime(toilet.getUpdateTime()==null?"":dft.format(toilet.getUpdateTime())); - toiletDto.setCreateTime(toilet.getCreateTime()==null?"":dft.format(toilet.getCreateTime())); + toiletDto.setUpdateTime(toilet.getUpdateTime() == null ? "" : dft.format(toilet.getUpdateTime())); + toiletDto.setCreateTime(toilet.getCreateTime() == null ? "" : dft.format(toilet.getCreateTime())); toiletDto.setDelFlag(toilet.getDelFlag()); toiletDto.setOwner(toilet.getOwner()); toiletDto.setPhoto(toilet.getPhoto()); - toiletDto.setArea(toilet.getArea()==null?"":toilet.getArea().toString()); - + toiletDto.setArea(toilet.getArea() == null ? "" : toilet.getArea().toString()); + if (ToolUtil.isNotEmpty(toilet.getToiletType())) { + toiletDto.setToiletTypeName(iCommonPermissionService.getDictNameByCode("toiletType", toilet.getToiletType())); + } return toiletDto; } - public static List ConvertToDtoList(List toiletList, ICommonPermissionService iCommonPermissionService){ + public static List ConvertToDtoList(List toiletList, ICommonPermissionService iCommonPermissionService) { - List toiletDtoList=new ArrayList<>(); - for(Toilet toilet:toiletList){ - toiletDtoList.add(ConvertToDto(toilet,iCommonPermissionService)); + List toiletDtoList = new ArrayList<>(); + for (Toilet toilet : toiletList) { + toiletDtoList.add(ConvertToDto(toilet, iCommonPermissionService)); } return toiletDtoList; diff --git a/casic-service-person/src/main/java/com/casic/missiles/modular/standingBook/model/Toilet.java b/casic-service-person/src/main/java/com/casic/missiles/modular/standingBook/model/Toilet.java index 73d5941..89aae23 100644 --- a/casic-service-person/src/main/java/com/casic/missiles/modular/standingBook/model/Toilet.java +++ b/casic-service-person/src/main/java/com/casic/missiles/modular/standingBook/model/Toilet.java @@ -73,6 +73,7 @@ @TableField("AREA") private BigDecimal area; - + @TableField("toilet_type") + private String toiletType; } \ No newline at end of file diff --git a/casic-service-person/src/main/java/com/casic/missiles/modular/standingBook/service/IToiletService.java b/casic-service-person/src/main/java/com/casic/missiles/modular/standingBook/service/IToiletService.java index bb41b42..252667e 100644 --- a/casic-service-person/src/main/java/com/casic/missiles/modular/standingBook/service/IToiletService.java +++ b/casic-service-person/src/main/java/com/casic/missiles/modular/standingBook/service/IToiletService.java @@ -15,9 +15,9 @@ public interface IToiletService extends IService { - List listPage(Page page, String keywords, String owner, String position); + List listPage(Page page, String keywords, String owner, String position,String toiletType); - void ExpExcelData(String keywords,String owner,String position,HttpServletResponse response, HttpServletRequest request) throws IOException; + void ExpExcelData(String keywords,String owner,String position,String toiletType,HttpServletResponse response, HttpServletRequest request) throws IOException; void ImpExcelData(MultipartFile file) throws Exception; diff --git a/casic-service-car/pom.xml b/casic-service-car/pom.xml index 9448507..e7752ee 100644 --- a/casic-service-car/pom.xml +++ b/casic-service-car/pom.xml @@ -45,6 +45,11 @@ ${pro.version} + org.springframework.boot + spring-boot-starter-quartz + 2.0.0.RELEASE + + com.casic casic-car-support 1.0.0 diff --git a/casic-service-car/src/main/java/com/casic/missiles/modular/system/alarm/strategy/job/SanitationAlarmTask.java b/casic-service-car/src/main/java/com/casic/missiles/modular/system/alarm/strategy/job/SanitationAlarmTask.java new file mode 100644 index 0000000..ac8e7f5 --- /dev/null +++ b/casic-service-car/src/main/java/com/casic/missiles/modular/system/alarm/strategy/job/SanitationAlarmTask.java @@ -0,0 +1,33 @@ +package com.casic.missiles.modular.system.alarm.strategy.job; + + +import com.casic.missiles.modular.system.service.ISanitationCarService; +import lombok.extern.slf4j.Slf4j; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.scheduling.annotation.Scheduled; +import org.springframework.stereotype.Component; + +/** + * @ClassName MonitorDataCalculateJob + * @Description 监测数据监测接口 + * @Author lwh + * @Date 2021/2/5 11:20 + * @Version 1.0 + */ +@Slf4j +@Component +public class SanitationAlarmTask { + + @Autowired + private ISanitationCarService carService; + + /** + * + * 每6小时计算一次采集数据 + */ + @Scheduled(cron = "0 */10 * * * ?") + public void execute() { + System.out.println("task --------------------"); + carService.trackInspection(); + } +} \ No newline at end of file diff --git a/casic-service-person/src/main/java/com/casic/missiles/modular/standingBook/controller/ToiletController.java b/casic-service-person/src/main/java/com/casic/missiles/modular/standingBook/controller/ToiletController.java index 10e49c3..95c75c6 100644 --- a/casic-service-person/src/main/java/com/casic/missiles/modular/standingBook/controller/ToiletController.java +++ b/casic-service-person/src/main/java/com/casic/missiles/modular/standingBook/controller/ToiletController.java @@ -87,10 +87,10 @@ @RequestMapping("/listPage") @ResponseBody - public Object listPage(String keywords, String owner, String position) { + public Object listPage(String keywords, String owner, String position,String toiletType) { Page page = new PageFactory().defaultPage(); - List toiletList = iToiletService.listPage(page, keywords, owner, position); + List toiletList = iToiletService.listPage(page, keywords, owner, position,toiletType); List toiletDtoList = ToiletDto.ConvertToDtoList(toiletList, iCommonPermissionService); Page page1 = new PageFactory().defaultPage(); page1.setRecords(toiletDtoList); @@ -123,8 +123,8 @@ @SneakyThrows @RequestMapping("/export") @ResponseBody - public Object expExcel(String keywords, String owner, String position, HttpServletRequest request, HttpServletResponse response) { - iToiletService.ExpExcelData(keywords, owner, position, response, request); + public Object expExcel(String keywords, String owner, String position,String toiletType, HttpServletRequest request, HttpServletResponse response) { + iToiletService.ExpExcelData(keywords, owner, position,toiletType, response, request); return ResponseData.success(); } diff --git a/casic-service-person/src/main/java/com/casic/missiles/modular/standingBook/dao/ToiletMapper.java b/casic-service-person/src/main/java/com/casic/missiles/modular/standingBook/dao/ToiletMapper.java index 280d358..c5d1ef3 100644 --- a/casic-service-person/src/main/java/com/casic/missiles/modular/standingBook/dao/ToiletMapper.java +++ b/casic-service-person/src/main/java/com/casic/missiles/modular/standingBook/dao/ToiletMapper.java @@ -10,5 +10,5 @@ public interface ToiletMapper extends BaseMapper { List listPage(@Param("page") Page page, @Param("keywords") String keywords, - @Param("owner") String owner, @Param("position") String position); + @Param("owner") String owner, @Param("position") String position, @Param("toiletType")String toiletType); } diff --git a/casic-service-person/src/main/java/com/casic/missiles/modular/standingBook/dao/mapping/ToiletMapper.xml b/casic-service-person/src/main/java/com/casic/missiles/modular/standingBook/dao/mapping/ToiletMapper.xml index fa631d1..b270a94 100644 --- a/casic-service-person/src/main/java/com/casic/missiles/modular/standingBook/dao/mapping/ToiletMapper.xml +++ b/casic-service-person/src/main/java/com/casic/missiles/modular/standingBook/dao/mapping/ToiletMapper.xml @@ -47,6 +47,8 @@ and POSITION like CONCAT('%',#{position},'%') - + + and toilet_Type = #{toiletType} + \ No newline at end of file diff --git a/casic-service-person/src/main/java/com/casic/missiles/modular/standingBook/dto/ToiletDto.java b/casic-service-person/src/main/java/com/casic/missiles/modular/standingBook/dto/ToiletDto.java index b36aa93..ea20edb 100644 --- a/casic-service-person/src/main/java/com/casic/missiles/modular/standingBook/dto/ToiletDto.java +++ b/casic-service-person/src/main/java/com/casic/missiles/modular/standingBook/dto/ToiletDto.java @@ -1,15 +1,14 @@ package com.casic.missiles.modular.standingBook.dto; import com.casic.missiles.core.common.service.ICommonPermissionService; -import com.casic.missiles.core.common.service.ICommonPersonService; -import com.casic.missiles.core.util.Convert; +import com.casic.missiles.core.util.ToolUtil; import com.casic.missiles.modular.standingBook.model.Toilet; import lombok.Data; -import java.math.BigInteger; import java.text.SimpleDateFormat; import java.util.ArrayList; import java.util.List; + @Data public class ToiletDto { @@ -30,40 +29,43 @@ private String owner; private String photo; private String area; - + private String toiletTypeName; + private String toiletType; static SimpleDateFormat dft = new SimpleDateFormat("yyyy-MM-dd"); - public static ToiletDto ConvertToDto(Toilet toilet, ICommonPermissionService iCommonPermissionService){ + public static ToiletDto ConvertToDto(Toilet toilet, ICommonPermissionService iCommonPermissionService) { - ToiletDto toiletDto=new ToiletDto(); + ToiletDto toiletDto = new ToiletDto(); toiletDto.setId(toilet.getId()); toiletDto.setName(toilet.getName()); toiletDto.setCode(toilet.getCode()); toiletDto.setPosition(toilet.getPosition()); - toiletDto.setLng(toilet.getLng()==null?"":toilet.getLng().toString()); - toiletDto.setLat(toilet.getLat()==null?"":toilet.getLat().toString()); - toiletDto.setTs(toilet.getTs()==null?"":dft.format(toilet.getTs())); + toiletDto.setLng(toilet.getLng() == null ? "" : toilet.getLng().toString()); + toiletDto.setLat(toilet.getLat() == null ? "" : toilet.getLat().toString()); + toiletDto.setTs(toilet.getTs() == null ? "" : dft.format(toilet.getTs())); toiletDto.setResponsiblePerson(toilet.getResponsiblePerson()); toiletDto.setResponsiblePersonTel(toilet.getResponsiblePersonTel()); - toiletDto.setDeptId(toilet.getDeptId()==null?"":toilet.getDeptId().toString()); + toiletDto.setDeptId(toilet.getDeptId() == null ? "" : toilet.getDeptId().toString()); toiletDto.setNotes(toilet.getNotes()); - toiletDto.setUpdateTime(toilet.getUpdateTime()==null?"":dft.format(toilet.getUpdateTime())); - toiletDto.setCreateTime(toilet.getCreateTime()==null?"":dft.format(toilet.getCreateTime())); + toiletDto.setUpdateTime(toilet.getUpdateTime() == null ? "" : dft.format(toilet.getUpdateTime())); + toiletDto.setCreateTime(toilet.getCreateTime() == null ? "" : dft.format(toilet.getCreateTime())); toiletDto.setDelFlag(toilet.getDelFlag()); toiletDto.setOwner(toilet.getOwner()); toiletDto.setPhoto(toilet.getPhoto()); - toiletDto.setArea(toilet.getArea()==null?"":toilet.getArea().toString()); - + toiletDto.setArea(toilet.getArea() == null ? "" : toilet.getArea().toString()); + if (ToolUtil.isNotEmpty(toilet.getToiletType())) { + toiletDto.setToiletTypeName(iCommonPermissionService.getDictNameByCode("toiletType", toilet.getToiletType())); + } return toiletDto; } - public static List ConvertToDtoList(List toiletList, ICommonPermissionService iCommonPermissionService){ + public static List ConvertToDtoList(List toiletList, ICommonPermissionService iCommonPermissionService) { - List toiletDtoList=new ArrayList<>(); - for(Toilet toilet:toiletList){ - toiletDtoList.add(ConvertToDto(toilet,iCommonPermissionService)); + List toiletDtoList = new ArrayList<>(); + for (Toilet toilet : toiletList) { + toiletDtoList.add(ConvertToDto(toilet, iCommonPermissionService)); } return toiletDtoList; diff --git a/casic-service-person/src/main/java/com/casic/missiles/modular/standingBook/model/Toilet.java b/casic-service-person/src/main/java/com/casic/missiles/modular/standingBook/model/Toilet.java index 73d5941..89aae23 100644 --- a/casic-service-person/src/main/java/com/casic/missiles/modular/standingBook/model/Toilet.java +++ b/casic-service-person/src/main/java/com/casic/missiles/modular/standingBook/model/Toilet.java @@ -73,6 +73,7 @@ @TableField("AREA") private BigDecimal area; - + @TableField("toilet_type") + private String toiletType; } \ No newline at end of file diff --git a/casic-service-person/src/main/java/com/casic/missiles/modular/standingBook/service/IToiletService.java b/casic-service-person/src/main/java/com/casic/missiles/modular/standingBook/service/IToiletService.java index bb41b42..252667e 100644 --- a/casic-service-person/src/main/java/com/casic/missiles/modular/standingBook/service/IToiletService.java +++ b/casic-service-person/src/main/java/com/casic/missiles/modular/standingBook/service/IToiletService.java @@ -15,9 +15,9 @@ public interface IToiletService extends IService { - List listPage(Page page, String keywords, String owner, String position); + List listPage(Page page, String keywords, String owner, String position,String toiletType); - void ExpExcelData(String keywords,String owner,String position,HttpServletResponse response, HttpServletRequest request) throws IOException; + void ExpExcelData(String keywords,String owner,String position,String toiletType,HttpServletResponse response, HttpServletRequest request) throws IOException; void ImpExcelData(MultipartFile file) throws Exception; diff --git a/casic-service-person/src/main/java/com/casic/missiles/modular/standingBook/service/impl/ToiletServiceImpl.java b/casic-service-person/src/main/java/com/casic/missiles/modular/standingBook/service/impl/ToiletServiceImpl.java index c6634f1..552e2aa 100644 --- a/casic-service-person/src/main/java/com/casic/missiles/modular/standingBook/service/impl/ToiletServiceImpl.java +++ b/casic-service-person/src/main/java/com/casic/missiles/modular/standingBook/service/impl/ToiletServiceImpl.java @@ -39,8 +39,8 @@ private ICommonDeptService deptService; @Override - public List listPage(Page page, String keywords, String owner, String position) { - return this.baseMapper.listPage(page, keywords, owner, position); + public List listPage(Page page, String keywords, String owner, String position,String toiletType) { + return this.baseMapper.listPage(page, keywords, owner, position,toiletType); } @Override @@ -69,22 +69,29 @@ } @Override - public void ExpExcelData(String keywords, String owner, String position, - HttpServletResponse response, HttpServletRequest request) throws IOException { + public void ExpExcelData(String keywords, String owner, String position,String toiletType,HttpServletResponse response, HttpServletRequest request) throws IOException { EntityWrapper query = new EntityWrapper<>(); query.eq("DEL_FLAG", 0); + if (StringUtils.isNotBlank(position)) { query.like("POSITION", position); } + if (StringUtils.isNotBlank(owner)) { query.eq("OWNER", owner); } + + if(StringUtils.isNotBlank(toiletType)){ + query.eq("toilet_type", toiletType); + } + if (StringUtils.isNotBlank(keywords)) { query.like("NAME", keywords); query.or(); query.like("CODE", keywords); } + List> maps = this.selectMaps(query); if (maps == null) { maps = new ArrayList<>(); diff --git a/casic-service-car/pom.xml b/casic-service-car/pom.xml index 9448507..e7752ee 100644 --- a/casic-service-car/pom.xml +++ b/casic-service-car/pom.xml @@ -45,6 +45,11 @@ ${pro.version} + org.springframework.boot + spring-boot-starter-quartz + 2.0.0.RELEASE + + com.casic casic-car-support 1.0.0 diff --git a/casic-service-car/src/main/java/com/casic/missiles/modular/system/alarm/strategy/job/SanitationAlarmTask.java b/casic-service-car/src/main/java/com/casic/missiles/modular/system/alarm/strategy/job/SanitationAlarmTask.java new file mode 100644 index 0000000..ac8e7f5 --- /dev/null +++ b/casic-service-car/src/main/java/com/casic/missiles/modular/system/alarm/strategy/job/SanitationAlarmTask.java @@ -0,0 +1,33 @@ +package com.casic.missiles.modular.system.alarm.strategy.job; + + +import com.casic.missiles.modular.system.service.ISanitationCarService; +import lombok.extern.slf4j.Slf4j; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.scheduling.annotation.Scheduled; +import org.springframework.stereotype.Component; + +/** + * @ClassName MonitorDataCalculateJob + * @Description 监测数据监测接口 + * @Author lwh + * @Date 2021/2/5 11:20 + * @Version 1.0 + */ +@Slf4j +@Component +public class SanitationAlarmTask { + + @Autowired + private ISanitationCarService carService; + + /** + * + * 每6小时计算一次采集数据 + */ + @Scheduled(cron = "0 */10 * * * ?") + public void execute() { + System.out.println("task --------------------"); + carService.trackInspection(); + } +} \ No newline at end of file diff --git a/casic-service-person/src/main/java/com/casic/missiles/modular/standingBook/controller/ToiletController.java b/casic-service-person/src/main/java/com/casic/missiles/modular/standingBook/controller/ToiletController.java index 10e49c3..95c75c6 100644 --- a/casic-service-person/src/main/java/com/casic/missiles/modular/standingBook/controller/ToiletController.java +++ b/casic-service-person/src/main/java/com/casic/missiles/modular/standingBook/controller/ToiletController.java @@ -87,10 +87,10 @@ @RequestMapping("/listPage") @ResponseBody - public Object listPage(String keywords, String owner, String position) { + public Object listPage(String keywords, String owner, String position,String toiletType) { Page page = new PageFactory().defaultPage(); - List toiletList = iToiletService.listPage(page, keywords, owner, position); + List toiletList = iToiletService.listPage(page, keywords, owner, position,toiletType); List toiletDtoList = ToiletDto.ConvertToDtoList(toiletList, iCommonPermissionService); Page page1 = new PageFactory().defaultPage(); page1.setRecords(toiletDtoList); @@ -123,8 +123,8 @@ @SneakyThrows @RequestMapping("/export") @ResponseBody - public Object expExcel(String keywords, String owner, String position, HttpServletRequest request, HttpServletResponse response) { - iToiletService.ExpExcelData(keywords, owner, position, response, request); + public Object expExcel(String keywords, String owner, String position,String toiletType, HttpServletRequest request, HttpServletResponse response) { + iToiletService.ExpExcelData(keywords, owner, position,toiletType, response, request); return ResponseData.success(); } diff --git a/casic-service-person/src/main/java/com/casic/missiles/modular/standingBook/dao/ToiletMapper.java b/casic-service-person/src/main/java/com/casic/missiles/modular/standingBook/dao/ToiletMapper.java index 280d358..c5d1ef3 100644 --- a/casic-service-person/src/main/java/com/casic/missiles/modular/standingBook/dao/ToiletMapper.java +++ b/casic-service-person/src/main/java/com/casic/missiles/modular/standingBook/dao/ToiletMapper.java @@ -10,5 +10,5 @@ public interface ToiletMapper extends BaseMapper { List listPage(@Param("page") Page page, @Param("keywords") String keywords, - @Param("owner") String owner, @Param("position") String position); + @Param("owner") String owner, @Param("position") String position, @Param("toiletType")String toiletType); } diff --git a/casic-service-person/src/main/java/com/casic/missiles/modular/standingBook/dao/mapping/ToiletMapper.xml b/casic-service-person/src/main/java/com/casic/missiles/modular/standingBook/dao/mapping/ToiletMapper.xml index fa631d1..b270a94 100644 --- a/casic-service-person/src/main/java/com/casic/missiles/modular/standingBook/dao/mapping/ToiletMapper.xml +++ b/casic-service-person/src/main/java/com/casic/missiles/modular/standingBook/dao/mapping/ToiletMapper.xml @@ -47,6 +47,8 @@ and POSITION like CONCAT('%',#{position},'%') - + + and toilet_Type = #{toiletType} + \ No newline at end of file diff --git a/casic-service-person/src/main/java/com/casic/missiles/modular/standingBook/dto/ToiletDto.java b/casic-service-person/src/main/java/com/casic/missiles/modular/standingBook/dto/ToiletDto.java index b36aa93..ea20edb 100644 --- a/casic-service-person/src/main/java/com/casic/missiles/modular/standingBook/dto/ToiletDto.java +++ b/casic-service-person/src/main/java/com/casic/missiles/modular/standingBook/dto/ToiletDto.java @@ -1,15 +1,14 @@ package com.casic.missiles.modular.standingBook.dto; import com.casic.missiles.core.common.service.ICommonPermissionService; -import com.casic.missiles.core.common.service.ICommonPersonService; -import com.casic.missiles.core.util.Convert; +import com.casic.missiles.core.util.ToolUtil; import com.casic.missiles.modular.standingBook.model.Toilet; import lombok.Data; -import java.math.BigInteger; import java.text.SimpleDateFormat; import java.util.ArrayList; import java.util.List; + @Data public class ToiletDto { @@ -30,40 +29,43 @@ private String owner; private String photo; private String area; - + private String toiletTypeName; + private String toiletType; static SimpleDateFormat dft = new SimpleDateFormat("yyyy-MM-dd"); - public static ToiletDto ConvertToDto(Toilet toilet, ICommonPermissionService iCommonPermissionService){ + public static ToiletDto ConvertToDto(Toilet toilet, ICommonPermissionService iCommonPermissionService) { - ToiletDto toiletDto=new ToiletDto(); + ToiletDto toiletDto = new ToiletDto(); toiletDto.setId(toilet.getId()); toiletDto.setName(toilet.getName()); toiletDto.setCode(toilet.getCode()); toiletDto.setPosition(toilet.getPosition()); - toiletDto.setLng(toilet.getLng()==null?"":toilet.getLng().toString()); - toiletDto.setLat(toilet.getLat()==null?"":toilet.getLat().toString()); - toiletDto.setTs(toilet.getTs()==null?"":dft.format(toilet.getTs())); + toiletDto.setLng(toilet.getLng() == null ? "" : toilet.getLng().toString()); + toiletDto.setLat(toilet.getLat() == null ? "" : toilet.getLat().toString()); + toiletDto.setTs(toilet.getTs() == null ? "" : dft.format(toilet.getTs())); toiletDto.setResponsiblePerson(toilet.getResponsiblePerson()); toiletDto.setResponsiblePersonTel(toilet.getResponsiblePersonTel()); - toiletDto.setDeptId(toilet.getDeptId()==null?"":toilet.getDeptId().toString()); + toiletDto.setDeptId(toilet.getDeptId() == null ? "" : toilet.getDeptId().toString()); toiletDto.setNotes(toilet.getNotes()); - toiletDto.setUpdateTime(toilet.getUpdateTime()==null?"":dft.format(toilet.getUpdateTime())); - toiletDto.setCreateTime(toilet.getCreateTime()==null?"":dft.format(toilet.getCreateTime())); + toiletDto.setUpdateTime(toilet.getUpdateTime() == null ? "" : dft.format(toilet.getUpdateTime())); + toiletDto.setCreateTime(toilet.getCreateTime() == null ? "" : dft.format(toilet.getCreateTime())); toiletDto.setDelFlag(toilet.getDelFlag()); toiletDto.setOwner(toilet.getOwner()); toiletDto.setPhoto(toilet.getPhoto()); - toiletDto.setArea(toilet.getArea()==null?"":toilet.getArea().toString()); - + toiletDto.setArea(toilet.getArea() == null ? "" : toilet.getArea().toString()); + if (ToolUtil.isNotEmpty(toilet.getToiletType())) { + toiletDto.setToiletTypeName(iCommonPermissionService.getDictNameByCode("toiletType", toilet.getToiletType())); + } return toiletDto; } - public static List ConvertToDtoList(List toiletList, ICommonPermissionService iCommonPermissionService){ + public static List ConvertToDtoList(List toiletList, ICommonPermissionService iCommonPermissionService) { - List toiletDtoList=new ArrayList<>(); - for(Toilet toilet:toiletList){ - toiletDtoList.add(ConvertToDto(toilet,iCommonPermissionService)); + List toiletDtoList = new ArrayList<>(); + for (Toilet toilet : toiletList) { + toiletDtoList.add(ConvertToDto(toilet, iCommonPermissionService)); } return toiletDtoList; diff --git a/casic-service-person/src/main/java/com/casic/missiles/modular/standingBook/model/Toilet.java b/casic-service-person/src/main/java/com/casic/missiles/modular/standingBook/model/Toilet.java index 73d5941..89aae23 100644 --- a/casic-service-person/src/main/java/com/casic/missiles/modular/standingBook/model/Toilet.java +++ b/casic-service-person/src/main/java/com/casic/missiles/modular/standingBook/model/Toilet.java @@ -73,6 +73,7 @@ @TableField("AREA") private BigDecimal area; - + @TableField("toilet_type") + private String toiletType; } \ No newline at end of file diff --git a/casic-service-person/src/main/java/com/casic/missiles/modular/standingBook/service/IToiletService.java b/casic-service-person/src/main/java/com/casic/missiles/modular/standingBook/service/IToiletService.java index bb41b42..252667e 100644 --- a/casic-service-person/src/main/java/com/casic/missiles/modular/standingBook/service/IToiletService.java +++ b/casic-service-person/src/main/java/com/casic/missiles/modular/standingBook/service/IToiletService.java @@ -15,9 +15,9 @@ public interface IToiletService extends IService { - List listPage(Page page, String keywords, String owner, String position); + List listPage(Page page, String keywords, String owner, String position,String toiletType); - void ExpExcelData(String keywords,String owner,String position,HttpServletResponse response, HttpServletRequest request) throws IOException; + void ExpExcelData(String keywords,String owner,String position,String toiletType,HttpServletResponse response, HttpServletRequest request) throws IOException; void ImpExcelData(MultipartFile file) throws Exception; diff --git a/casic-service-person/src/main/java/com/casic/missiles/modular/standingBook/service/impl/ToiletServiceImpl.java b/casic-service-person/src/main/java/com/casic/missiles/modular/standingBook/service/impl/ToiletServiceImpl.java index c6634f1..552e2aa 100644 --- a/casic-service-person/src/main/java/com/casic/missiles/modular/standingBook/service/impl/ToiletServiceImpl.java +++ b/casic-service-person/src/main/java/com/casic/missiles/modular/standingBook/service/impl/ToiletServiceImpl.java @@ -39,8 +39,8 @@ private ICommonDeptService deptService; @Override - public List listPage(Page page, String keywords, String owner, String position) { - return this.baseMapper.listPage(page, keywords, owner, position); + public List listPage(Page page, String keywords, String owner, String position,String toiletType) { + return this.baseMapper.listPage(page, keywords, owner, position,toiletType); } @Override @@ -69,22 +69,29 @@ } @Override - public void ExpExcelData(String keywords, String owner, String position, - HttpServletResponse response, HttpServletRequest request) throws IOException { + public void ExpExcelData(String keywords, String owner, String position,String toiletType,HttpServletResponse response, HttpServletRequest request) throws IOException { EntityWrapper query = new EntityWrapper<>(); query.eq("DEL_FLAG", 0); + if (StringUtils.isNotBlank(position)) { query.like("POSITION", position); } + if (StringUtils.isNotBlank(owner)) { query.eq("OWNER", owner); } + + if(StringUtils.isNotBlank(toiletType)){ + query.eq("toilet_type", toiletType); + } + if (StringUtils.isNotBlank(keywords)) { query.like("NAME", keywords); query.or(); query.like("CODE", keywords); } + List> maps = this.selectMaps(query); if (maps == null) { maps = new ArrayList<>(); diff --git a/casic-web/src/main/java/com/casic/missiles/CasicApplication.java b/casic-web/src/main/java/com/casic/missiles/CasicApplication.java index 4143b29..8f1404a 100644 --- a/casic-web/src/main/java/com/casic/missiles/CasicApplication.java +++ b/casic-web/src/main/java/com/casic/missiles/CasicApplication.java @@ -7,6 +7,7 @@ import org.springframework.boot.web.servlet.ServletComponentScan; import org.springframework.cache.annotation.EnableCaching; import org.springframework.scheduling.annotation.EnableAsync; +import org.springframework.scheduling.annotation.EnableScheduling; import org.springframework.transaction.annotation.EnableTransactionManagement; /** @@ -18,6 +19,7 @@ @SpringBootApplication @EnableCaching //@ServletComponentScan +@EnableScheduling @EnableTransactionManagement(proxyTargetClass = true) @EnableAsync public class CasicApplication { diff --git a/casic-service-car/pom.xml b/casic-service-car/pom.xml index 9448507..e7752ee 100644 --- a/casic-service-car/pom.xml +++ b/casic-service-car/pom.xml @@ -45,6 +45,11 @@ ${pro.version} + org.springframework.boot + spring-boot-starter-quartz + 2.0.0.RELEASE + + com.casic casic-car-support 1.0.0 diff --git a/casic-service-car/src/main/java/com/casic/missiles/modular/system/alarm/strategy/job/SanitationAlarmTask.java b/casic-service-car/src/main/java/com/casic/missiles/modular/system/alarm/strategy/job/SanitationAlarmTask.java new file mode 100644 index 0000000..ac8e7f5 --- /dev/null +++ b/casic-service-car/src/main/java/com/casic/missiles/modular/system/alarm/strategy/job/SanitationAlarmTask.java @@ -0,0 +1,33 @@ +package com.casic.missiles.modular.system.alarm.strategy.job; + + +import com.casic.missiles.modular.system.service.ISanitationCarService; +import lombok.extern.slf4j.Slf4j; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.scheduling.annotation.Scheduled; +import org.springframework.stereotype.Component; + +/** + * @ClassName MonitorDataCalculateJob + * @Description 监测数据监测接口 + * @Author lwh + * @Date 2021/2/5 11:20 + * @Version 1.0 + */ +@Slf4j +@Component +public class SanitationAlarmTask { + + @Autowired + private ISanitationCarService carService; + + /** + * + * 每6小时计算一次采集数据 + */ + @Scheduled(cron = "0 */10 * * * ?") + public void execute() { + System.out.println("task --------------------"); + carService.trackInspection(); + } +} \ No newline at end of file diff --git a/casic-service-person/src/main/java/com/casic/missiles/modular/standingBook/controller/ToiletController.java b/casic-service-person/src/main/java/com/casic/missiles/modular/standingBook/controller/ToiletController.java index 10e49c3..95c75c6 100644 --- a/casic-service-person/src/main/java/com/casic/missiles/modular/standingBook/controller/ToiletController.java +++ b/casic-service-person/src/main/java/com/casic/missiles/modular/standingBook/controller/ToiletController.java @@ -87,10 +87,10 @@ @RequestMapping("/listPage") @ResponseBody - public Object listPage(String keywords, String owner, String position) { + public Object listPage(String keywords, String owner, String position,String toiletType) { Page page = new PageFactory().defaultPage(); - List toiletList = iToiletService.listPage(page, keywords, owner, position); + List toiletList = iToiletService.listPage(page, keywords, owner, position,toiletType); List toiletDtoList = ToiletDto.ConvertToDtoList(toiletList, iCommonPermissionService); Page page1 = new PageFactory().defaultPage(); page1.setRecords(toiletDtoList); @@ -123,8 +123,8 @@ @SneakyThrows @RequestMapping("/export") @ResponseBody - public Object expExcel(String keywords, String owner, String position, HttpServletRequest request, HttpServletResponse response) { - iToiletService.ExpExcelData(keywords, owner, position, response, request); + public Object expExcel(String keywords, String owner, String position,String toiletType, HttpServletRequest request, HttpServletResponse response) { + iToiletService.ExpExcelData(keywords, owner, position,toiletType, response, request); return ResponseData.success(); } diff --git a/casic-service-person/src/main/java/com/casic/missiles/modular/standingBook/dao/ToiletMapper.java b/casic-service-person/src/main/java/com/casic/missiles/modular/standingBook/dao/ToiletMapper.java index 280d358..c5d1ef3 100644 --- a/casic-service-person/src/main/java/com/casic/missiles/modular/standingBook/dao/ToiletMapper.java +++ b/casic-service-person/src/main/java/com/casic/missiles/modular/standingBook/dao/ToiletMapper.java @@ -10,5 +10,5 @@ public interface ToiletMapper extends BaseMapper { List listPage(@Param("page") Page page, @Param("keywords") String keywords, - @Param("owner") String owner, @Param("position") String position); + @Param("owner") String owner, @Param("position") String position, @Param("toiletType")String toiletType); } diff --git a/casic-service-person/src/main/java/com/casic/missiles/modular/standingBook/dao/mapping/ToiletMapper.xml b/casic-service-person/src/main/java/com/casic/missiles/modular/standingBook/dao/mapping/ToiletMapper.xml index fa631d1..b270a94 100644 --- a/casic-service-person/src/main/java/com/casic/missiles/modular/standingBook/dao/mapping/ToiletMapper.xml +++ b/casic-service-person/src/main/java/com/casic/missiles/modular/standingBook/dao/mapping/ToiletMapper.xml @@ -47,6 +47,8 @@ and POSITION like CONCAT('%',#{position},'%') - + + and toilet_Type = #{toiletType} + \ No newline at end of file diff --git a/casic-service-person/src/main/java/com/casic/missiles/modular/standingBook/dto/ToiletDto.java b/casic-service-person/src/main/java/com/casic/missiles/modular/standingBook/dto/ToiletDto.java index b36aa93..ea20edb 100644 --- a/casic-service-person/src/main/java/com/casic/missiles/modular/standingBook/dto/ToiletDto.java +++ b/casic-service-person/src/main/java/com/casic/missiles/modular/standingBook/dto/ToiletDto.java @@ -1,15 +1,14 @@ package com.casic.missiles.modular.standingBook.dto; import com.casic.missiles.core.common.service.ICommonPermissionService; -import com.casic.missiles.core.common.service.ICommonPersonService; -import com.casic.missiles.core.util.Convert; +import com.casic.missiles.core.util.ToolUtil; import com.casic.missiles.modular.standingBook.model.Toilet; import lombok.Data; -import java.math.BigInteger; import java.text.SimpleDateFormat; import java.util.ArrayList; import java.util.List; + @Data public class ToiletDto { @@ -30,40 +29,43 @@ private String owner; private String photo; private String area; - + private String toiletTypeName; + private String toiletType; static SimpleDateFormat dft = new SimpleDateFormat("yyyy-MM-dd"); - public static ToiletDto ConvertToDto(Toilet toilet, ICommonPermissionService iCommonPermissionService){ + public static ToiletDto ConvertToDto(Toilet toilet, ICommonPermissionService iCommonPermissionService) { - ToiletDto toiletDto=new ToiletDto(); + ToiletDto toiletDto = new ToiletDto(); toiletDto.setId(toilet.getId()); toiletDto.setName(toilet.getName()); toiletDto.setCode(toilet.getCode()); toiletDto.setPosition(toilet.getPosition()); - toiletDto.setLng(toilet.getLng()==null?"":toilet.getLng().toString()); - toiletDto.setLat(toilet.getLat()==null?"":toilet.getLat().toString()); - toiletDto.setTs(toilet.getTs()==null?"":dft.format(toilet.getTs())); + toiletDto.setLng(toilet.getLng() == null ? "" : toilet.getLng().toString()); + toiletDto.setLat(toilet.getLat() == null ? "" : toilet.getLat().toString()); + toiletDto.setTs(toilet.getTs() == null ? "" : dft.format(toilet.getTs())); toiletDto.setResponsiblePerson(toilet.getResponsiblePerson()); toiletDto.setResponsiblePersonTel(toilet.getResponsiblePersonTel()); - toiletDto.setDeptId(toilet.getDeptId()==null?"":toilet.getDeptId().toString()); + toiletDto.setDeptId(toilet.getDeptId() == null ? "" : toilet.getDeptId().toString()); toiletDto.setNotes(toilet.getNotes()); - toiletDto.setUpdateTime(toilet.getUpdateTime()==null?"":dft.format(toilet.getUpdateTime())); - toiletDto.setCreateTime(toilet.getCreateTime()==null?"":dft.format(toilet.getCreateTime())); + toiletDto.setUpdateTime(toilet.getUpdateTime() == null ? "" : dft.format(toilet.getUpdateTime())); + toiletDto.setCreateTime(toilet.getCreateTime() == null ? "" : dft.format(toilet.getCreateTime())); toiletDto.setDelFlag(toilet.getDelFlag()); toiletDto.setOwner(toilet.getOwner()); toiletDto.setPhoto(toilet.getPhoto()); - toiletDto.setArea(toilet.getArea()==null?"":toilet.getArea().toString()); - + toiletDto.setArea(toilet.getArea() == null ? "" : toilet.getArea().toString()); + if (ToolUtil.isNotEmpty(toilet.getToiletType())) { + toiletDto.setToiletTypeName(iCommonPermissionService.getDictNameByCode("toiletType", toilet.getToiletType())); + } return toiletDto; } - public static List ConvertToDtoList(List toiletList, ICommonPermissionService iCommonPermissionService){ + public static List ConvertToDtoList(List toiletList, ICommonPermissionService iCommonPermissionService) { - List toiletDtoList=new ArrayList<>(); - for(Toilet toilet:toiletList){ - toiletDtoList.add(ConvertToDto(toilet,iCommonPermissionService)); + List toiletDtoList = new ArrayList<>(); + for (Toilet toilet : toiletList) { + toiletDtoList.add(ConvertToDto(toilet, iCommonPermissionService)); } return toiletDtoList; diff --git a/casic-service-person/src/main/java/com/casic/missiles/modular/standingBook/model/Toilet.java b/casic-service-person/src/main/java/com/casic/missiles/modular/standingBook/model/Toilet.java index 73d5941..89aae23 100644 --- a/casic-service-person/src/main/java/com/casic/missiles/modular/standingBook/model/Toilet.java +++ b/casic-service-person/src/main/java/com/casic/missiles/modular/standingBook/model/Toilet.java @@ -73,6 +73,7 @@ @TableField("AREA") private BigDecimal area; - + @TableField("toilet_type") + private String toiletType; } \ No newline at end of file diff --git a/casic-service-person/src/main/java/com/casic/missiles/modular/standingBook/service/IToiletService.java b/casic-service-person/src/main/java/com/casic/missiles/modular/standingBook/service/IToiletService.java index bb41b42..252667e 100644 --- a/casic-service-person/src/main/java/com/casic/missiles/modular/standingBook/service/IToiletService.java +++ b/casic-service-person/src/main/java/com/casic/missiles/modular/standingBook/service/IToiletService.java @@ -15,9 +15,9 @@ public interface IToiletService extends IService { - List listPage(Page page, String keywords, String owner, String position); + List listPage(Page page, String keywords, String owner, String position,String toiletType); - void ExpExcelData(String keywords,String owner,String position,HttpServletResponse response, HttpServletRequest request) throws IOException; + void ExpExcelData(String keywords,String owner,String position,String toiletType,HttpServletResponse response, HttpServletRequest request) throws IOException; void ImpExcelData(MultipartFile file) throws Exception; diff --git a/casic-service-person/src/main/java/com/casic/missiles/modular/standingBook/service/impl/ToiletServiceImpl.java b/casic-service-person/src/main/java/com/casic/missiles/modular/standingBook/service/impl/ToiletServiceImpl.java index c6634f1..552e2aa 100644 --- a/casic-service-person/src/main/java/com/casic/missiles/modular/standingBook/service/impl/ToiletServiceImpl.java +++ b/casic-service-person/src/main/java/com/casic/missiles/modular/standingBook/service/impl/ToiletServiceImpl.java @@ -39,8 +39,8 @@ private ICommonDeptService deptService; @Override - public List listPage(Page page, String keywords, String owner, String position) { - return this.baseMapper.listPage(page, keywords, owner, position); + public List listPage(Page page, String keywords, String owner, String position,String toiletType) { + return this.baseMapper.listPage(page, keywords, owner, position,toiletType); } @Override @@ -69,22 +69,29 @@ } @Override - public void ExpExcelData(String keywords, String owner, String position, - HttpServletResponse response, HttpServletRequest request) throws IOException { + public void ExpExcelData(String keywords, String owner, String position,String toiletType,HttpServletResponse response, HttpServletRequest request) throws IOException { EntityWrapper query = new EntityWrapper<>(); query.eq("DEL_FLAG", 0); + if (StringUtils.isNotBlank(position)) { query.like("POSITION", position); } + if (StringUtils.isNotBlank(owner)) { query.eq("OWNER", owner); } + + if(StringUtils.isNotBlank(toiletType)){ + query.eq("toilet_type", toiletType); + } + if (StringUtils.isNotBlank(keywords)) { query.like("NAME", keywords); query.or(); query.like("CODE", keywords); } + List> maps = this.selectMaps(query); if (maps == null) { maps = new ArrayList<>(); diff --git a/casic-web/src/main/java/com/casic/missiles/CasicApplication.java b/casic-web/src/main/java/com/casic/missiles/CasicApplication.java index 4143b29..8f1404a 100644 --- a/casic-web/src/main/java/com/casic/missiles/CasicApplication.java +++ b/casic-web/src/main/java/com/casic/missiles/CasicApplication.java @@ -7,6 +7,7 @@ import org.springframework.boot.web.servlet.ServletComponentScan; import org.springframework.cache.annotation.EnableCaching; import org.springframework.scheduling.annotation.EnableAsync; +import org.springframework.scheduling.annotation.EnableScheduling; import org.springframework.transaction.annotation.EnableTransactionManagement; /** @@ -18,6 +19,7 @@ @SpringBootApplication @EnableCaching //@ServletComponentScan +@EnableScheduling @EnableTransactionManagement(proxyTargetClass = true) @EnableAsync public class CasicApplication { diff --git a/casic-web/src/main/resources/config/application-dev.yml b/casic-web/src/main/resources/config/application-dev.yml index 80c48c4..77f8fac 100644 --- a/casic-web/src/main/resources/config/application-dev.yml +++ b/casic-web/src/main/resources/config/application-dev.yml @@ -17,7 +17,7 @@ kaptcha-open: false #是否开启登录时验证码 (true/false) nologin-urls: /user/login,/user/appLogin,/kaptcha/base64,/config/baseConfig,/route/mockToken logging: - level.root: error - level.com.casic: error + level.root: info + level.com.casic: info path: logs/ file: missiles.log \ No newline at end of file diff --git a/casic-service-car/pom.xml b/casic-service-car/pom.xml index 9448507..e7752ee 100644 --- a/casic-service-car/pom.xml +++ b/casic-service-car/pom.xml @@ -45,6 +45,11 @@ ${pro.version} + org.springframework.boot + spring-boot-starter-quartz + 2.0.0.RELEASE + + com.casic casic-car-support 1.0.0 diff --git a/casic-service-car/src/main/java/com/casic/missiles/modular/system/alarm/strategy/job/SanitationAlarmTask.java b/casic-service-car/src/main/java/com/casic/missiles/modular/system/alarm/strategy/job/SanitationAlarmTask.java new file mode 100644 index 0000000..ac8e7f5 --- /dev/null +++ b/casic-service-car/src/main/java/com/casic/missiles/modular/system/alarm/strategy/job/SanitationAlarmTask.java @@ -0,0 +1,33 @@ +package com.casic.missiles.modular.system.alarm.strategy.job; + + +import com.casic.missiles.modular.system.service.ISanitationCarService; +import lombok.extern.slf4j.Slf4j; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.scheduling.annotation.Scheduled; +import org.springframework.stereotype.Component; + +/** + * @ClassName MonitorDataCalculateJob + * @Description 监测数据监测接口 + * @Author lwh + * @Date 2021/2/5 11:20 + * @Version 1.0 + */ +@Slf4j +@Component +public class SanitationAlarmTask { + + @Autowired + private ISanitationCarService carService; + + /** + * + * 每6小时计算一次采集数据 + */ + @Scheduled(cron = "0 */10 * * * ?") + public void execute() { + System.out.println("task --------------------"); + carService.trackInspection(); + } +} \ No newline at end of file diff --git a/casic-service-person/src/main/java/com/casic/missiles/modular/standingBook/controller/ToiletController.java b/casic-service-person/src/main/java/com/casic/missiles/modular/standingBook/controller/ToiletController.java index 10e49c3..95c75c6 100644 --- a/casic-service-person/src/main/java/com/casic/missiles/modular/standingBook/controller/ToiletController.java +++ b/casic-service-person/src/main/java/com/casic/missiles/modular/standingBook/controller/ToiletController.java @@ -87,10 +87,10 @@ @RequestMapping("/listPage") @ResponseBody - public Object listPage(String keywords, String owner, String position) { + public Object listPage(String keywords, String owner, String position,String toiletType) { Page page = new PageFactory().defaultPage(); - List toiletList = iToiletService.listPage(page, keywords, owner, position); + List toiletList = iToiletService.listPage(page, keywords, owner, position,toiletType); List toiletDtoList = ToiletDto.ConvertToDtoList(toiletList, iCommonPermissionService); Page page1 = new PageFactory().defaultPage(); page1.setRecords(toiletDtoList); @@ -123,8 +123,8 @@ @SneakyThrows @RequestMapping("/export") @ResponseBody - public Object expExcel(String keywords, String owner, String position, HttpServletRequest request, HttpServletResponse response) { - iToiletService.ExpExcelData(keywords, owner, position, response, request); + public Object expExcel(String keywords, String owner, String position,String toiletType, HttpServletRequest request, HttpServletResponse response) { + iToiletService.ExpExcelData(keywords, owner, position,toiletType, response, request); return ResponseData.success(); } diff --git a/casic-service-person/src/main/java/com/casic/missiles/modular/standingBook/dao/ToiletMapper.java b/casic-service-person/src/main/java/com/casic/missiles/modular/standingBook/dao/ToiletMapper.java index 280d358..c5d1ef3 100644 --- a/casic-service-person/src/main/java/com/casic/missiles/modular/standingBook/dao/ToiletMapper.java +++ b/casic-service-person/src/main/java/com/casic/missiles/modular/standingBook/dao/ToiletMapper.java @@ -10,5 +10,5 @@ public interface ToiletMapper extends BaseMapper { List listPage(@Param("page") Page page, @Param("keywords") String keywords, - @Param("owner") String owner, @Param("position") String position); + @Param("owner") String owner, @Param("position") String position, @Param("toiletType")String toiletType); } diff --git a/casic-service-person/src/main/java/com/casic/missiles/modular/standingBook/dao/mapping/ToiletMapper.xml b/casic-service-person/src/main/java/com/casic/missiles/modular/standingBook/dao/mapping/ToiletMapper.xml index fa631d1..b270a94 100644 --- a/casic-service-person/src/main/java/com/casic/missiles/modular/standingBook/dao/mapping/ToiletMapper.xml +++ b/casic-service-person/src/main/java/com/casic/missiles/modular/standingBook/dao/mapping/ToiletMapper.xml @@ -47,6 +47,8 @@ and POSITION like CONCAT('%',#{position},'%') - + + and toilet_Type = #{toiletType} + \ No newline at end of file diff --git a/casic-service-person/src/main/java/com/casic/missiles/modular/standingBook/dto/ToiletDto.java b/casic-service-person/src/main/java/com/casic/missiles/modular/standingBook/dto/ToiletDto.java index b36aa93..ea20edb 100644 --- a/casic-service-person/src/main/java/com/casic/missiles/modular/standingBook/dto/ToiletDto.java +++ b/casic-service-person/src/main/java/com/casic/missiles/modular/standingBook/dto/ToiletDto.java @@ -1,15 +1,14 @@ package com.casic.missiles.modular.standingBook.dto; import com.casic.missiles.core.common.service.ICommonPermissionService; -import com.casic.missiles.core.common.service.ICommonPersonService; -import com.casic.missiles.core.util.Convert; +import com.casic.missiles.core.util.ToolUtil; import com.casic.missiles.modular.standingBook.model.Toilet; import lombok.Data; -import java.math.BigInteger; import java.text.SimpleDateFormat; import java.util.ArrayList; import java.util.List; + @Data public class ToiletDto { @@ -30,40 +29,43 @@ private String owner; private String photo; private String area; - + private String toiletTypeName; + private String toiletType; static SimpleDateFormat dft = new SimpleDateFormat("yyyy-MM-dd"); - public static ToiletDto ConvertToDto(Toilet toilet, ICommonPermissionService iCommonPermissionService){ + public static ToiletDto ConvertToDto(Toilet toilet, ICommonPermissionService iCommonPermissionService) { - ToiletDto toiletDto=new ToiletDto(); + ToiletDto toiletDto = new ToiletDto(); toiletDto.setId(toilet.getId()); toiletDto.setName(toilet.getName()); toiletDto.setCode(toilet.getCode()); toiletDto.setPosition(toilet.getPosition()); - toiletDto.setLng(toilet.getLng()==null?"":toilet.getLng().toString()); - toiletDto.setLat(toilet.getLat()==null?"":toilet.getLat().toString()); - toiletDto.setTs(toilet.getTs()==null?"":dft.format(toilet.getTs())); + toiletDto.setLng(toilet.getLng() == null ? "" : toilet.getLng().toString()); + toiletDto.setLat(toilet.getLat() == null ? "" : toilet.getLat().toString()); + toiletDto.setTs(toilet.getTs() == null ? "" : dft.format(toilet.getTs())); toiletDto.setResponsiblePerson(toilet.getResponsiblePerson()); toiletDto.setResponsiblePersonTel(toilet.getResponsiblePersonTel()); - toiletDto.setDeptId(toilet.getDeptId()==null?"":toilet.getDeptId().toString()); + toiletDto.setDeptId(toilet.getDeptId() == null ? "" : toilet.getDeptId().toString()); toiletDto.setNotes(toilet.getNotes()); - toiletDto.setUpdateTime(toilet.getUpdateTime()==null?"":dft.format(toilet.getUpdateTime())); - toiletDto.setCreateTime(toilet.getCreateTime()==null?"":dft.format(toilet.getCreateTime())); + toiletDto.setUpdateTime(toilet.getUpdateTime() == null ? "" : dft.format(toilet.getUpdateTime())); + toiletDto.setCreateTime(toilet.getCreateTime() == null ? "" : dft.format(toilet.getCreateTime())); toiletDto.setDelFlag(toilet.getDelFlag()); toiletDto.setOwner(toilet.getOwner()); toiletDto.setPhoto(toilet.getPhoto()); - toiletDto.setArea(toilet.getArea()==null?"":toilet.getArea().toString()); - + toiletDto.setArea(toilet.getArea() == null ? "" : toilet.getArea().toString()); + if (ToolUtil.isNotEmpty(toilet.getToiletType())) { + toiletDto.setToiletTypeName(iCommonPermissionService.getDictNameByCode("toiletType", toilet.getToiletType())); + } return toiletDto; } - public static List ConvertToDtoList(List toiletList, ICommonPermissionService iCommonPermissionService){ + public static List ConvertToDtoList(List toiletList, ICommonPermissionService iCommonPermissionService) { - List toiletDtoList=new ArrayList<>(); - for(Toilet toilet:toiletList){ - toiletDtoList.add(ConvertToDto(toilet,iCommonPermissionService)); + List toiletDtoList = new ArrayList<>(); + for (Toilet toilet : toiletList) { + toiletDtoList.add(ConvertToDto(toilet, iCommonPermissionService)); } return toiletDtoList; diff --git a/casic-service-person/src/main/java/com/casic/missiles/modular/standingBook/model/Toilet.java b/casic-service-person/src/main/java/com/casic/missiles/modular/standingBook/model/Toilet.java index 73d5941..89aae23 100644 --- a/casic-service-person/src/main/java/com/casic/missiles/modular/standingBook/model/Toilet.java +++ b/casic-service-person/src/main/java/com/casic/missiles/modular/standingBook/model/Toilet.java @@ -73,6 +73,7 @@ @TableField("AREA") private BigDecimal area; - + @TableField("toilet_type") + private String toiletType; } \ No newline at end of file diff --git a/casic-service-person/src/main/java/com/casic/missiles/modular/standingBook/service/IToiletService.java b/casic-service-person/src/main/java/com/casic/missiles/modular/standingBook/service/IToiletService.java index bb41b42..252667e 100644 --- a/casic-service-person/src/main/java/com/casic/missiles/modular/standingBook/service/IToiletService.java +++ b/casic-service-person/src/main/java/com/casic/missiles/modular/standingBook/service/IToiletService.java @@ -15,9 +15,9 @@ public interface IToiletService extends IService { - List listPage(Page page, String keywords, String owner, String position); + List listPage(Page page, String keywords, String owner, String position,String toiletType); - void ExpExcelData(String keywords,String owner,String position,HttpServletResponse response, HttpServletRequest request) throws IOException; + void ExpExcelData(String keywords,String owner,String position,String toiletType,HttpServletResponse response, HttpServletRequest request) throws IOException; void ImpExcelData(MultipartFile file) throws Exception; diff --git a/casic-service-person/src/main/java/com/casic/missiles/modular/standingBook/service/impl/ToiletServiceImpl.java b/casic-service-person/src/main/java/com/casic/missiles/modular/standingBook/service/impl/ToiletServiceImpl.java index c6634f1..552e2aa 100644 --- a/casic-service-person/src/main/java/com/casic/missiles/modular/standingBook/service/impl/ToiletServiceImpl.java +++ b/casic-service-person/src/main/java/com/casic/missiles/modular/standingBook/service/impl/ToiletServiceImpl.java @@ -39,8 +39,8 @@ private ICommonDeptService deptService; @Override - public List listPage(Page page, String keywords, String owner, String position) { - return this.baseMapper.listPage(page, keywords, owner, position); + public List listPage(Page page, String keywords, String owner, String position,String toiletType) { + return this.baseMapper.listPage(page, keywords, owner, position,toiletType); } @Override @@ -69,22 +69,29 @@ } @Override - public void ExpExcelData(String keywords, String owner, String position, - HttpServletResponse response, HttpServletRequest request) throws IOException { + public void ExpExcelData(String keywords, String owner, String position,String toiletType,HttpServletResponse response, HttpServletRequest request) throws IOException { EntityWrapper query = new EntityWrapper<>(); query.eq("DEL_FLAG", 0); + if (StringUtils.isNotBlank(position)) { query.like("POSITION", position); } + if (StringUtils.isNotBlank(owner)) { query.eq("OWNER", owner); } + + if(StringUtils.isNotBlank(toiletType)){ + query.eq("toilet_type", toiletType); + } + if (StringUtils.isNotBlank(keywords)) { query.like("NAME", keywords); query.or(); query.like("CODE", keywords); } + List> maps = this.selectMaps(query); if (maps == null) { maps = new ArrayList<>(); diff --git a/casic-web/src/main/java/com/casic/missiles/CasicApplication.java b/casic-web/src/main/java/com/casic/missiles/CasicApplication.java index 4143b29..8f1404a 100644 --- a/casic-web/src/main/java/com/casic/missiles/CasicApplication.java +++ b/casic-web/src/main/java/com/casic/missiles/CasicApplication.java @@ -7,6 +7,7 @@ import org.springframework.boot.web.servlet.ServletComponentScan; import org.springframework.cache.annotation.EnableCaching; import org.springframework.scheduling.annotation.EnableAsync; +import org.springframework.scheduling.annotation.EnableScheduling; import org.springframework.transaction.annotation.EnableTransactionManagement; /** @@ -18,6 +19,7 @@ @SpringBootApplication @EnableCaching //@ServletComponentScan +@EnableScheduling @EnableTransactionManagement(proxyTargetClass = true) @EnableAsync public class CasicApplication { diff --git a/casic-web/src/main/resources/config/application-dev.yml b/casic-web/src/main/resources/config/application-dev.yml index 80c48c4..77f8fac 100644 --- a/casic-web/src/main/resources/config/application-dev.yml +++ b/casic-web/src/main/resources/config/application-dev.yml @@ -17,7 +17,7 @@ kaptcha-open: false #是否开启登录时验证码 (true/false) nologin-urls: /user/login,/user/appLogin,/kaptcha/base64,/config/baseConfig,/route/mockToken logging: - level.root: error - level.com.casic: error + level.root: info + level.com.casic: info path: logs/ file: missiles.log \ No newline at end of file diff --git a/casic-web/src/main/resources/config/application.yml b/casic-web/src/main/resources/config/application.yml index 62e4992..65ed557 100644 --- a/casic-web/src/main/resources/config/application.yml +++ b/casic-web/src/main/resources/config/application.yml @@ -3,7 +3,7 @@ ########################################################## spring: profiles: - active: @activatedProperties@ + active: dev http: multipart: max-file-size: 50MB @@ -22,6 +22,8 @@ bizDataBaseName: casic_smartcity_car #引用车辆子包业务库 sanitationBaseName: casic_sanitation #环卫子系统业务库 carDataBaseName: casic_smartcity_car #车辆子系统业务库 + configuration: + log-impl: org.apache.ibatis.logging.stdout.StdOutImpl ################### mybatis-plus配置 ################### ################### guns配置 ################### elasticjob: