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 adc0944..1feb014 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 @@ -6,11 +6,13 @@ import com.hisense.hiatmp.server_api.model.StreetCommunity; import com.hisense.hiatmp.server_api.service.IConfigService; import com.hisense.hiatmp.common.controller.HiatmpController; import com.hisense.hiatmp.model.common.ServerResponse; +import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; import java.util.List; +@Slf4j @RestController @RequestMapping(value = "/config") public class ConfigController extends HiatmpController { @@ -57,8 +59,10 @@ public class ConfigController extends HiatmpController { */ @GetMapping("/getDangerBaseData") public ServerResponse getBaseData(@RequestParam String sectionCode){ + log.info("/getDangerBaseData（排查第一页默认数据回显）接口被调用,调用ip: {}, 入参:{}", request.getRemoteAddr(),sectionCode); // 查询默认数据 LineInfo dangerBaseData = configService.getDangerBaseData(sectionCode); + log.info("/getDangerBaseData（排查第一页默认数据回显）接口被调用,调用ip: {}, 入参:{}", request.getRemoteAddr(),sectionCode); return ServerResponse.ok(dangerBaseData); } } \ No newline at end of file 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 c8f035e..4416b63 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 @@ -53,16 +53,16 @@ public class HighDangerController { @Autowired ConfigureMapper configureMapper; - @Value("${spring.ftp.username}") //用户名 + @Value("${spring.ftp.username}") //用户名 private String userName; - @Value("${spring.ftp.password}") //密码 + @Value("${spring.ftp.password}") //密码 private String passWord; - @Value("${spring.ftp.host}") //ip地址 + @Value("${spring.ftp.host}") //ip地址 private String ip; - @Value("${spring.ftp.port}") //端口号 + @Value("${spring.ftp.port}") //端口号 private int port; @Value("${spring.ftp.currentdir}") @@ -73,7 +73,7 @@ public class HighDangerController { */ @Transactional @GetMapping("/insertDangerTest") - public ServerResponse insertDanger(@RequestParam String name){ + public ServerResponse insertDanger(@RequestParam String name) { HighDangerBase highDangerBase = new HighDangerBase(); HighDangerRoad highDangerRoad = new HighDangerRoad(); @@ -118,7 +118,11 @@ public class HighDangerController { return ServerResponse.error("未找到当前用户"); } - List statusCounts = highDangerMapper.getStatusCounts(cdepartmentid); + // 取部门的前六位 + String firstSixChars = cdepartmentid.substring(0, Math.min(cdepartmentid.length(), 6)); + log.info("部门前6位为:{}",firstSixChars); + + List statusCounts = highDangerMapper.getStatusCounts(firstSixChars, nuserid); log.info("/getHighDangerStatusNum（查询各个状态的数据情况）接口数据返回,调用ip: {}, 出参:{}", request.getRemoteAddr(), statusCounts); return ServerResponse.ok(statusCounts); @@ -132,12 +136,12 @@ public class HighDangerController { @RequestParam(defaultValue = "1") Integer pageNum, @RequestParam(defaultValue = "10") Integer pageSize, @RequestParam(defaultValue = "") String search, - @RequestParam(defaultValue = "") String reportDept, + @RequestParam(defaultValue = "") String classification, // 1 已完成 2 个人上报 3 系统下发 HttpServletRequest request ) { log.info("/getHigDangerDealt（查询首页各个状态的数据列表）接口被调用,调用ip: {}, 入参:{},{},{},{}", request.getRemoteAddr(), highDangerBaseVO, pageNum, pageSize, search); String cdepartmentid = null; - // 获取当前操作的对象，用于查找对应的部门 + // 获取当前操作的对象，用于查找对应的部 Operator operatorById = operatorMapper.getOperatorById(highDangerBaseVO.getNuserid()); if (operatorById != null) { cdepartmentid = operatorById.getCdepartmentid(); @@ -145,43 +149,58 @@ public class HighDangerController { return ServerResponse.error("未找到当前用户"); } - int termTime = Integer.parseInt(configureMapper.getTermTime()); + // 取部门的前六位 + String firstSixChars = cdepartmentid.substring(0, Math.min(cdepartmentid.length(), 6)); + + log.info("部门前六位:{}", firstSixChars); +// int termTime = Integer.parseInt(configureMapper.getTermTime()); //Page page = new Page<>(pageNum, pageSize); PageHelper.startPage(pageNum, pageSize); // 将要查询的状态和部门id查询数据库，获得隐患排查表 - List statusCounts = highDangerMapper.getHigDangerDealt(highDangerBaseVO.getStatus(), cdepartmentid, search,reportDept); + List statusCounts = highDangerMapper.getHigDangerDealt(highDangerBaseVO.getStatus(), firstSixChars, search, highDangerBaseVO.getNuserid(), classification); // 待办 /*if("20".equals(highDangerBaseVO.getStatus())){ List statusCount = highDangerMapper.getHigDangerDealt("99",cdepartmentid,page,"%" + search + "%"); statusCounts.addAll(statusCount); }*/ + // 遍历排查数据 + for (HighDangerBase base : statusCounts) { + + int delayHour = base.getDelayHour(); + int delayDay = base.getDelayDay(); + + int nearDay = base.getNearDay(); + int nearHour = base.getNearHour(); + + // 审批状态添加 + if(!Objects.equals(base.getApproveStatus(), "0") && !Objects.equals(base.getApproveStatus(), "-1")){ + base.setEnumname(base.getEnumname() + "(审批)"); + } - for (HighDangerBase base : statusCounts) { - if(base.getTimeStatus() == null || base.getTimeStatus().equals("9")){ + if (base.getTimeStatus() == null || base.getTimeStatus().equals("9")) { base.setDeadlineStatus("正常"); base.setDeadlineType("3"); } + // 超期 - if(Objects.equals(base.getTimeStatus(), "1")){ - - double timeDiffSeconds = Double.parseDouble(base.getTimeDiffEnd()); - // 计算天数 - int days = (int) (timeDiffSeconds / (24 * 3600)); -// 计算剩余的秒数 - int remainingSeconds = (int) (timeDiffSeconds % (24 * 3600)); -// 计算小时数 - int hours = remainingSeconds / 3600; - - if(days == 0){ - base.setDeadlineStatus("超期" + hours + "小时"); - }else if(hours == 0){ - base.setDeadlineStatus("超期" + days + "天"); - }else if(days == 0 && hours == 0){ - base.setDeadlineStatus("超期不足一小时"); - }else{ - base.setDeadlineStatus("超期" + days + "天" + hours + "小时"); + if (Objects.equals(base.getTimeStatus(), "1")) { +// // 获取相差的时间戳 +// double timeDiffSeconds = Double.parseDouble(base.getTimeDiffEnd()); +// // 计算天数 +// int days = (int)Math.floor(timeDiffSeconds / (24 * 3600)); +// // 计算秒数 +// double remainingSeconds = timeDiffSeconds % (24 * 3600); +// // 计算小时数 +// int hours = (int)Math.ceil(remainingSeconds / 3600); + + if (delayDay == 0) { + base.setDeadlineStatus("超期" + delayHour + "小时"); + } else if (delayHour == 0) { + base.setDeadlineStatus("超期" + delayDay + "天"); + } else { + base.setDeadlineStatus("超期" + delayDay + "天" + delayHour + "小时"); } base.setDeadlineType("1"); // System.out.println("时间差为 " + days + " 天 " + hours + " 小时"); @@ -224,29 +243,25 @@ public class HighDangerController { // base.setDeadlineType("1"); // continue; } - if(Objects.equals(base.getTimeStatus(), "2")){ - double timeDiffSeconds = Math.abs(Double.parseDouble(base.getTimeDiffStart())); - // 计算天数 - int days = (int) (timeDiffSeconds / (24 * 3600)); -// 计算剩余的秒数 - int remainingSeconds = (int) (timeDiffSeconds % (24 * 3600)); -// 计算小时数 - int hours = remainingSeconds / 3600; - - if(days == 0){ - base.setDeadlineStatus("临期" + hours + "小时"); - }else if(hours == 0){ - base.setDeadlineStatus("临期" + days + "天"); - }else if(days == 0 && hours == 0){ - base.setDeadlineStatus("临期不足一小时"); - }else{ - base.setDeadlineStatus("临期" + days + "天" + hours + "小时"); + if (Objects.equals(base.getTimeStatus(), "2")) { +// // 获取相差的时间戳 +// double timeDiffSeconds = Double.parseDouble(base.getTimeDiffStart()); +// // 计算天数 +// int days= (int)Math.floor(timeDiffSeconds / (24 * 3600)); +// // 计算秒数 +// double remainingSeconds = timeDiffSeconds % (24 * 3600); +// // 计算小时数 +// int hours = (int)Math.ceil(remainingSeconds / 3600); + + if (nearDay == 0) { + base.setDeadlineStatus("临期" + nearHour + "小时"); + } else if (nearHour == 0) { + base.setDeadlineStatus("临期" + nearDay + "天"); + } else { + base.setDeadlineStatus("临期" + nearDay + "天" + nearHour + "小时"); } base.setDeadlineType("2"); } - - -// // Date pcEndTime = base.getPcEndTime(); // Date pcStartTime = base.getPcStartTime(); // @@ -537,7 +552,7 @@ public class HighDangerController { pointMapSection.put("distance", (int) Math.ceil(minDistance)); pointMapSection.put("name", dto.getSectionName()); pointMapSection.put("position", pointList); - pointMapSection.put("sectionCode",dto.getSectionCode()); + pointMapSection.put("sectionCode", dto.getSectionCode()); pointMapSection.put("type", "1"); combinedMap.add(pointMapSection); @@ -578,7 +593,7 @@ public class HighDangerController { pointList.add(pointMap); pointMapCrossing.put("distance", (int) Math.ceil(pointDistance)); pointMapCrossing.put("position", pointList); - pointMapCrossing.put("sectionCode",cross.getCrossingCode()); + pointMapCrossing.put("sectionCode", cross.getCrossingCode()); pointMapCrossing.put("type", "2"); // map.put(pointDistance, cross.getLongitude() + "," + cross.getLatitude()); pointMapCrossing.put("name", cross.getCrossingName()); @@ -724,7 +739,7 @@ public class HighDangerController { int i = highDangerMapper.saveSection(sectionOrCrossAdd); if (i > 0) { assert roadInfo != null; - return ServerResponse.ok("道路新增成功","2079028191469929"); + return ServerResponse.ok("道路新增成功", "2079028191469929"); } else { return ServerResponse.error("道路新增失败"); } @@ -732,7 +747,7 @@ public class HighDangerController { int i = highDangerMapper.saveCrossing(sectionOrCrossAdd); if (i > 0) { assert roadInfo != null; - return ServerResponse.ok("道路新增成功","2079028191469929"); + return ServerResponse.ok("道路新增成功", "2079028191469929"); } else { return ServerResponse.error("道路新增失败"); } @@ -809,19 +824,19 @@ public class HighDangerController { // 用户数据查询，如果没有该用户数据则新增 List sectionInfo = highDangerMapper.getSectionInfo(businessId); // 用户数据查询是否为空 - if(sectionInfo.isEmpty()) { + if (sectionInfo.isEmpty()) { ManualInvestigation manualInvestigation = new ManualInvestigation(); manualInvestigation.setBusinessId(businessId); highDangerMapper.insertSectionInfo(manualInvestigation); List section = highDangerMapper.getSectionInfo(businessId); thtSectionInfoDTO = section.get(0); - }else{ + } else { thtSectionInfoDTO = sectionInfo.get(0); } // 是否该排查有绑定的辖区街道信息，有则展示 List communityByRoad = highDangerMapper.getCommunityByRoad(businessId); - if(communityByRoad == null || communityByRoad.isEmpty()){ + if (communityByRoad == null || communityByRoad.isEmpty()) { log.info("/getSectionInfo（获取基础数据（第一页））接口返回, 客户端ip: {}, 返回数据:{}", request.getRemoteAddr(), sectionInfo); return ServerResponse.ok(thtSectionInfoDTO); } @@ -956,16 +971,17 @@ public class HighDangerController { @Transactional @PostMapping("/saveManualInvestigation") public ServerResponse saveManualInvestigation(@RequestBody ManualInvestigation manualInvestigation, HttpServletRequest request) { - String ftpUrl = "ftp://"+userName+":"+passWord+"@"+ip+":"+port+CURRENT_DIR; + String ftpUrl = "ftp://" + userName + ":" + passWord + "@" + ip + ":" + port + CURRENT_DIR; log.info("/saveManualInvestigation（保存 & 暂存人工排查）接口被调用,调用ip: {}, 入参:{}", request.getRemoteAddr(), manualInvestigation); Date lastModDate = new Date(); manualInvestigation.setLastModeDate(lastModDate); // 保存轄區和街道 - highDangerMapper.updateSectionCommunity(manualInvestigation.getBusinessId(),manualInvestigation.getXqcode(),manualInvestigation.getJdcode()); + highDangerMapper.updateSectionCommunity(manualInvestigation.getBusinessId(), manualInvestigation.getXqcode(), manualInvestigation.getJdcode()); + // 第一页：基础数据 List sectionInfos = highDangerMapper.getSectionInfo(manualInvestigation.getBusinessId()); - ThtSectionInfoDTO sectionInfo = sectionInfos.get(0); + ThtSectionInfoDTO sectionInfo = sectionInfos.get(0); if (sectionInfo != null) { // 更新基础数据（步骤1） highDangerMapper.updateSectionInfo(manualInvestigation); @@ -1090,7 +1106,7 @@ public class HighDangerController { if (CollectionUtils.isNotEmpty(manualInvestigation.getDescribe())) { hdFlag = "1"; } - highDangerMapper.updateDangerRoad(hdFlag,manualInvestigation.getBusinessId(),pcCount); + highDangerMapper.updateDangerRoad(hdFlag, manualInvestigation.getBusinessId(), pcCount); ThtApprove thtAApprove = new ThtApprove(); UUID uuid = UUID.randomUUID(); String uuidString = uuid.toString().replace("-", ""); @@ -1124,14 +1140,13 @@ public class HighDangerController { } @GetMapping("/getRoadTypes") - public ServerResponse getRoadType(){ + public ServerResponse getRoadType() { List roadTypes = highDangerService.getRoadTypes(); return ServerResponse.ok(roadTypes); } - // 图片上传接口 /*@PostMapping("/uploadImage") public ServerResponse uploadImage(@RequestBody MultipartFile multipartFile) throws IOException { 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 f804fc0..745e049 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 @@ -18,10 +18,10 @@ public interface HighDangerMapper{ // String getHighDangerStatusNum(@Param("postId") String postId); // 主页获取各类型数据 - List getStatusCounts(String cdepartmentid); + List getStatusCounts(@Param("cdepartmentid") String cdepartmentid, @Param("nuserid") String nuserid); // - List getHigDangerDealt(String status, String cdepartmentid, String search,String reportDept); + List getHigDangerDealt(String status, String cdepartmentid, String search,String nuserId, String classification); List getHigDangerDying(String status, String cdepartmentid); diff --git a/hiatmp-hidden-danger-server/src/main/java/com/hisense/hiatmp/server_api/service/impl/HighDangerBaseServiceImpl.java b/hiatmp-hidden-danger-server/src/main/java/com/hisense/hiatmp/server_api/service/impl/HighDangerBaseServiceImpl.java index 1c8ffd7..6371b3d 100644 --- a/hiatmp-hidden-danger-server/src/main/java/com/hisense/hiatmp/server_api/service/impl/HighDangerBaseServiceImpl.java +++ b/hiatmp-hidden-danger-server/src/main/java/com/hisense/hiatmp/server_api/service/impl/HighDangerBaseServiceImpl.java @@ -335,7 +335,7 @@ public class HighDangerBaseServiceImpl implements HighDangerService { highDangerBase.setReportDept("370200000000"); highDangerBase.setHandleDept("370200000000"); highDangerBase.setDelayCount("0"); - highDangerBase.setDelayDay("0"); +// highDangerBase.setDelayDay("0"); highDangerBase.setPcCount("0"); highDangerMapper.insertDanger(highDangerBase); 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 8b5c8dd..07385ba 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 @@ -21,7 +21,9 @@ handle_dept, delay_count, delay_day, - pc_count) + pc_count, + last_mod_date + ) values (#{nid}, #{businessId}, #{name}, @@ -37,7 +39,9 @@ #{handleDept}, #{delayCount}, #{delayDay}, - #{pcCount}) + #{pcCount}, + NOW() + ) @@ -45,11 +49,15 @@ (nid, business_id, section_code, - pc_count) + pc_count, + last_mod_date + ) values (#{nid}, #{businessId}, #{sectionCode}, - #{pcCount}) + #{pcCount}, + NOW() + ) @@ -192,17 +198,22 @@ @@ -315,7 +344,6 @@ - insert into tht_hidden_danger_road (nid, business_id) - values (#{uuid}, #{businessId}) + insert into tht_hidden_danger_road (nid, business_id,last_mod_date) + values (#{uuid}, #{businessId},NOW()) UPDATE tht_hidden_danger_base - SET APPROVE_STATUS = 2 + SET APPROVE_STATUS = 2,last_mod_date = NOW() where business_id = #{businessId} RETURNING business_id; @@ -459,7 +490,8 @@ #{largeVehicleRate}, #{nonvehicleTraffic}, #{lastModeUser}, - #{lastModeDate}) + #{lastModeDate} + ) @@ -472,20 +504,20 @@ "LARGE_VEHICLE_RATE" = #{largeVehicleRate}, "NONVEHICLE_TRAFFIC" = #{nonvehicleTraffic}, "LAST_MOD_USER" = #{lastModeUser}, - "LAST_MOD_DATE" = #{lastModeDate} + "LAST_MOD_DATE" = NOW() where "BUSINESS_ID" = #{businessId} update tht_hidden_danger_base - set status = #{temporary} + set status = #{temporary},last_mod_date = NOW() where business_id = #{businessId} update tht_hidden_danger_road set hd_flag = #{hdFlag} - , pc_end_time = CURRENT_TIMESTAMP + , pc_end_time = CURRENT_TIMESTAMP,last_mod_date = NOW() where business_id = #{businessId} and pc_count = #{pcCount} @@ -497,15 +529,15 @@ INSERT INTO tht_hidden_danger_road_info (nid, business_id, big_category, small_category, hd_term, hd_desc, - pc_count, hd_pic, hd_info, pc_type) + pc_count, hd_pic, hd_info, pc_type, last_mod_date) VALUES (#{nid}, #{businessId}, #{bigCategory}, #{smallCategory}, #{hdTerm}, - #{hdDesc}, #{pcCount}, #{hdPic}, #{hdInfo}, #{pcType}) + #{hdDesc}, #{pcCount}, #{hdPic}, #{hdInfo}, #{pcType},NOW()) - insert into bis_road ("road_code", "road_name", "position") - values (#{roadCode}, #{roadName}, #{position}) + insert into bis_road ("road_code", "road_name", "position","last_mod_date") + values (#{roadCode}, #{roadName}, #{position},NOW()) @@ -573,14 +605,15 @@ update tht_hidden_danger_road - set pc_type = #{pcType} + set pc_type = #{pcType},last_mod_date = NOW() where business_id = #{businessId} update tht_hidden_danger_road set belong_xq = #{xqcode}, - xzjd = #{jdcode} + xzjd = #{jdcode}, + last_mod_date = NOW() where business_id = #{businessId} 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 2d6ce2d..eb6d111 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 @@ -10,9 +10,10 @@ update operator - set cuserpwd = #{cuserpwd} + set cuserpwd = #{cuserpwd},last_mod_date = NOW() where nuserid = #{nuserid} RETURNING nuserid; diff --git a/hiatmp-model/src/main/java/com/hisense/hiatmp/model/common/HighDangerBase.java b/hiatmp-model/src/main/java/com/hisense/hiatmp/model/common/HighDangerBase.java index 6b53aac..4e42330 100644 --- a/hiatmp-model/src/main/java/com/hisense/hiatmp/model/common/HighDangerBase.java +++ b/hiatmp-model/src/main/java/com/hisense/hiatmp/model/common/HighDangerBase.java @@ -125,11 +125,6 @@ public class HighDangerBase implements Serializable { */ private String delayCount; - /** - * delay_day - */ - private String delayDay; - /** * pc_count */ @@ -202,8 +197,14 @@ public class HighDangerBase implements Serializable { private String timeStatus; - private String timeDiffEnd; + private int delayDay; + + private int delayHour; + + private int nearDay; + + private int nearHour; - private String timeDiffStart; + private String enumname; } diff --git a/hiatmp-model/src/main/java/com/hisense/hiatmp/model/common/Operator.java b/hiatmp-model/src/main/java/com/hisense/hiatmp/model/common/Operator.java index b6b8007..4e1b518 100644 --- a/hiatmp-model/src/main/java/com/hisense/hiatmp/model/common/Operator.java +++ b/hiatmp-model/src/main/java/com/hisense/hiatmp/model/common/Operator.java @@ -25,6 +25,8 @@ public class Operator implements Serializable { // 部门 private String cdepartmentid; // 警号 - String policeid; + private String policeid; + + private String cdepartmentname; } diff --git a/hiatmp-model/target/classes/com/hisense/hiatmp/model/common/Operator.class b/hiatmp-model/target/classes/com/hisense/hiatmp/model/common/Operator.class index 1bc8c77..153c3f7 100644 Binary files a/hiatmp-model/target/classes/com/hisense/hiatmp/model/common/Operator.class and b/hiatmp-model/target/classes/com/hisense/hiatmp/model/common/Operator.class differ