diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..40c0ec2 --- /dev/null +++ b/.gitignore @@ -0,0 +1,12 @@ +# Default ignored files +/shelf/ +/workspace.xml +# Editor-based HTTP Client requests +/httpRequests/ +# Datasource local storage ignored files +/dataSources/ +/dataSources.local.xml +*.class +*.log + +!/.gitignore diff --git a/.idea/.gitignore b/.idea/.gitignore index 13566b8..88e6e9a 100644 --- a/.idea/.gitignore +++ b/.idea/.gitignore @@ -6,3 +6,6 @@ # Datasource local storage ignored files /dataSources/ /dataSources.local.xml +*.class +*.log +*.ignore \ No newline at end of file diff --git a/hiatmp-hidden-danger-server/src/main/java/com/hisense/hiatmp/server_api/controller/ApproveController.java b/hiatmp-hidden-danger-server/src/main/java/com/hisense/hiatmp/server_api/controller/ApproveController.java new file mode 100644 index 0000000..f4a4cfd --- /dev/null +++ b/hiatmp-hidden-danger-server/src/main/java/com/hisense/hiatmp/server_api/controller/ApproveController.java @@ -0,0 +1,25 @@ +package com.hisense.hiatmp.server_api.controller; + +import com.hisense.hiatmp.model.common.ServerResponse; +import com.hisense.hiatmp.model.common.VO.ThtApproveVO; +import com.hisense.hiatmp.server_api.service.ThtApproveService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +@RestController +@RequestMapping("/approve") +public class ApproveController { + + @Autowired + ThtApproveService thtApproveService; + + @PostMapping("/SubmitHigDangerApproval") + public ServerResponse SubmitHigDangerApproval(@RequestBody ThtApproveVO thtApproveVo){ + + int i = thtApproveService.SubmitHigDangerApproval(thtApproveVo); + return ServerResponse.ok("提交审批成功"); + } +} \ No newline at end of file diff --git a/hiatmp-hidden-danger-server/src/main/java/com/hisense/hiatmp/server_api/controller/GovernmentController.java b/hiatmp-hidden-danger-server/src/main/java/com/hisense/hiatmp/server_api/controller/GovernmentController.java new file mode 100644 index 0000000..8070d21 --- /dev/null +++ b/hiatmp-hidden-danger-server/src/main/java/com/hisense/hiatmp/server_api/controller/GovernmentController.java @@ -0,0 +1,119 @@ +package com.hisense.hiatmp.server_api.controller; + +import com.baomidou.mybatisplus.core.toolkit.StringUtils; +import com.hisense.hiatmp.model.common.*; +import com.hisense.hiatmp.model.common.VO.GovernmentVO; +import com.hisense.hiatmp.server_api.mapper.HighDangerMapper; +import com.hisense.hiatmp.server_api.service.GovernmentService; +import com.hisense.hiatmp.server_api.service.ThtAttachsService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Value; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import java.util.Date; +import java.util.UUID; + +@RestController +@RequestMapping("/government") +public class GovernmentController { + + @Value("${spring.ftp.username}") //用户名 + private String userName; + + @Value("${spring.ftp.password}") //密码 + private String passWord; + + @Value("${spring.ftp.host}") //ip地址 + private String ip; + + @Value("${spring.ftp.port}") //端口号 + private int port; + + @Value("${spring.ftp.currentdir}") + private String CURRENT_DIR; // 文件存放的目录 + + @Autowired + ThtAttachsService thtAttachsService; + + @Autowired + GovernmentService governmentService; + + @Autowired + HighDangerMapper highDangerMapper; + + @PostMapping("/saveGovernment") + public ServerResponse saveGovernment(@RequestBody GovernmentVO governmentVO){ + + String ftpUrl = "ftp://" + userName + ":" + passWord + "@" + ip + ":" + port + CURRENT_DIR; + String nid; + Date date = new Date(); + + HighDangerBase higDangerDetail = highDangerMapper.getHigDangerDetail(governmentVO.getBusinessId()); + String pcCount = higDangerDetail.getPcCount(); + // 隐患排查表--如果存在该记录则更新 +// highDangerMapper.deleteRoadInfo(governmentVO.getBusinessId()); + for (HiddenDangerDTO details : governmentVO.getDescribe()) { + // 随机生成UUID +// String uuidString = UUID.randomUUID().toString().replace("-", ""); +// details.setNid(uuidString); +// details.setBusinessId(hidden_businessId); +// details.setPcCount(manualInvestigation.getPcCount()); + +// ThtDangerItems dangerItemsById = highDangerMapper.getDangerItemsById(details.getHdTerm()); +// +// details.setSmallCategory(dangerItemsById.getParentid()); +// ThtDangerItems dangerItemsById_f = highDangerMapper.getDangerItemsById(dangerItemsById.getParentid()); +// +// details.setBigCategory(dangerItemsById_f.getParentid()); + // 保存重点排查数据 + governmentService.updateRoadInfo(details); + + // 治理图片 + if (StringUtils.isNotEmpty(details.getZlPic())) { + String hdPicArr[] = details.getZlPic().split(","); + for (String s : hdPicArr) { + nid = UUID.randomUUID().toString().replace("-", ""); +// nid = uuid.toString().replace("-", ""); + ThtAttachs thtAttachs = new ThtAttachs(); + String accachName = s.substring(s.lastIndexOf("/") + 1); + thtAttachs.setId(nid); + thtAttachs.setAttachUrl(ftpUrl + accachName); + thtAttachs.setAttachType("3"); + thtAttachs.setUploadTime(date); + thtAttachs.setInfoId(details.getNid()); + thtAttachs.setAttachName(accachName); + thtAttachs.setBusinessId(governmentVO.getBusinessId()); + thtAttachs.setPcCount(pcCount); + thtAttachs.setLastModDate(date); + thtAttachsService.saveAttachs(thtAttachs); + } + } + + // 治理措施 + if (StringUtils.isNotEmpty(details.getZlMeasure())) { + String hdPicArr[] = details.getZlMeasure().split(","); + for (String s : hdPicArr) { + nid = UUID.randomUUID().toString().replace("-", ""); +// nid = uuid.toString().replace("-", ""); + ThtAttachs thtAttachs = new ThtAttachs(); + String accachName = s.substring(s.lastIndexOf("/") + 1); + thtAttachs.setId(nid); + thtAttachs.setAttachUrl(ftpUrl + accachName); + thtAttachs.setAttachType("1"); + thtAttachs.setUploadTime(date); + thtAttachs.setInfoId(details.getNid()); + thtAttachs.setAttachName(accachName); + thtAttachs.setBusinessId(governmentVO.getBusinessId()); + thtAttachs.setPcCount(pcCount); + thtAttachs.setLastModDate(date); + thtAttachsService.saveAttachs(thtAttachs); + } + } + } + return ServerResponse.ok("治理提交成功"); + + } +} 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 94f7b2a..02ff5a5 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 @@ -5,6 +5,7 @@ import com.github.pagehelper.PageInfo; import com.hisense.hiatmp.model.common.*; import com.hisense.hiatmp.model.common.DTO.HiddenDangerVO; import com.hisense.hiatmp.model.common.DTO.SectionDTO; +import com.hisense.hiatmp.model.common.DTO.ThtTimeLineDTO; import com.hisense.hiatmp.model.common.VO.BasicInfoVO; import com.hisense.hiatmp.model.common.VO.SectionVO; import com.hisense.hiatmp.server_api.mapper.ConfigureMapper; @@ -27,6 +28,7 @@ import org.springframework.web.bind.annotation.*; import javax.servlet.http.HttpServletRequest; import java.math.BigDecimal; +import java.text.SimpleDateFormat; import java.util.*; @Slf4j @@ -450,8 +452,8 @@ public class HighDangerController { // 获取最近道路 @PostMapping("/getNearRoadInfo") public ServerResponse getNearRoad(@RequestBody Point point, - @RequestParam(defaultValue = "1") Long pageNum, - @RequestParam(defaultValue = "10") Long pageSize, + @RequestParam(defaultValue = "1") Integer pageNum, + @RequestParam(defaultValue = "10") Integer pageSize, HttpServletRequest request ) { log.info("/getNearRoadInfo（获取最近道路）接口被调用,调用ip: {}, 入参:{},{},{}", request.getRemoteAddr(), point, pageNum, pageSize); @@ -611,13 +613,20 @@ public class HighDangerController { } }); + int startIdx = (pageNum - 1) * pageSize; + int endIdx = Math.min(startIdx + pageSize, combinedMap.size()); + + List> pageData = combinedMap.subList(startIdx, endIdx); + +// PageHelper.startPage(pageNum, pageSize); // hashMap.put("businessId",combinedMap); hashMap.put("params", combinedMap); log.info("/getNearRoadInfo（获取最近道路）接口返回, 客户端ip: {}, 返回数据:{}", request.getRemoteAddr(), combinedMap); +// PageInfo> pageInfo = new PageInfo<>(combinedMap); - return ServerResponse.ok(combinedMap); + return ServerResponse.ok(pageData); } /* @@ -633,14 +642,26 @@ public class HighDangerController { // 查询当前排查所在路段 @GetMapping("/getDangerRoad") - public ServerResponse getDangerRoad(@RequestParam String businessId, HttpServletRequest request) { + public ServerResponse getDangerRoad(@RequestParam String businessId, + @RequestParam String ifCross, + HttpServletRequest request) { + SectionDTO sectionByCode; log.info("/getDangerRoad（查询当前排查所在路段）接口被调用,调用ip: {}, 入参:{}", request.getRemoteAddr(), businessId); HighDangerRoad roadInfo = highDangerMapper.getRoadInfo(businessId); roadInfo.setDeptId(operatorMapper.getOperatorById(roadInfo.getOperator()).getCdepartmentid()); - SectionDTO sectionByCode = highDangerMapper.getSectionByCode(roadInfo.getSectionCode()); + // 路段 + if("1".equals(ifCross)){ + sectionByCode = highDangerMapper.getSectionByCode(roadInfo.getSectionCode()); + } + // 路口 + else if("2".equals(ifCross)){ + sectionByCode = highDangerMapper.getCrossingByCode(roadInfo.getSectionCode()); + }else{ + return ServerResponse.error("无路口和路段信息"); + } if (sectionByCode.getPosition() == null) { return ServerResponse.ok("路段点位为空", null); @@ -979,6 +1000,11 @@ public class HighDangerController { @Transactional @PostMapping("/saveManualInvestigation") public ServerResponse saveManualInvestigation(@RequestBody ManualInvestigation manualInvestigation, HttpServletRequest request) { + + UUID uuid = UUID.fromString(UUID.randomUUID().toString()); + String nid = uuid.toString().replaceAll("-", ""); + Date date = new Date(); + String ftpUrl = "ftp://" + userName + ":" + passWord + "@" + ip + ":" + port + CURRENT_DIR; log.info("/saveManualInvestigation（保存 & 暂存人工排查）接口被调用,调用ip: {}, 入参:{}", request.getRemoteAddr(), manualInvestigation); Date lastModDate = new Date(); @@ -986,13 +1012,21 @@ public class HighDangerController { String hidden_businessId = manualInvestigation.getBusinessId(); + String cdepartmentid = ""; + + Operator operatorById = operatorMapper.getOperatorById(manualInvestigation.getOperator()); + if (operatorById != null) { + cdepartmentid = operatorById.getCdepartmentid(); + } else { + return ServerResponse.error("未找到当前用户"); + } + // 新增排查 if(manualInvestigation.getTemporary() == 2){ HighDangerBase highDangerBase = new HighDangerBase(); HighDangerRoad highDangerRoad = new HighDangerRoad(); - UUID uuid = UUID.fromString(UUID.randomUUID().toString()); - String nid = uuid.toString().replaceAll("-", ""); + hidden_businessId = "ZZ" + highDangerService.random12(); // base主键 @@ -1003,6 +1037,8 @@ public class HighDangerController { highDangerBase.setName(manualInvestigation.getName()); // 操作用户 highDangerBase.setOperator(manualInvestigation.getOperator()); + highDangerBase.setPcCount("0"); + highDangerBase.setApproveStatus("0"); // 道路NID highDangerRoad.setNid(nid); @@ -1010,6 +1046,9 @@ public class HighDangerController { highDangerRoad.setBusinessId(hidden_businessId); // 绑定路段 highDangerRoad.setSectionCode(manualInvestigation.getSectionCode()); + highDangerRoad.setIfCross(manualInvestigation.getIfCross()); + highDangerRoad.setBelongXq(cdepartmentid); + highDangerRoad.setPcCount("0"); // 分别插入两张表 highDangerService.insertDanger(highDangerBase); @@ -1061,13 +1100,11 @@ public class HighDangerController { extra.setBusinessId(hidden_businessId); highDangerMapper.saveThtHiddenDataCollectConfigExtra(extra); } - Date date = new Date(); // 隐患排查表--如果存在该记录则更新 highDangerMapper.deleteRoadInfo(hidden_businessId); for (HiddenDangerDTO details : manualInvestigation.getDescribe()) { // 随机生成UUID - UUID uuid = UUID.randomUUID(); - String uuidString = uuid.toString().replace("-", ""); + String uuidString = UUID.randomUUID().toString().replace("-", ""); details.setNid(uuidString); details.setBusinessId(hidden_businessId); details.setPcCount(manualInvestigation.getPcCount()); @@ -1086,11 +1123,11 @@ public class HighDangerController { && StringUtils.isNotEmpty(details.getHdPic())) { String hdPicArr[] = details.getHdPic().split(","); for (String s : hdPicArr) { - uuid = UUID.randomUUID(); - uuidString = uuid.toString().replace("-", ""); + nid = UUID.randomUUID().toString().replace("-", ""); +// nid = uuid.toString().replace("-", ""); ThtAttachs thtAttachs = new ThtAttachs(); String accachName = s.substring(s.lastIndexOf("/") + 1); - thtAttachs.setId(uuidString); + thtAttachs.setId(nid); thtAttachs.setAttachUrl(ftpUrl + accachName); thtAttachs.setAttachType("3"); thtAttachs.setUploadTime(date); @@ -1103,6 +1140,18 @@ public class HighDangerController { } } } + + // 新增时间线表 + ThtTimeLineDTO thtTimeLineDTO = new ThtTimeLineDTO(); + thtTimeLineDTO.setNid(String.valueOf(uuid)); + thtTimeLineDTO.setInsertTime(date); + thtTimeLineDTO.setBusinessId(hidden_businessId); + thtTimeLineDTO.setStatus("10"); + thtTimeLineDTO.setTitle("隐患排查"); + thtTimeLineDTO.setLastModDate(date); + thtTimeLineDTO.setOperator(manualInvestigation.getOperator()); +// +// highDangerService.insertTimeLine(thtTimeLineDTO); /*if(!highDangerMapper.isExtraExistence(manualInvestigation.getBusinessId()).isEmpty()){ }else{ }*/ @@ -1163,9 +1212,8 @@ public class HighDangerController { } highDangerMapper.updateDangerRoad(hdFlag, hidden_businessId, pcCount, manualInvestigation.getOperator()); ThtApprove thtAApprove = new ThtApprove(); - UUID uuid = UUID.randomUUID(); - String uuidString = uuid.toString().replace("-", ""); - thtAApprove.setNid(uuidString); +// String uuidString = uuid.toString().replace("-", ""); + thtAApprove.setNid(nid); thtAApprove.setBusinessId(hidden_businessId); thtAApprove.setOperator(manualInvestigation.getLastModeUser()); thtAApprove.setStatus("10"); @@ -1211,6 +1259,129 @@ public class HighDangerController { return ServerResponse.ok(roadTypes); } + // 审批列表 + @GetMapping("/getHigDangerApproval") + public ServerResponse getHigDangerApproval(@RequestParam String nuserid, + @RequestParam(defaultValue = "1") Integer pageNum, + @RequestParam(defaultValue = "10") Integer pageSize, + @RequestParam(defaultValue = "") String search + ){ + String cdepartmentid = ""; + + Operator operatorById = operatorMapper.getOperatorById(nuserid); + if (operatorById != null) { + cdepartmentid = operatorById.getCdepartmentid(); + } else { + return ServerResponse.error("未找到当前用户"); + } + + List approvalList = highDangerService.getHigDangerApproval(cdepartmentid,search); + + PageHelper.startPage(pageNum, pageSize); + PageInfo pageInfo = new PageInfo<>(approvalList); + + return ServerResponse.ok(pageInfo); + + } + + @GetMapping("/getProcessRecord") + public ServerResponse getProcessRecord(@RequestParam String businessId){ + Integer flag = 1; + List processRecord = highDangerService.getProcessRecord(businessId); + LinkedHashMap processMap = new LinkedHashMap<>(); + + HighDangerBase hiddenDangerBaseById = highDangerMapper.getHiddenDangerBaseById(businessId); + Operator operatorById1 = operatorMapper.getOperatorById(hiddenDangerBaseById.getOperator()); +// String username = operatorById.getCusername(); + ThtApprove thtApprove1 = new ThtApprove(); + thtApprove1.setApprovalInfo( operatorById1.getCusername() + "创建排查"); + thtApprove1.setOperateTime(hiddenDangerBaseById.getFindTime()); + thtApprove1.setBusinessId(businessId); + processMap.put("0",thtApprove1); + + for (ThtApprove thtApprove : processRecord){ + // 获取操作用户 + Operator operatorById = operatorMapper.getOperatorById(thtApprove.getOperator()); + String username = operatorById.getCusername(); + + if("10".equals(thtApprove.getStatus())){ + if("0".equals(thtApprove.getOperateContent())){ + thtApprove.setApprovalInfo(username + "排查完成"); + processMap.put(flag.toString(), thtApprove); + flag++; + continue; + } + if ("1".equals(thtApprove.getOperateContent())) { + if("-1".equals(thtApprove.getApproveResult())){ + thtApprove.setApprovalInfo(username + "一级审批驳回"); + processMap.put(flag.toString(), thtApprove); + flag++; + continue; + } + if("1".equals(thtApprove.getApproveResult())){ + thtApprove.setApprovalInfo(username + "一级审批通过"); + processMap.put(flag.toString(), thtApprove); + flag++; + continue; + } + } + if ("2".equals(thtApprove.getOperateContent())) { + if("-1".equals(thtApprove.getApproveResult())){ + thtApprove.setApprovalInfo(username + "二级审批驳回"); + processMap.put(flag.toString(), thtApprove); + flag++; + continue; + } + if("1".equals(thtApprove.getApproveResult())){ + thtApprove.setApprovalInfo(username + "二级审批通过"); + processMap.put(flag.toString(), thtApprove); + flag++; + continue; + } + } + + } + + if("20".equals(thtApprove.getStatus())){ + if("0".equals(thtApprove.getOperateContent())){ + thtApprove.setApprovalInfo(username + "治理完成"); + processMap.put(flag.toString(), thtApprove); + flag++; + continue; + } + if ("1".equals(thtApprove.getOperateContent())) { + if("-1".equals(thtApprove.getApproveResult())){ + thtApprove.setApprovalInfo(username + "一级审批驳回"); + processMap.put(flag.toString(), thtApprove); + flag++; + continue; + } + if("1".equals(thtApprove.getOperateContent())){ + thtApprove.setApprovalInfo(username + "一级审批通过"); + processMap.put(flag.toString(), thtApprove); + flag++; + continue; + } + } + if ("2".equals(thtApprove.getOperateContent())) { + if("-1".equals(thtApprove.getApproveResult())){ + thtApprove.setApprovalInfo(username + "二级审批驳回"); + processMap.put(flag.toString(), thtApprove); + flag++; + continue; + } + if("1".equals(thtApprove.getApproveResult())){ + thtApprove.setApprovalInfo(username + "二级审批通过"); + processMap.put(flag.toString(), thtApprove); + flag++; + } + } + } + } + return ServerResponse.ok(processMap); + } + + // 图片上传接口 /*@PostMapping("/uploadImage") diff --git a/hiatmp-hidden-danger-server/src/main/java/com/hisense/hiatmp/server_api/controller/OperatorController.java b/hiatmp-hidden-danger-server/src/main/java/com/hisense/hiatmp/server_api/controller/OperatorController.java index bbda48a..87961f8 100644 --- a/hiatmp-hidden-danger-server/src/main/java/com/hisense/hiatmp/server_api/controller/OperatorController.java +++ b/hiatmp-hidden-danger-server/src/main/java/com/hisense/hiatmp/server_api/controller/OperatorController.java @@ -1,5 +1,6 @@ package com.hisense.hiatmp.server_api.controller; +import com.hisense.hiatmp.model.common.HighDangerBaseNum; import com.hisense.hiatmp.server_api.mapper.OperatorMapper; import com.hisense.hiatmp.model.common.Operator; import com.hisense.hiatmp.model.common.ServerResponse; @@ -40,4 +41,11 @@ public class OperatorController { } } + @GetMapping("/getOperatorDataSum") + public ServerResponse getOperatorDataSum(@RequestParam String nuserId){ + List operatorDataSum = operatorMapper.getOperatorDataSum(nuserId); + + return ServerResponse.ok(operatorDataSum); + } + } 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 462814c..f312dd8 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 @@ -2,12 +2,14 @@ package com.hisense.hiatmp.server_api.mapper; import com.hisense.hiatmp.model.common.*; import com.hisense.hiatmp.model.common.DTO.SectionDTO; +import com.hisense.hiatmp.model.common.DTO.ThtTimeLineDTO; import com.hisense.hiatmp.model.common.VO.BasicInfoVO; import com.hisense.hiatmp.model.common.VO.SectionVO; import com.hisense.hiatmp.server_api.model.StreetCommunity; import io.lettuce.core.dynamic.annotation.Param; import org.springframework.stereotype.Repository; +import java.util.Date; import java.util.List; @Repository @@ -110,5 +112,15 @@ public interface HighDangerMapper{ SectionDTO getSectionByCode(String sectionCode); + SectionDTO getCrossingByCode(String sectionCode); + List getCommunityByRoad(String businessId); + + void insertTimeLine(ThtTimeLineDTO thtTimeLineDTO); + + List getHigDangerApproval(@Param("cdepartmentid") String cdepartmentid,@Param("search") String search); + + List getProcessRecord(String businessId); + + HighDangerBase getHiddenDangerBaseById(String businessId); } diff --git a/hiatmp-hidden-danger-server/src/main/java/com/hisense/hiatmp/server_api/mapper/OperatorMapper.java b/hiatmp-hidden-danger-server/src/main/java/com/hisense/hiatmp/server_api/mapper/OperatorMapper.java index a24b91e..517f8ee 100644 --- a/hiatmp-hidden-danger-server/src/main/java/com/hisense/hiatmp/server_api/mapper/OperatorMapper.java +++ b/hiatmp-hidden-danger-server/src/main/java/com/hisense/hiatmp/server_api/mapper/OperatorMapper.java @@ -1,5 +1,6 @@ package com.hisense.hiatmp.server_api.mapper; +import com.hisense.hiatmp.model.common.HighDangerBaseNum; import com.hisense.hiatmp.model.common.Operator; import org.apache.ibatis.annotations.Param; import org.springframework.stereotype.Repository; @@ -18,4 +19,6 @@ public interface OperatorMapper { String updateByPrimaryKeySelective(@Param("nuserid") String nuserid,@Param("cuserpwd") String cuserpwd); List getRoleById(String nuserid); + + List getOperatorDataSum(String nuserid); } diff --git a/hiatmp-hidden-danger-server/src/main/java/com/hisense/hiatmp/server_api/mapper/ThtApproveMapper.java b/hiatmp-hidden-danger-server/src/main/java/com/hisense/hiatmp/server_api/mapper/ThtApproveMapper.java index ce2d5c5..719b093 100644 --- a/hiatmp-hidden-danger-server/src/main/java/com/hisense/hiatmp/server_api/mapper/ThtApproveMapper.java +++ b/hiatmp-hidden-danger-server/src/main/java/com/hisense/hiatmp/server_api/mapper/ThtApproveMapper.java @@ -1,11 +1,12 @@ package com.hisense.hiatmp.server_api.mapper; import com.hisense.hiatmp.model.common.ThtApprove; -import com.hisense.hiatmp.model.common.ThtAttachs; +import com.hisense.hiatmp.model.common.VO.ThtApproveVO; import org.springframework.stereotype.Repository; @Repository public interface ThtApproveMapper { int save(ThtApprove thtApprove); + } diff --git a/hiatmp-hidden-danger-server/src/main/java/com/hisense/hiatmp/server_api/mapper/ThtRoadInfoMapper.java b/hiatmp-hidden-danger-server/src/main/java/com/hisense/hiatmp/server_api/mapper/ThtRoadInfoMapper.java new file mode 100644 index 0000000..f3cd4a8 --- /dev/null +++ b/hiatmp-hidden-danger-server/src/main/java/com/hisense/hiatmp/server_api/mapper/ThtRoadInfoMapper.java @@ -0,0 +1,12 @@ +package com.hisense.hiatmp.server_api.mapper; + +import com.hisense.hiatmp.model.common.HiddenDangerDTO; +import org.springframework.stereotype.Repository; + +@Repository +public interface ThtRoadInfoMapper { + + void updateRoadInfo(HiddenDangerDTO hiddenDangerDTO); + + +} diff --git a/hiatmp-hidden-danger-server/src/main/java/com/hisense/hiatmp/server_api/service/GovernmentService.java b/hiatmp-hidden-danger-server/src/main/java/com/hisense/hiatmp/server_api/service/GovernmentService.java new file mode 100644 index 0000000..6830054 --- /dev/null +++ b/hiatmp-hidden-danger-server/src/main/java/com/hisense/hiatmp/server_api/service/GovernmentService.java @@ -0,0 +1,10 @@ +package com.hisense.hiatmp.server_api.service; + +import com.hisense.hiatmp.model.common.HiddenDangerDTO; +import org.springframework.stereotype.Service; + +@Service +public interface GovernmentService { + + void updateRoadInfo(HiddenDangerDTO hiddenDangerDTO); +} diff --git a/hiatmp-hidden-danger-server/src/main/java/com/hisense/hiatmp/server_api/service/HighDangerService.java b/hiatmp-hidden-danger-server/src/main/java/com/hisense/hiatmp/server_api/service/HighDangerService.java index f52fb37..67f864d 100644 --- a/hiatmp-hidden-danger-server/src/main/java/com/hisense/hiatmp/server_api/service/HighDangerService.java +++ b/hiatmp-hidden-danger-server/src/main/java/com/hisense/hiatmp/server_api/service/HighDangerService.java @@ -2,9 +2,11 @@ package com.hisense.hiatmp.server_api.service; import com.hisense.hiatmp.model.common.*; import com.hisense.hiatmp.model.common.DTO.SectionDTO; +import com.hisense.hiatmp.model.common.DTO.ThtTimeLineDTO; import com.hisense.hiatmp.model.common.VO.SectionVO; import com.hisense.hiatmp.model.dmr.Point; import com.hisense.hiatmp.server_api.utils.CoordinateConverter; +import javafx.animation.Timeline; import org.springframework.stereotype.Service; import org.springframework.web.multipart.MultipartFile; @@ -38,6 +40,12 @@ public interface HighDangerService { List getSectionByCrossing(String crossingCode); + void insertTimeLine(ThtTimeLineDTO timeLineDTO); + + List getHigDangerApproval(String cdepartmentid,String search); + + List getProcessRecord(String businessId); + // 随机生成12位数字 String random12(); -} +} \ No newline at end of file diff --git a/hiatmp-hidden-danger-server/src/main/java/com/hisense/hiatmp/server_api/service/ThtApproveService.java b/hiatmp-hidden-danger-server/src/main/java/com/hisense/hiatmp/server_api/service/ThtApproveService.java index 697c224..87e5ea8 100644 --- a/hiatmp-hidden-danger-server/src/main/java/com/hisense/hiatmp/server_api/service/ThtApproveService.java +++ b/hiatmp-hidden-danger-server/src/main/java/com/hisense/hiatmp/server_api/service/ThtApproveService.java @@ -1,10 +1,13 @@ package com.hisense.hiatmp.server_api.service; import com.hisense.hiatmp.model.common.ThtApprove; +import com.hisense.hiatmp.model.common.VO.ThtApproveVO; import org.springframework.stereotype.Service; @Service public interface ThtApproveService { public int save(ThtApprove thtAApprove); + + int SubmitHigDangerApproval(ThtApproveVO thtAApprove); } diff --git a/hiatmp-hidden-danger-server/src/main/java/com/hisense/hiatmp/server_api/service/impl/GovernmentServiceImpl.java b/hiatmp-hidden-danger-server/src/main/java/com/hisense/hiatmp/server_api/service/impl/GovernmentServiceImpl.java new file mode 100644 index 0000000..aca4209 --- /dev/null +++ b/hiatmp-hidden-danger-server/src/main/java/com/hisense/hiatmp/server_api/service/impl/GovernmentServiceImpl.java @@ -0,0 +1,19 @@ +package com.hisense.hiatmp.server_api.service.impl; + +import com.hisense.hiatmp.model.common.HiddenDangerDTO; +import com.hisense.hiatmp.server_api.mapper.ThtRoadInfoMapper; +import com.hisense.hiatmp.server_api.service.GovernmentService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +@Service +public class GovernmentServiceImpl implements GovernmentService { + + @Autowired + ThtRoadInfoMapper thtRoadInfoMapper; + + @Override + public void updateRoadInfo(HiddenDangerDTO hiddenDangerDTO) { + thtRoadInfoMapper.updateRoadInfo(hiddenDangerDTO); + } +} 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 3d566a0..4e57036 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 @@ -1,12 +1,10 @@ package com.hisense.hiatmp.server_api.service.impl; -import com.hisense.hiatmp.model.common.EnumRoadType; -import com.hisense.hiatmp.model.common.HighDangerBase; -import com.hisense.hiatmp.model.common.HighDangerRoad; +import com.hisense.hiatmp.model.common.*; +import com.hisense.hiatmp.model.common.DTO.ThtTimeLineDTO; import com.hisense.hiatmp.model.common.VO.SectionVO; import com.hisense.hiatmp.server_api.mapper.HighDangerMapper; import com.hisense.hiatmp.server_api.service.HighDangerService; -import com.hisense.hiatmp.model.common.ThtDangerItems; import com.hisense.hiatmp.model.dmr.Point; import com.hisense.hiatmp.server_api.utils.CoordinateConverter; import org.springframework.beans.BeanUtils; @@ -369,6 +367,22 @@ public class HighDangerBaseServiceImpl implements HighDangerService { return highDangerMapper.getSectionByCrossing(crossingCode); } + @Override + public void insertTimeLine(ThtTimeLineDTO timeLineDTO) { + highDangerMapper.insertTimeLine(timeLineDTO); + } + + @Override + public List getHigDangerApproval(String cdepartmentid,String search) { + return highDangerMapper.getHigDangerApproval(cdepartmentid,search); + } + + @Override + public List getProcessRecord(String businessId) { + List processRecord = highDangerMapper.getProcessRecord(businessId); + return processRecord; + } + public String random12(){ Random random = new Random(); StringBuilder sb = new StringBuilder(); diff --git a/hiatmp-hidden-danger-server/src/main/java/com/hisense/hiatmp/server_api/service/impl/ThtApproveServiceImpl.java b/hiatmp-hidden-danger-server/src/main/java/com/hisense/hiatmp/server_api/service/impl/ThtApproveServiceImpl.java index feac8d6..b3eb2b3 100644 --- a/hiatmp-hidden-danger-server/src/main/java/com/hisense/hiatmp/server_api/service/impl/ThtApproveServiceImpl.java +++ b/hiatmp-hidden-danger-server/src/main/java/com/hisense/hiatmp/server_api/service/impl/ThtApproveServiceImpl.java @@ -1,11 +1,15 @@ package com.hisense.hiatmp.server_api.service.impl; import com.hisense.hiatmp.model.common.ThtApprove; +import com.hisense.hiatmp.model.common.VO.ThtApproveVO; import com.hisense.hiatmp.server_api.mapper.ThtApproveMapper; import com.hisense.hiatmp.server_api.service.ThtApproveService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import java.util.Date; +import java.util.UUID; + @Service public class ThtApproveServiceImpl implements ThtApproveService { @@ -16,4 +20,34 @@ public class ThtApproveServiceImpl implements ThtApproveService { public int save(ThtApprove thtApprove) { return thtApproveMapper.save(thtApprove); } -} + + @Override + public int SubmitHigDangerApproval(ThtApproveVO thtApproveVO) { + + Date date = new Date(); + UUID uuid = UUID.fromString(UUID.randomUUID().toString()); + String nid = uuid.toString().replaceAll("-", ""); + + ThtApprove thtApprove = new ThtApprove(); + thtApprove.setNid(nid); + thtApprove.setBusinessId(thtApproveVO.getBusinessId()); + thtApprove.setStatus(thtApproveVO.getStatus()); + thtApprove.setOperator(thtApproveVO.getNuserid()); + thtApprove.setReason(thtApproveVO.getReason()); + thtApprove.setLastModDate(date); + // 一级审批 + thtApprove.setOperateContent("1"); + + if("0".equals(thtApproveVO.getApprovalStatus())){ + // 驳回 + thtApprove.setApproveResult("-1"); + }else{ + // 审批通过 + thtApprove.setApproveResult("1"); + } + + thtApprove.setReason(thtApproveVO.getReason()); + + return thtApproveMapper.save(thtApprove); + } +} \ 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 cfb9c3d..8dc1a8d 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 @@ -50,12 +50,14 @@ business_id, section_code, pc_count, + if_cross, last_mod_date ) values (#{nid}, #{businessId}, #{sectionCode}, #{pcCount}, + #{ifCross}, NOW() ) @@ -262,6 +264,7 @@ , et.enumname , hdb.approve_status , hdr.section_code + , hdr.if_cross , COALESCE(hdb.pc_end_time, hdb.pc_start_time + INTERVAL '1 day' * tpc.param_value ::INTEGER) AS planEndTime , COALESCE(hdb.pc_end_time, hdb.pc_start_time + INTERVAL '1 day' * tpc.param_value @@ -277,7 +280,12 @@ LEFT JOIN enum_type et ON et.ENUMTYPEID = '6601' AND et.enumvalue = hdb.status LEFT JOIN bis_section bs ON hdr.section_code = bs.section_code - LEFT JOIN tht_param_config tpc ON tpc.param_code = 'THT_PC_ROAD_XT' + + LEFT JOIN tht_param_config tpc ON tpc.param_code = 'THT_PC_ROAD_XT' + + + LEFT JOIN tht_param_config tpc ON tpc.param_code = 'THT_ZL_ROAD_XT' + WHERE hdb.status = #{status} AND hdr.nid is not null @@ -692,4 +700,86 @@ from bis_section where section_code = #{sectionCode} + + + + + + + + + + \ No newline at end of file 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 5c17f59..46c4f8c 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 @@ -33,5 +33,43 @@ where ror.operationid = #{nuserid} + + \ No newline at end of file diff --git a/hiatmp-hidden-danger-server/src/main/resources/sql-mapper/ThtRoadInfoMapper.xml b/hiatmp-hidden-danger-server/src/main/resources/sql-mapper/ThtRoadInfoMapper.xml new file mode 100644 index 0000000..d1a576a --- /dev/null +++ b/hiatmp-hidden-danger-server/src/main/resources/sql-mapper/ThtRoadInfoMapper.xml @@ -0,0 +1,16 @@ + + + + + + update tht_hidden_danger_road_info + set zl_unit = #{zlUnit}, + zl_measure = #{zlMeasure}, + zl_pic = #{zlPic}, + hd_pic = #{hdPic}, + last_mod_date = NOW(), + zl_time = NOW() + where business_id = #{businessId} + And hd_term = #{hdTerm} + + \ No newline at end of file diff --git a/hiatmp-model/src/main/java/com/hisense/hiatmp/model/common/DTO/SectionDTO.java b/hiatmp-model/src/main/java/com/hisense/hiatmp/model/common/DTO/SectionDTO.java index bfc4143..b8474b5 100644 --- a/hiatmp-model/src/main/java/com/hisense/hiatmp/model/common/DTO/SectionDTO.java +++ b/hiatmp-model/src/main/java/com/hisense/hiatmp/model/common/DTO/SectionDTO.java @@ -10,6 +10,7 @@ public class SectionDTO implements Serializable { private static final long serialVersionUID = 1L; private String sectionCode; + private String crossingCode; private String businessId; private String roadCode; private String sectionName; diff --git a/hiatmp-model/src/main/java/com/hisense/hiatmp/model/common/DTO/ThtTimeLineDTO.java b/hiatmp-model/src/main/java/com/hisense/hiatmp/model/common/DTO/ThtTimeLineDTO.java new file mode 100644 index 0000000..ab7e9f5 --- /dev/null +++ b/hiatmp-model/src/main/java/com/hisense/hiatmp/model/common/DTO/ThtTimeLineDTO.java @@ -0,0 +1,23 @@ +package com.hisense.hiatmp.model.common.DTO; + +import lombok.Data; + +import java.io.Serializable; +import java.util.Date; + +@Data +public class ThtTimeLineDTO implements Serializable { + + private static final long serialVersionUID = 1L; + + private String nid; + private String businessId; + private String status; + private String title; + private String operator; + private String startTime; + private String endTime; + private Date insertTime; + private Date lastModDate; + +} diff --git a/hiatmp-model/src/main/java/com/hisense/hiatmp/model/common/HiddenDangerDTO.java b/hiatmp-model/src/main/java/com/hisense/hiatmp/model/common/HiddenDangerDTO.java index 1466346..c6b3ebb 100644 --- a/hiatmp-model/src/main/java/com/hisense/hiatmp/model/common/HiddenDangerDTO.java +++ b/hiatmp-model/src/main/java/com/hisense/hiatmp/model/common/HiddenDangerDTO.java @@ -25,4 +25,6 @@ public class HiddenDangerDTO implements Serializable { private String hdInfo; private String dangerProblem; private String pcType; + private Date zlTime; + private String zlPic; } 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 4e42330..f463c96 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 @@ -130,6 +130,8 @@ public class HighDangerBase implements Serializable { */ private String pcCount; + private String ifCross; + private String pcType; /** diff --git a/hiatmp-model/src/main/java/com/hisense/hiatmp/model/common/HighDangerRoad.java b/hiatmp-model/src/main/java/com/hisense/hiatmp/model/common/HighDangerRoad.java index 438beba..c784f82 100644 --- a/hiatmp-model/src/main/java/com/hisense/hiatmp/model/common/HighDangerRoad.java +++ b/hiatmp-model/src/main/java/com/hisense/hiatmp/model/common/HighDangerRoad.java @@ -53,6 +53,8 @@ public class HighDangerRoad implements Serializable { private String pointType; + private String belongXq; + private String ifCross; /** diff --git a/hiatmp-model/src/main/java/com/hisense/hiatmp/model/common/ManualInvestigation.java b/hiatmp-model/src/main/java/com/hisense/hiatmp/model/common/ManualInvestigation.java index 0b560ea..ab7ab22 100644 --- a/hiatmp-model/src/main/java/com/hisense/hiatmp/model/common/ManualInvestigation.java +++ b/hiatmp-model/src/main/java/com/hisense/hiatmp/model/common/ManualInvestigation.java @@ -22,6 +22,7 @@ public class ManualInvestigation implements Serializable { // 第一页，基本信息 List basicInfo; private String sectionCode; + private String ifCross; // 隐患名称 private String name; private String xqcode; diff --git a/hiatmp-model/src/main/java/com/hisense/hiatmp/model/common/ThtApprove.java b/hiatmp-model/src/main/java/com/hisense/hiatmp/model/common/ThtApprove.java index ae4d040..511f42a 100644 --- a/hiatmp-model/src/main/java/com/hisense/hiatmp/model/common/ThtApprove.java +++ b/hiatmp-model/src/main/java/com/hisense/hiatmp/model/common/ThtApprove.java @@ -20,5 +20,8 @@ public class ThtApprove implements Serializable { String timelineNid; Date operateTime; String operateContent; + String approveResult; Date lastModDate; + String approvalInfo; + String reason; } diff --git a/hiatmp-model/src/main/java/com/hisense/hiatmp/model/common/VO/GovernmentVO.java b/hiatmp-model/src/main/java/com/hisense/hiatmp/model/common/VO/GovernmentVO.java new file mode 100644 index 0000000..3272854 --- /dev/null +++ b/hiatmp-model/src/main/java/com/hisense/hiatmp/model/common/VO/GovernmentVO.java @@ -0,0 +1,15 @@ +package com.hisense.hiatmp.model.common.VO; + +import com.hisense.hiatmp.model.common.HiddenDangerDTO; +import com.hisense.hiatmp.model.common.ThtHiddenDataCollectConfigExtra; +import lombok.Data; + +import java.util.List; + +@Data +public class GovernmentVO { + + String businessId; + List describe; + +} diff --git a/hiatmp-model/src/main/java/com/hisense/hiatmp/model/common/VO/ThtApproveVO.java b/hiatmp-model/src/main/java/com/hisense/hiatmp/model/common/VO/ThtApproveVO.java new file mode 100644 index 0000000..080a97f --- /dev/null +++ b/hiatmp-model/src/main/java/com/hisense/hiatmp/model/common/VO/ThtApproveVO.java @@ -0,0 +1,29 @@ +package com.hisense.hiatmp.model.common.VO; + +import lombok.Data; + +import java.io.Serializable; + +@Data +public class ThtApproveVO implements Serializable{ + + private static final long serialVersionUID = 1L; + +// String nid; + // 隐患主键 + private String businessId; + // 当前登录用户名 + private String nuserid; + // 审批意见 + private String reason; + // 审批操作 + private String approvalStatus; + // 隐患状态 + private String status; +// String status; +// String timelineNid; +// Date operateTime; +// String operateContent; +// Date lastModDate; +// String approvalInfo; +} diff --git a/hiatmp-model/src/main/java/com/hisense/hiatmp/model/common/enum/HiddenDangerStatus b/hiatmp-model/src/main/java/com/hisense/hiatmp/model/common/enum/HiddenDangerStatus new file mode 100644 index 0000000..706ab77 --- /dev/null +++ b/hiatmp-model/src/main/java/com/hisense/hiatmp/model/common/enum/HiddenDangerStatus @@ -0,0 +1,10 @@ +public class EnumExample { + public enum Day { + MONDAY, TUESDAY, WEDNESDAY, THURSDAY, FRIDAY, SATURDAY, SUNDAY + } + + public static void main(String[] args) { + Day today = Day.MONDAY; + System.out.println("Today is " + today); + } +} \ No newline at end of file