diff --git a/hiatmp-hidden-danger-server/src/main/java/com/hisense/hiatmp/server_api/controller/AuthController.java b/hiatmp-hidden-danger-server/src/main/java/com/hisense/hiatmp/server_api/controller/AuthController.java index d4a802c..c71fc1c 100644 --- a/hiatmp-hidden-danger-server/src/main/java/com/hisense/hiatmp/server_api/controller/AuthController.java +++ b/hiatmp-hidden-danger-server/src/main/java/com/hisense/hiatmp/server_api/controller/AuthController.java @@ -83,7 +83,7 @@ public class AuthController { String encrypt = authService.encrypt(nuserpwd + nuserid); operatorById.setCuserpwd(encrypt); - String sessionId1 =authService.encrypt(nuserid + "-" + timestamp) ; + String sessionId1 = authService.encrypt(nuserid + "-" + timestamp) ; if(Objects.equals(sessionId1, sessionId)){ // 执行修改操作并返回结果，返回修改的，如果为null，表示修改失败 diff --git a/hiatmp-hidden-danger-server/src/main/java/com/hisense/hiatmp/server_api/controller/ConfigController.java b/hiatmp-hidden-danger-server/src/main/java/com/hisense/hiatmp/server_api/controller/ConfigController.java index ae7ed2f..ee96611 100644 --- a/hiatmp-hidden-danger-server/src/main/java/com/hisense/hiatmp/server_api/controller/ConfigController.java +++ b/hiatmp-hidden-danger-server/src/main/java/com/hisense/hiatmp/server_api/controller/ConfigController.java @@ -45,12 +45,22 @@ public class ConfigController extends HiatmpController { 辖区绑定街道 */ @GetMapping("/getStreetCommunityByXq") - public ServerResponse getStreetCommunityByXq(@RequestParam String xqcode + public ServerResponse getStreetCommunityByXq(@RequestParam(defaultValue = "") String xqcode ){ List streetCommunity = configService.getStreetCommunityByXq(xqcode); return ServerResponse.ok(streetCommunity); } + /* + 街道绑定社区 + */ + @GetMapping("/getStreetCommunityByJq") + public ServerResponse getStreetCommunityByJq(@RequestParam(defaultValue = "") String jdcode + ){ + List streetCommunity = configService.getStreetCommunityByJd(jdcode); + return ServerResponse.ok(streetCommunity); + } + /* * 获取辖区街道数据 */ diff --git a/hiatmp-hidden-danger-server/src/main/java/com/hisense/hiatmp/server_api/controller/HighDangerController.java b/hiatmp-hidden-danger-server/src/main/java/com/hisense/hiatmp/server_api/controller/HighDangerController.java index 414730c..1ecfbf1 100644 --- a/hiatmp-hidden-danger-server/src/main/java/com/hisense/hiatmp/server_api/controller/HighDangerController.java +++ b/hiatmp-hidden-danger-server/src/main/java/com/hisense/hiatmp/server_api/controller/HighDangerController.java @@ -755,7 +755,7 @@ public class HighDangerController { SectionDTO sectionByCode = new SectionDTO(); log.info("/getDangerRoad（查询当前排查所在路段）接口被调用,调用ip: {}, 入参:{}", request.getRemoteAddr(), businessId); - HighDangerRoad roadInfo = highDangerMapper.getRoadInfo(businessId); + HighDangerRoad roadInfo = highDangerMapper.getRoadInfo(businessId,ifCross); roadInfo.setDeptId(operatorMapper.getOperatorById(roadInfo.getOperator()).getCdepartmentid()); // 路段 @@ -782,13 +782,7 @@ public class HighDangerController { float lon = Float.parseFloat(split[i]); float lat = Float.parseFloat(split[i + 1]); - //CoordinateConverter.AMap transform = highDangerService.transform(x, y); - CoordinateConverter.AMap aMap = CoordinateConverter.transform(lon, lat); - // 108.766167,34.207948 - //System.out.println("GPS转高德之前：" + lon + "," + lat); - // 108.77088779593853,34.206482360676944 - //System.out.println("GPS转高德之后：" + aMap.getLongitude() + "," + aMap.getLatitude()); pointMap.put("longitude", aMap.getLongitude()); pointMap.put("latitude", aMap.getLatitude()); @@ -797,33 +791,6 @@ public class HighDangerController { roadInfo.setAddress(sectionByCode.getSectionName()); roadInfo.setCoordinateList(coordinateMapTemporary); -// Date nowDate = new Date(); -// Date pcEndTime = roadInfo.getPcEndTime(); -// if (pcEndTime != null) { -// long diff = nowDate.getTime() - pcEndTime.getTime(); -// // 时间差 -// long diffDays = diff / (24 * 60 * 60 * 1000); -// diffDays = Math.abs(diffDays); -// -// int comparison = nowDate.compareTo(pcEndTime); -// if (comparison < 0) { // 超期 -// roadInfo.setDeadline(diffDays); -// roadInfo.setDeadlineStatus("超期" + diffDays + "天"); -// roadInfo.setDeadlineType("1"); -// } else if (comparison > 0 && diffDays <= 3) { // 临期 -// roadInfo.setDeadline(diffDays); -// roadInfo.setDeadlineStatus("临期" + diffDays + "天"); -// roadInfo.setDeadlineType("2"); -// } else { // 正常 -// roadInfo.setDeadline(diffDays); -// roadInfo.setDeadlineStatus("正常"); -// roadInfo.setDeadlineType("3"); -// } -// } else { -// roadInfo.setDeadlineStatus("无排查结束时间"); -// roadInfo.setDeadlineType("3"); -// } - log.info("/getDangerRoad（查询当前排查所在路段）接口返回, 客户端ip: {}, 返回数据:{}", request.getRemoteAddr(), roadInfo); if (roadInfo != null) { @@ -831,7 +798,6 @@ public class HighDangerController { } else { return ServerResponse.error("无对应路口信息"); } - } // 查询重点排查选项 @@ -858,7 +824,7 @@ public class HighDangerController { log.info("/saveSectionOrCrossing（新增路段 & 路口）接口被调用,调用ip: {}, 入参:{}", request.getRemoteAddr(), sectionOrCrossAdd); - HighDangerRoad roadInfo = highDangerMapper.getRoadInfo(sectionOrCrossAdd.getBusinessId()); + HighDangerRoad roadInfo = highDangerMapper.getRoadInfo(sectionOrCrossAdd.getBusinessId(),"2"); if (roadInfo != null) { UUID uuid = UUID.randomUUID(); String uuidString = uuid.toString().replace("-", ""); @@ -969,15 +935,6 @@ public class HighDangerController { // } else { // if(!sectionInfo.isEmpty()){ for (int i = 0; i < sectionInfo.size(); i++) { -// List dangerBaseData = new ArrayList<>(); -// if(sectionInfo.get(i).getIfCross().equals("1")){ -// dangerBaseData = configMapper.getDangerBaseData("", sectionInfo.get(i).getSectionCode()); -// }else{ -// dangerBaseData = configMapper.getDangerBaseData(sectionInfo.get(i).getSectionCode(),"" ); -// } -// -// sectionInfo.get(i).setSectionName(dangerBaseData.get(0).getSectionName()); -// thtSectionInfoDTO = sectionInfo.get(0); // 是否该排查有绑定的辖区街道信息，有则展示 List communityByRoad = highDangerMapper.getCommunityByRoad(businessId); if (communityByRoad != null && !communityByRoad.isEmpty()) { diff --git a/hiatmp-hidden-danger-server/src/main/java/com/hisense/hiatmp/server_api/controller/TricycleController.java b/hiatmp-hidden-danger-server/src/main/java/com/hisense/hiatmp/server_api/controller/TricycleController.java new file mode 100644 index 0000000..554e21d --- /dev/null +++ b/hiatmp-hidden-danger-server/src/main/java/com/hisense/hiatmp/server_api/controller/TricycleController.java @@ -0,0 +1,179 @@ +package com.hisense.hiatmp.server_api.controller; + +import com.github.pagehelper.PageHelper; +import com.github.pagehelper.PageInfo; +import com.hisense.hiatmp.model.common.DTO.ThtTricycleInfoBaseDTO; +import com.hisense.hiatmp.model.common.HighDangerBase; +import com.hisense.hiatmp.model.common.Operator; +import com.hisense.hiatmp.model.common.ServerResponse; +import com.hisense.hiatmp.model.common.VO.TricycleListVO; +import com.hisense.hiatmp.model.common.VO.TricycleWarningListVO; +import com.hisense.hiatmp.model.common.enums.RoleEnum; +import com.hisense.hiatmp.model.dmr.EnumType; +import com.hisense.hiatmp.server_api.service.OperatorService; +import com.hisense.hiatmp.server_api.service.TricycleService; +import io.swagger.annotations.ApiOperation; +import lombok.extern.slf4j.Slf4j; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; + +import javax.servlet.http.HttpServletRequest; +import java.util.List; +import java.util.Map; + +/* + * @ClassName TricycleController + * @Description 三轮车信息登记Controller + * @Author zhangxu + * @Date 2024/09/03 12:47 + * @Version 1.0 + * @Since JDK 1.8+ + */ +@RestController +@Slf4j +@RequestMapping("/tricycle") +public class TricycleController { + + @Autowired + private TricycleService tricycleService; + + @Autowired + private OperatorService operatorService; + + + + @GetMapping("getTricycleList") + @ApiOperation("获取信息登记列表") + public ServerResponse getTricycleList(HttpServletRequest request, + @RequestParam String nuserId, + @RequestParam String status, + @RequestParam(defaultValue = "") String search +// ,@RequestParam(defaultValue = "1") Integer pageNum, +// @RequestParam(defaultValue = "10") Integer pageSize + ){ + log.info("/getTricycleList（【三轮车】获取信息登记列表）接口被调用,调用ip: {}, 入参:{}", request.getRemoteAddr(), nuserId); + int roleFlag = 0; + + Operator operatorById = operatorService.getOperatorById(nuserId); + String cdepartmentid = operatorById.getCdepartmentid(); + List roleById = operatorService.getRoleById(nuserId); + + if (!roleById.isEmpty()) { + for (String role : roleById){ + if(RoleEnum.VILLAGE_CADRE.getName().equals(role)){ + roleFlag = 1; + break; + }else if(RoleEnum.TRICYCLE_SQUADRON_POLICE_OFFICERS.getName().equals(role)){ + roleFlag = 2; + break; + } + } + } else { + return ServerResponse.error("当前用户无权限"); + } +// PageHelper.startPage(pageNum, pageSize); + List tricycleList = tricycleService.getTricycleList(roleFlag,cdepartmentid,status,search); +// PageInfo pageInfo = new PageInfo<>(tricycleList); + log.info("/getTricycleList（【三轮车】获取信息登记列表））接口数据返回,调用ip: {}, 出参:{}", request.getRemoteAddr(), tricycleList); + return ServerResponse.ok(tricycleList); +// return ServerResponse.ok(pageInfo); + } + + @PostMapping("saveTricycleInfo") + @ApiOperation("新增/保存农三轮登记信息") + public ServerResponse saveTricycleInfo(HttpServletRequest request, + @RequestBody ThtTricycleInfoBaseDTO tricycleInfo + ){ + log.info("/saveTricycleInfo（【三轮车】保存登记数据）接口被调用,调用ip: {}, 入参:{}", request.getRemoteAddr(), tricycleInfo); + + + int affect = tricycleService.saveTricycleInfo(tricycleInfo); + if(affect > 0 ){ + log.info("/saveTricycleInfo（【三轮车】保存登记数据））接口数据返回,调用ip: {}, 出参:{}", request.getRemoteAddr(), tricycleInfo); + return ServerResponse.ok("登记信息数据提交成功"); + }else{ + return ServerResponse.error("新增/保存数据失败"); + } + } + + @GetMapping("/getTricycleInfoEnumType") + @ApiOperation(value = "获取登记页面数据字典") + public ServerResponse getTricycleInfoEnumType(HttpServletRequest request){ + + log.info("/getTricycleInfoEnumType（【三轮车】获取登记数据字典）接口被调用, 调用ip: {}", request.getRemoteAddr()); + Map> tricycleInfoEnumType = tricycleService.getTricycleInfoEnumType(); + + if(tricycleInfoEnumType.isEmpty()){ + return ServerResponse.error("获取字典数据失败"); + } + + log.info("/getTricycleInfoEnumType（【三轮车】获取登记数据字典）接口数据返回,调用ip: {}, 出参:{}", request.getRemoteAddr(), tricycleInfoEnumType); + return ServerResponse.ok(tricycleInfoEnumType); + } + + + /** + * 回显单条数据的详情信息 + * @param request + * @param id 主键ID + * @return + */ + @GetMapping("/getTricycleInfoBaseById") + @ApiOperation(value = "回显单条数据的详情信息") + public ServerResponse getTricycleInfoBaseById(HttpServletRequest request, + @RequestParam String id){ + + log.info("/getTricycleInfoById（【三轮车】回显单条数据的详情信息）接口被调用, 调用ip: {}", request.getRemoteAddr()); + ThtTricycleInfoBaseDTO tricycleInfoBaseById = tricycleService.getTricycleInfoBaseById(id); + + if(tricycleInfoBaseById == null){ + return ServerResponse.error("单条登记信息数据获取失败"); + } + + log.info("/getTricycleInfoById（【三轮车】回显单条数据的详情信息）接口数据返回,调用ip: {}, 出参:{}", request.getRemoteAddr(), tricycleInfoBaseById); + return ServerResponse.ok(tricycleInfoBaseById); + } + + + /** + * 获取预警处理列表 + * @param request + * @param nuserId + * @param distributionStatus + * @param completeStatus + * @return + */ + @GetMapping("/getTricycleWarningList") + @ApiOperation(value = "获取预警处理列表") + public ServerResponse getTricycleWarningList(HttpServletRequest request, + @RequestParam String nuserId, + @RequestParam String distributionStatus, // 分配状态 + @RequestParam String completeStatus // 完成状态 + ){ + log.info("/getTricycleWarningList（【三轮车】获取预警处理列表）接口被调用, 调用ip: {},入参:{}", request.getRemoteAddr(),nuserId); + int roleFlag = 0; + + // 权限判断 + Operator operatorById = operatorService.getOperatorById(nuserId); + String cdepartmentid = operatorById.getCdepartmentid(); + List roleById = operatorService.getRoleById(nuserId); + if (!roleById.isEmpty()) { + for (String role : roleById){ + if(RoleEnum.VILLAGE_CADRE.getName().equals(role)){ + roleFlag = 1; + break; + }else if(RoleEnum.TRICYCLE_SQUADRON_POLICE_OFFICERS.getName().equals(role)){ + roleFlag = 2; + break; + } + } + } else { + return ServerResponse.error("当前用户无权限"); + } + // 中队民警展示 未分配 未完成 状态的数据 + List tricycleWarningListList = tricycleService.getTricycleWarningList(roleFlag,distributionStatus,completeStatus); + + log.info("/getTricycleWarningList（【三轮车】获取预警处理列表）接口数据返回,调用ip: {}, 出参:{}", request.getRemoteAddr(), tricycleWarningListList); + return ServerResponse.ok(tricycleWarningListList); + } +} \ No newline at end of file diff --git a/hiatmp-hidden-danger-server/src/main/java/com/hisense/hiatmp/server_api/mapper/ConfigMapper.java b/hiatmp-hidden-danger-server/src/main/java/com/hisense/hiatmp/server_api/mapper/ConfigMapper.java index ecab6b4..01cfadb 100644 --- a/hiatmp-hidden-danger-server/src/main/java/com/hisense/hiatmp/server_api/mapper/ConfigMapper.java +++ b/hiatmp-hidden-danger-server/src/main/java/com/hisense/hiatmp/server_api/mapper/ConfigMapper.java @@ -12,12 +12,15 @@ import java.util.List; public interface ConfigMapper { List getModuleCustomConfigList(); - List getStreetCommunity(); StreetCommunity getStreetCommunityById(@Param("xqcode") String xqcode,@Param("jdcode") String jdcode); List getStreetCommunityByXq(String xqcode); + List getStreetCommunityByJd(String jdcode); + + StreetCommunity getStreetCommunityBySq(String sqcode); + List getDangerBaseData(@Param("sectionCode") String sectionCode,@Param("crossingCode") String crossingCode); } diff --git a/hiatmp-hidden-danger-server/src/main/java/com/hisense/hiatmp/server_api/mapper/EnumTypeMapper.java b/hiatmp-hidden-danger-server/src/main/java/com/hisense/hiatmp/server_api/mapper/EnumTypeMapper.java new file mode 100644 index 0000000..301181f --- /dev/null +++ b/hiatmp-hidden-danger-server/src/main/java/com/hisense/hiatmp/server_api/mapper/EnumTypeMapper.java @@ -0,0 +1,27 @@ +package com.hisense.hiatmp.server_api.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.hisense.hiatmp.model.dmr.EnumType; +import com.hisense.hiatmp.model.dmr.LineInfo; +import com.hisense.hiatmp.server_api.model.ModuleCustomConfig; +import com.hisense.hiatmp.server_api.model.StreetCommunity; +import io.lettuce.core.dynamic.annotation.Param; +import org.springframework.stereotype.Repository; + +import java.util.List; + +@Repository +public interface EnumTypeMapper extends BaseMapper { + + + List getVehicleTypeEnum(); + + List getVehicleColorEnum(); + + List getVehicleStatusEnum(); + + List getVehicleInsuranceEnum(); + + List getVehicleAuthorizedModelEnum(); + +} \ No newline at end of file diff --git a/hiatmp-hidden-danger-server/src/main/java/com/hisense/hiatmp/server_api/mapper/HighDangerMapper.java b/hiatmp-hidden-danger-server/src/main/java/com/hisense/hiatmp/server_api/mapper/HighDangerMapper.java index 9ede488..290b85c 100644 --- a/hiatmp-hidden-danger-server/src/main/java/com/hisense/hiatmp/server_api/mapper/HighDangerMapper.java +++ b/hiatmp-hidden-danger-server/src/main/java/com/hisense/hiatmp/server_api/mapper/HighDangerMapper.java @@ -49,7 +49,7 @@ public interface HighDangerMapper{ void insertTimeLineEndTime(String businessId); - HighDangerRoad getRoadInfo(String businessId); + HighDangerRoad getRoadInfo(String businessId,String ifCross); List getImportDanger(); diff --git a/hiatmp-hidden-danger-server/src/main/java/com/hisense/hiatmp/server_api/mapper/ThtTricycleInfoBaseMapper.java b/hiatmp-hidden-danger-server/src/main/java/com/hisense/hiatmp/server_api/mapper/ThtTricycleInfoBaseMapper.java new file mode 100644 index 0000000..4ef62cb --- /dev/null +++ b/hiatmp-hidden-danger-server/src/main/java/com/hisense/hiatmp/server_api/mapper/ThtTricycleInfoBaseMapper.java @@ -0,0 +1,25 @@ +package com.hisense.hiatmp.server_api.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.hisense.hiatmp.model.common.DTO.ThtTricycleInfoBaseDTO; +import com.hisense.hiatmp.model.common.VO.TricycleListVO; +import com.hisense.hiatmp.model.common.VO.TricycleWarningListVO; +import com.hisense.hiatmp.model.dmr.LineInfo; +import com.hisense.hiatmp.server_api.model.ModuleCustomConfig; +import com.hisense.hiatmp.server_api.model.StreetCommunity; +import io.lettuce.core.dynamic.annotation.Param; +import org.apache.ibatis.annotations.Select; +import org.springframework.stereotype.Repository; + +import java.util.List; + +@Repository +public interface ThtTricycleInfoBaseMapper extends BaseMapper { + + List getTricycleList(@Param("roleFlag") int roleFlag,@Param("cdepartmentid") String cdepartmentid,@Param("status") String status,@Param("search") String search); + + List getTricycleWarningList(@Param("roleFlag") int roleFlag, @Param("distributionStatus") String distributionStatus, @Param("completeStatus") String completeStatus); +// int saveTricycleInfo(ThtTricycleInfoBaseDTO infoBaseDTO); + + ThtTricycleInfoBaseDTO getTricycleInfoBaseById(String vehicleId); +} diff --git a/hiatmp-hidden-danger-server/src/main/java/com/hisense/hiatmp/server_api/mapper/ThtTricycleWarningBaseMapper.java b/hiatmp-hidden-danger-server/src/main/java/com/hisense/hiatmp/server_api/mapper/ThtTricycleWarningBaseMapper.java new file mode 100644 index 0000000..46fd183 --- /dev/null +++ b/hiatmp-hidden-danger-server/src/main/java/com/hisense/hiatmp/server_api/mapper/ThtTricycleWarningBaseMapper.java @@ -0,0 +1,14 @@ +package com.hisense.hiatmp.server_api.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.hisense.hiatmp.model.common.DTO.ThtTricycleWarningBaseDTO; +import com.hisense.hiatmp.model.common.VO.TricycleWarningListVO; +import org.springframework.stereotype.Repository; + +@Repository +public interface ThtTricycleWarningBaseMapper extends BaseMapper { + + TricycleWarningListVO getTricycleWarningList(); + + +} diff --git a/hiatmp-hidden-danger-server/src/main/java/com/hisense/hiatmp/server_api/service/IConfigService.java b/hiatmp-hidden-danger-server/src/main/java/com/hisense/hiatmp/server_api/service/IConfigService.java index d67de0a..d556b43 100644 --- a/hiatmp-hidden-danger-server/src/main/java/com/hisense/hiatmp/server_api/service/IConfigService.java +++ b/hiatmp-hidden-danger-server/src/main/java/com/hisense/hiatmp/server_api/service/IConfigService.java @@ -17,5 +17,7 @@ public interface IConfigService { List getStreetCommunityByXq(String xqcode); + List getStreetCommunityByJd(String jdcode); + List getDangerBaseData(String sectionCode,String crossingCode); } \ No newline at end of file diff --git a/hiatmp-hidden-danger-server/src/main/java/com/hisense/hiatmp/server_api/service/OperatorService.java b/hiatmp-hidden-danger-server/src/main/java/com/hisense/hiatmp/server_api/service/OperatorService.java index 63fee62..33755e2 100644 --- a/hiatmp-hidden-danger-server/src/main/java/com/hisense/hiatmp/server_api/service/OperatorService.java +++ b/hiatmp-hidden-danger-server/src/main/java/com/hisense/hiatmp/server_api/service/OperatorService.java @@ -3,8 +3,12 @@ package com.hisense.hiatmp.server_api.service; import com.hisense.hiatmp.model.common.Operator; import org.springframework.stereotype.Service; +import java.util.List; + @Service public interface OperatorService { public Operator getOperatorById(String nuserid); + + List getRoleById(String nuserid); } diff --git a/hiatmp-hidden-danger-server/src/main/java/com/hisense/hiatmp/server_api/service/TricycleService.java b/hiatmp-hidden-danger-server/src/main/java/com/hisense/hiatmp/server_api/service/TricycleService.java new file mode 100644 index 0000000..8403588 --- /dev/null +++ b/hiatmp-hidden-danger-server/src/main/java/com/hisense/hiatmp/server_api/service/TricycleService.java @@ -0,0 +1,26 @@ +package com.hisense.hiatmp.server_api.service; + +import com.hisense.hiatmp.model.common.DTO.ThtTricycleInfoBaseDTO; +import com.hisense.hiatmp.model.common.VO.TricycleListVO; +import com.hisense.hiatmp.model.common.VO.TricycleWarningListVO; +import com.hisense.hiatmp.model.dmr.EnumType; + +import java.util.List; +import java.util.Map; + +public interface TricycleService { + + List getTricycleList(int roleFlag,String cdepartmentid,String status,String search); + + List getTricycleWarningList(int roleFlag, String distributionStatus, String completeStatus); + + int saveTricycleInfo(ThtTricycleInfoBaseDTO infoBaseDTO); + + Map> getTricycleInfoEnumType(); + + ThtTricycleInfoBaseDTO getTricycleInfoBaseById(String id); + + + + +} diff --git a/hiatmp-hidden-danger-server/src/main/java/com/hisense/hiatmp/server_api/service/impl/ConfigServiceImpl.java b/hiatmp-hidden-danger-server/src/main/java/com/hisense/hiatmp/server_api/service/impl/ConfigServiceImpl.java index ef86c6b..157507f 100644 --- a/hiatmp-hidden-danger-server/src/main/java/com/hisense/hiatmp/server_api/service/impl/ConfigServiceImpl.java +++ b/hiatmp-hidden-danger-server/src/main/java/com/hisense/hiatmp/server_api/service/impl/ConfigServiceImpl.java @@ -32,10 +32,14 @@ public class ConfigServiceImpl implements IConfigService { return configMapper.getStreetCommunityById(xqcode,jdcode); } -public List getStreetCommunityByXq(String xqcode) { + public List getStreetCommunityByXq(String xqcode) { return configMapper.getStreetCommunityByXq(xqcode); } + public List getStreetCommunityByJd(String jdcode) { + return configMapper.getStreetCommunityByJd(jdcode); + } + @Override public List getDangerBaseData(String sectionCode,String crossingCode) { diff --git a/hiatmp-hidden-danger-server/src/main/java/com/hisense/hiatmp/server_api/service/impl/OperatorServiceImpl.java b/hiatmp-hidden-danger-server/src/main/java/com/hisense/hiatmp/server_api/service/impl/OperatorServiceImpl.java index 262c672..1badc37 100644 --- a/hiatmp-hidden-danger-server/src/main/java/com/hisense/hiatmp/server_api/service/impl/OperatorServiceImpl.java +++ b/hiatmp-hidden-danger-server/src/main/java/com/hisense/hiatmp/server_api/service/impl/OperatorServiceImpl.java @@ -6,6 +6,9 @@ import com.hisense.hiatmp.model.common.Operator; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import java.util.Collections; +import java.util.List; + @Service public class OperatorServiceImpl implements OperatorService { @@ -16,4 +19,9 @@ public class OperatorServiceImpl implements OperatorService { public Operator getOperatorById(String nuserid) { return operatorMapper.getOperatorById(nuserid); } + + @Override + public List getRoleById(String nuserid) { + return operatorMapper.getRoleById(nuserid); + } } diff --git a/hiatmp-hidden-danger-server/src/main/java/com/hisense/hiatmp/server_api/service/impl/TricycleServiceImpl.java b/hiatmp-hidden-danger-server/src/main/java/com/hisense/hiatmp/server_api/service/impl/TricycleServiceImpl.java new file mode 100644 index 0000000..5a0f2d1 --- /dev/null +++ b/hiatmp-hidden-danger-server/src/main/java/com/hisense/hiatmp/server_api/service/impl/TricycleServiceImpl.java @@ -0,0 +1,131 @@ +package com.hisense.hiatmp.server_api.service.impl; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; +import com.hisense.hiatmp.model.common.DTO.ThtTricycleInfoBaseDTO; +import com.hisense.hiatmp.model.common.VO.TricycleListVO; +import com.hisense.hiatmp.model.common.VO.TricycleWarningListVO; +import com.hisense.hiatmp.model.dmr.EnumType; +import com.hisense.hiatmp.server_api.mapper.ConfigMapper; +import com.hisense.hiatmp.server_api.mapper.EnumTypeMapper; +import com.hisense.hiatmp.server_api.mapper.ThtTricycleInfoBaseMapper; +import com.hisense.hiatmp.server_api.mapper.ThtTricycleWarningBaseMapper; +import com.hisense.hiatmp.server_api.model.StreetCommunity; +import com.hisense.hiatmp.server_api.service.TricycleService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.time.LocalDate; +import java.time.format.DateTimeFormatter; +import java.util.*; + +/* + * Created by liuhao on 2019/3/29. + * 三轮车相关的Service实现 + * + * @author liuhao + * @date 2019/3/29 10:25 + * @since 1.0.0 + */ +@Service +public class TricycleServiceImpl implements TricycleService { + + @Autowired + ThtTricycleInfoBaseMapper tricycleInfoBaseMapper; + + @Autowired + ConfigMapper configMapper; + + @Autowired + EnumTypeMapper enumTypeMapper; + + @Autowired + ThtTricycleWarningBaseMapper warningBaseMapper; + + @Override + public List getTricycleList(int roleFlag,String cdepartmentid,String stauts,String search) { + List tricycleList = tricycleInfoBaseMapper.getTricycleList(roleFlag, cdepartmentid,stauts,search); + + for (int i = 0; i < tricycleList.size(); i++) { + String villageCommunity = tricycleList.get(i).getVillageCommunity(); + StreetCommunity streetCommunityBySq = configMapper.getStreetCommunityBySq(villageCommunity); + if(streetCommunityBySq == null){ + continue; + } + tricycleList.get(i).setVillageCommunity(streetCommunityBySq.getSqname()); + tricycleList.get(i).setStreetCommunity(streetCommunityBySq.getJdname()); + } + + return tricycleList; + } + + + @Override + public List getTricycleWarningList(int roleFlag, String distributionStatus, String completeStatus) { + + warningBaseMapper.getTricycleWarningList(); + +// List tricycleList = tricycleInfoBaseMapper.getTricycleList(roleFlag, cdepartmentid,stauts); +// +// for (int i = 0; i < tricycleList.size(); i++) { +// String villageCommunity = tricycleList.get(i).getVillageCommunity(); +// StreetCommunity streetCommunityBySq = configMapper.getStreetCommunityBySq(villageCommunity); +// if(streetCommunityBySq == null){ +// continue; +// } +// tricycleList.get(i).setVillageCommunity(streetCommunityBySq.getSqname()); +// tricycleList.get(i).setStreetCommunity(streetCommunityBySq.getJdname()); +// } + + return null; + } + + @Override + public int saveTricycleInfo(ThtTricycleInfoBaseDTO infoBaseDTO) { + + + ThtTricycleInfoBaseDTO tricycleInfoBaseById = tricycleInfoBaseMapper.getTricycleInfoBaseById(infoBaseDTO.getVehicleId()); + if(tricycleInfoBaseById != null) { + infoBaseDTO.setStatus("1"); + UpdateWrapper updateWrapper = new UpdateWrapper<>(); + updateWrapper.eq("vehicle_id", infoBaseDTO.getVehicleId()); +// ThtTricycleInfoBaseDTO thtTricycleInfoBaseDTO = tricycleInfoBaseMapper.selectOne(new QueryWrapper().lambda().eq(ThtTricycleInfoBaseDTO::getVehicleId,infoBaseDTO.getVehicleId())); + return tricycleInfoBaseMapper.update(infoBaseDTO,updateWrapper); + } + DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyyMMdd"); + Random random = new Random(); + int i = random.nextInt(90000) + 10000; + String vehicleId = "DJ" + LocalDate.now().format(formatter) + i; + + infoBaseDTO.setVehicleId(vehicleId); +// if(infoBaseDTO.getVehicleLicense()) + UUID uuid = UUID.fromString(UUID.randomUUID().toString()); + String id = uuid.toString().replaceAll("-", ""); + infoBaseDTO.setId(id); + infoBaseDTO.setStatus("1"); + return tricycleInfoBaseMapper.insert(infoBaseDTO); + } + + @Override + public Map> getTricycleInfoEnumType() { + Map> enumMap = new HashMap<>(); + List vehicleTypeEnum = enumTypeMapper.getVehicleTypeEnum(); + List vehicleColorEnum = enumTypeMapper.getVehicleColorEnum(); + List getVehicleStatusEnum = enumTypeMapper.getVehicleStatusEnum(); + List getVehicleInsuranceEnum = enumTypeMapper.getVehicleInsuranceEnum(); + List getVehicleAuthorizedModelEnum = enumTypeMapper.getVehicleAuthorizedModelEnum(); + + enumMap.put("vehicleTypeEnum",vehicleTypeEnum); + enumMap.put("vehicleColorEnum",vehicleColorEnum); + enumMap.put("getVehicleStatusEnum",getVehicleStatusEnum); + enumMap.put("getVehicleInsuranceEnum",getVehicleInsuranceEnum); + enumMap.put("getVehicleAuthorizedModelEnum",getVehicleAuthorizedModelEnum); + + return enumMap; + } + + @Override + public ThtTricycleInfoBaseDTO getTricycleInfoBaseById(String id) { + return tricycleInfoBaseMapper.selectById(id); + } +} diff --git a/hiatmp-hidden-danger-server/src/main/resources/sql-mapper/ConfigMapper.xml b/hiatmp-hidden-danger-server/src/main/resources/sql-mapper/ConfigMapper.xml index ba6cd1c..fc73ed8 100644 --- a/hiatmp-hidden-danger-server/src/main/resources/sql-mapper/ConfigMapper.xml +++ b/hiatmp-hidden-danger-server/src/main/resources/sql-mapper/ConfigMapper.xml @@ -27,7 +27,27 @@ + + + + + SELECT x.* FROM public.enum_type x + WHERE enumtypeid ='13004' and enumname like '%三%' order by enumname + + + + + + + + + + + + \ No newline at end of file diff --git a/hiatmp-hidden-danger-server/src/main/resources/sql-mapper/HighDangerMapper.xml b/hiatmp-hidden-danger-server/src/main/resources/sql-mapper/HighDangerMapper.xml index bad7e8d..9a64370 100644 --- a/hiatmp-hidden-danger-server/src/main/resources/sql-mapper/HighDangerMapper.xml +++ b/hiatmp-hidden-danger-server/src/main/resources/sql-mapper/HighDangerMapper.xml @@ -53,16 +53,18 @@ section_code, pc_count, if_cross, - last_mod_date, - cross_code + cross_code, + belong_xq, + last_mod_date ) values (#{nid}, #{businessId}, #{sectionCode}, #{pcCount}, #{ifCross}, - NOW(), - #{crossCode} + #{crossCode}, + #{belongXq}, + NOW() ) @@ -178,6 +180,9 @@ AND hdb.status IN ( '0', '10' ) AND COALESCE ( hdb.approve_status, '0' ) IN ( '0', '-1' ) AND hdr.nid IS NOT NULL + + AND hdr.belong_xq like concat(concat(#{cdepartmentid}::text,'%')) + ) t1 ORDER BY time_status ASC, @@ -252,6 +257,9 @@ AND hdb.status IN ( '20' ) AND COALESCE ( hdb.approve_status, '0' ) IN ( '0', '-1' ) AND hdr.nid IS NOT NULL + + AND hdr.belong_xq like concat(concat(#{cdepartmentid}::text,'%')) + ) t1 ORDER BY time_status ASC, @@ -664,7 +672,14 @@ - insert into tht_section_info + insert into tht_section_info( + "NID", + "BUSINESS_ID", + "ROAD_TYPE", + "ROAD_WIDTH", + "LANE_COUNT", + "ROAD_STRUCTURE", + "SIDE_PROTEC", + "CENTER_SEPARATE", + "DESIGN_SPEED", + "LIMIT_SPEED", + "SECTION_CODE", + "ROAD_CODE" + ) values (nextval('test_id_seq'), #{businessId}, #{roadType}, @@ -793,7 +821,6 @@ ); - update tht_section_info set "ROAD_TYPE" = #{roadType}, diff --git a/hiatmp-hidden-danger-server/src/main/resources/sql-mapper/OperatorMapper.xml b/hiatmp-hidden-danger-server/src/main/resources/sql-mapper/OperatorMapper.xml index 1d71ab0..c5bc434 100644 --- a/hiatmp-hidden-danger-server/src/main/resources/sql-mapper/OperatorMapper.xml +++ b/hiatmp-hidden-danger-server/src/main/resources/sql-mapper/OperatorMapper.xml @@ -106,7 +106,7 @@ AND ta.operate_content = '0' AND ta.status IN ( '10', '0' ) - AND hdr.belong_xq like concat(concat(#{cdepartmentid}::text,'%')) + AND hdr.belong_xq like concat(concat(#{departmentid}::text,'%')) ) AND hdr.nid IS NOT NULL @@ -183,7 +183,7 @@ AND hdb.business_id IN ( SELECT ta.business_id FROM tht_approve ta WHERE ta.OPERATOR =#{nuserid} AND ta.operate_content = '0' AND ta.status = '20' ) AND hdr.nid IS NOT NULL - AND hdr.belong_xq like concat(concat(#{cdepartmentid}::text,'%')) + AND hdr.belong_xq like concat(concat(#{departmentid}::text,'%')) ) t1 ORDER BY @@ -238,7 +238,7 @@ AND ta.operate_content IN ( '-1', '1', '2' ) AND ta.status IN ( '10', '0', '20', '30', '40', '50', '60' ) - AND hdr.belong_xq like concat(concat(#{cdepartmentid}::text,'%')) + AND hdr.belong_xq like concat(concat(#{departmentid}::text,'%')) ) AND hdr.nid IS NOT NULL diff --git a/hiatmp-hidden-danger-server/src/main/resources/sql-mapper/ThtTricycleInfoBaseMapper.xml b/hiatmp-hidden-danger-server/src/main/resources/sql-mapper/ThtTricycleInfoBaseMapper.xml new file mode 100644 index 0000000..8cf0b26 --- /dev/null +++ b/hiatmp-hidden-danger-server/src/main/resources/sql-mapper/ThtTricycleInfoBaseMapper.xml @@ -0,0 +1,34 @@ + + + + + + + + + + \ No newline at end of file diff --git a/hiatmp-hidden-danger-server/src/main/resources/sql-mapper/ThtTricycleWarningBaseMapper.xml b/hiatmp-hidden-danger-server/src/main/resources/sql-mapper/ThtTricycleWarningBaseMapper.xml new file mode 100644 index 0000000..c0f8b7e --- /dev/null +++ b/hiatmp-hidden-danger-server/src/main/resources/sql-mapper/ThtTricycleWarningBaseMapper.xml @@ -0,0 +1,30 @@ + + + + + + + + + \ No newline at end of file diff --git a/hiatmp-model/pom.xml b/hiatmp-model/pom.xml index 211b942..4e5214e 100644 --- a/hiatmp-model/pom.xml +++ b/hiatmp-model/pom.xml @@ -57,5 +57,9 @@ commons-io 1.2 + + org.apache.poi + poi + \ No newline at end of file diff --git a/hiatmp-model/src/main/java/com/hisense/hiatmp/model/common/DTO/ThtTricycleInfoBaseDTO.java b/hiatmp-model/src/main/java/com/hisense/hiatmp/model/common/DTO/ThtTricycleInfoBaseDTO.java new file mode 100644 index 0000000..0466cee --- /dev/null +++ b/hiatmp-model/src/main/java/com/hisense/hiatmp/model/common/DTO/ThtTricycleInfoBaseDTO.java @@ -0,0 +1,145 @@ +package com.hisense.hiatmp.model.common.DTO; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.io.Serializable; +import java.util.Date; + +/** + * @description tht_tricycle_info_base + * @author BEJSON + * @date 2024-09-03 + */ +@Data +@TableName("tht_tricycle_info_base") +public class ThtTricycleInfoBaseDTO implements Serializable { + + private static final long serialVersionUID = 1L; + +// @TableId(type = IdType.AUTO) + /** + * nid + */ + private String id; + + /** + * vehicle_license + */ + private String vehicleLicense; + + /** + * vehicle_color + */ + private String vehicleColor; + + /** + * vahicle_brand + */ + private String vehicleBrand; + + /** + * vin + */ + private String vin; + + /** + * vehicle_insurance + */ + private String vehicleInsurance; + + /** + * vehicle_status + */ + private String vehicleStatus; + + /** + * driver_name + */ + private String driverName; + + /** + * driver_id_number + */ + private String driverIdNumber; + + /** + * driver_phone + */ + private String driverPhone; + + /** + * driver_address + */ + private String driverAddress; + + /** + * driver_authorized_model + */ + private String driverAuthorizedModel; + + /** + * street_community + */ + private String streetCommunity; + + /** + * village_community + */ + private String villageCommunity; + + /** + * community_cadre + */ + private String communityCadre; + + /** + * community_cadre_phone + */ + private String communityCadrePhone; + + /** + * insert_personnel + */ + private String insertPersonnel; + + /** + * insert_time + */ + private Date insertTime; + + /** + * register_status + */ + private String registerStatus; + + /** + * cadre_driver_img + */ + private String cadreDriverImg; + + /** + * guarantee_img + */ + private String guaranteeImg; + + /** + * driving_img + */ + private String drivingImg; + + /** + * driver_img + */ + private String driverImg; + + private String status; + + private String vehicleId; + + private String vehicleType; + + public ThtTricycleInfoBaseDTO() {} +} \ No newline at end of file diff --git a/hiatmp-model/src/main/java/com/hisense/hiatmp/model/common/DTO/ThtTricycleWarningBaseDTO.java b/hiatmp-model/src/main/java/com/hisense/hiatmp/model/common/DTO/ThtTricycleWarningBaseDTO.java new file mode 100644 index 0000000..fcc70e8 --- /dev/null +++ b/hiatmp-model/src/main/java/com/hisense/hiatmp/model/common/DTO/ThtTricycleWarningBaseDTO.java @@ -0,0 +1,78 @@ +package com.hisense.hiatmp.model.common.DTO; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; +import org.apache.poi.hpsf.Date; + +import java.io.Serializable; + +/** + * @description tht_tricycle_warning_processing_base + * @author BEJSON + * @date 2024-09-05 + */ +@Data +@TableName("tht_tricycle_warning_base") +public class ThtTricycleWarningBaseDTO implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId(type = IdType.AUTO) + /** + * nid + */ + private String nid; + + /** + * warning_id + */ + private String warningId; + + /** + * vehicle_license + */ + private String vehicleLicense; + + /** + * problem_description + */ + private String problemDescription; + + /** + * illegal_activities + */ + private String illegalActivities; + + /** + * driver_name + */ + private String driverName; + + /** + * warning_time + */ + private Date warningTime; + + /** + * Illegal_img + */ + private String illegalImg; + + /** + * distribution_community + */ + private String distributionCommunity; + + /** + * processing_records_id + */ + private String processingRecordsId; + + /** + * status + */ + private String status; + +} \ No newline at end of file diff --git a/hiatmp-model/src/main/java/com/hisense/hiatmp/model/common/VO/TricycleInfoEnumTypeVO.java b/hiatmp-model/src/main/java/com/hisense/hiatmp/model/common/VO/TricycleInfoEnumTypeVO.java new file mode 100644 index 0000000..d8fc74a --- /dev/null +++ b/hiatmp-model/src/main/java/com/hisense/hiatmp/model/common/VO/TricycleInfoEnumTypeVO.java @@ -0,0 +1,14 @@ +package com.hisense.hiatmp.model.common.VO; + +import com.hisense.hiatmp.model.dmr.EnumType; +import lombok.Data; + +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; + +@Data +public class TricycleInfoEnumTypeVO { + + List enumTypes; +} diff --git a/hiatmp-model/src/main/java/com/hisense/hiatmp/model/common/VO/TricycleListVO.java b/hiatmp-model/src/main/java/com/hisense/hiatmp/model/common/VO/TricycleListVO.java new file mode 100644 index 0000000..a55d98c --- /dev/null +++ b/hiatmp-model/src/main/java/com/hisense/hiatmp/model/common/VO/TricycleListVO.java @@ -0,0 +1,24 @@ +package com.hisense.hiatmp.model.common.VO; + +import lombok.Data; +/* + 三轮车模块列表展示 + */ +@Data +public class TricycleListVO { + + // 主键 + private String id; + // 驾驶号牌 + private String vehicleLicense; + // 驾驶人姓名 + private String driverName; + // 车辆类型 + private String vehicleType; + // 村社区 + private String villageCommunity; + // 镇街道 + private String streetCommunity; + + private String vehicleId; +} diff --git a/hiatmp-model/src/main/java/com/hisense/hiatmp/model/common/VO/TricycleWarningListVO.java b/hiatmp-model/src/main/java/com/hisense/hiatmp/model/common/VO/TricycleWarningListVO.java new file mode 100644 index 0000000..da9de60 --- /dev/null +++ b/hiatmp-model/src/main/java/com/hisense/hiatmp/model/common/VO/TricycleWarningListVO.java @@ -0,0 +1,25 @@ +package com.hisense.hiatmp.model.common.VO; + +import lombok.Data; + +import java.util.Date; + +/* + 三轮车模块列表展示 + */ +@Data +public class TricycleWarningListVO { + + // 主键 + private String id; + // 驾驶号牌 + private String vehicleLicense; + // 驾驶人姓名 + private String driverName; + // 预警ID + private String warningId; + // 违法行为 + private String illegalActivities; + // 预警时间 + private Date warningTime; +} diff --git a/hiatmp-model/src/main/java/com/hisense/hiatmp/model/common/enums/RoleEnum.java b/hiatmp-model/src/main/java/com/hisense/hiatmp/model/common/enums/RoleEnum.java new file mode 100644 index 0000000..7693bef --- /dev/null +++ b/hiatmp-model/src/main/java/com/hisense/hiatmp/model/common/enums/RoleEnum.java @@ -0,0 +1,19 @@ +package com.hisense.hiatmp.model.common.enums; + +public enum RoleEnum { + + VILLAGE_CADRE("村干部农三轮"), + TRICYCLE_SQUADRON_POLICE_OFFICERS("中队民警农三轮") + ; + + private String name; + + + RoleEnum(String roleEnum) { + this.name = roleEnum; + } + + public String getName() { + return name; + } +}