From dd085d936d51741bc8d493c8d3fa76a110c15b8f Mon Sep 17 00:00:00 2001 From: Zangzhipeng Date: Tue, 6 Aug 2024 15:35:49 +0800 Subject: [PATCH] =?UTF-8?q?=E6=97=B6=E5=8C=BA=E9=97=AE=E9=A2=98=E3=80=81?= =?UTF-8?q?=E5=AE=A1=E6=89=B9=E5=AD=97=E6=AE=B5=E3=80=81=E9=83=A8=E9=97=A8?= =?UTF-8?q?=EF=BC=88=E5=A4=A7=E9=98=9F=EF=BC=89=E6=95=B0=E6=8D=AE=E6=9F=A5?= =?UTF-8?q?=E8=AF=A2=E3=80=81=E6=95=B0=E6=8D=AE=E5=8A=A0=E5=85=A5=E6=9C=80?= =?UTF-8?q?=E5=90=8E=E4=BF=AE=E6=94=B9=E6=97=B6=E9=97=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/ConfigController.java | 4 + .../controller/HighDangerController.java | 141 ++++++++------- .../server_api/mapper/HighDangerMapper.java | 4 +- .../impl/HighDangerBaseServiceImpl.java | 2 +- .../resources/sql-mapper/HighDangerMapper.xml | 163 +++++++++++------- .../resources/sql-mapper/OperatorMapper.xml | 9 +- .../hiatmp/model/common/HighDangerBase.java | 15 +- .../hisense/hiatmp/model/common/Operator.java | 4 +- .../hiatmp/model/common/Operator.class | Bin 4810 -> 5330 bytes 9 files changed, 199 insertions(+), 143 deletions(-) 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 1bc8c776075808149cb0b7f128f8a480a332f3f7..153c3f7ff38e2032e1e79e2e808ba3b7bf42cf47 100644 GIT binary patch literal 5330 zcmb_fTaz1C5$>bgjHJgGutDWqQEsYdO zn*?JnArK&3l5lef5bicmt|C;CO>r%FAXM?hL!RITegH2NRTNbO^Yu9+X(W%6eW1$j z^PTRmTW9)o_sstBzrXkm5$&TNW#~qFEKOPZIE%+we1gR%Sv;0N1+W{+1J^~!@zyW_SVt=B4Noa)(j!>>3!Qso%-^J{*i z<>Dt|UQ>`!U3J^lme=GUf|AYkhL4}jLEUs(ow|#k!|&?NM$N0b3=1KXI$vtP=X;$y z1jQ#NmjxvbHC7R#aNP6V6C3pvw{^FJv+{#Bs>qOoJYgRw6Pf&IPBz_^(`mGD^30msInhmDd15jufd)8-`Z>&Yw=#`M?B?>@AJ|eD(8YCgfzK6MLupm#E=S261ZMK^g9zjNId-OB^bptq52&@AmWsKVkV7B{ol z$KniK{{m*|Hm@|iuoC= zLk>FsjAAdq7^A+k5$TMAiExe&JLe;vQD_m)iD73m(isIB;hY?HE=M|}up^vP!_H%o z&S;1TXKmPdd!#cODZ*JFcHR-`j0TKwP7gcpigZTfMmT4Nop(n%AES4n8n{SotTC*q zsp%If7F}XviV>6;mmk-?pyTjMqNAvY%|dj@_*O%53-v-)WXKcIAro5-sk$*Z@;Dt%l@g?w#^x8FDc?WNND+c`o!q?vo+k9UW5JYDgY2y^y!akf)+U>RS!T)2bKp zRvB_BI%ImQA$joiLf$4r-W?q>v(=D1Lwg}_mm%>YRHYvK6V_3T$g|T^7b%&zJpDV$ zK1a#;<>}v2c41~}lMJ~9$eoyhuoJU?psba6nM#+)n6(m{lzC^nj#UdWclA(;$`XjFo0mCLpD)Oo(LKS&&TIu(C`t0uoS& zG-BsK8nN?Mj!F4|l(X_7QrRwmRJMy&fl0-HRIrL6(x_bmY1B5Y5|hk;RIq!Fv!B_%FnLc~LF9ren3MO{O8o`|z_FWrZG8x_lR8n3Y!jfxQ>3u*cs?imCKafT(`Zs+5NT+A$&-4ILnl8{Q)_{uQ27EHD1C_)yUalUHDURX0 z;0(}+SfrisxsS>?3sIeRYx;jEuTlL~8q>(fKV7^^+Z9aze_?k3--|*|@VB2TbbLSH z?^vGAT;Y5L;TONU0yWZ;-77#+Pvaqat#ewo4n7N^!doK#EJ7Fv^snOF{=@;u3+XIDLt<*-hH^0P72Of(=$8u;|=0%2c$I(u97IPP&!sno4#`no>Ozx=4AMwkAzz zpukJ(nnrA0n)IFtZKb@*c3PUyQGr*wYZ|pP(v<0$&}YhP%+5*^S}gF&O4F|BGCrqL z667#W|3neCk+3BFgE~Ml6yD!y19^?p^(e)Mff8Wepgl%c=k^YFt!SuVC%oXjgwBv5QZpuk9oEBLAYKE{esN_Gid zPGV3M&{820|!`juON% literal 4810 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 JS1sX*{{ZEPRe=Bi