From f24b7070fc5bdcde11d1882f287971862e0e9a8b Mon Sep 17 00:00:00 2001 From: yitonglei Date: Fri, 15 Jul 2022 09:53:54 +0800 Subject: [PATCH 1/2] =?UTF-8?q?1=E3=80=81=E6=96=B0=E5=A2=9E=E7=9A=84?= =?UTF-8?q?=E8=83=BD=E5=8A=9B=E8=B6=85=E5=B8=82/=E5=9F=BA=E7=A1=80?= =?UTF-8?q?=E8=AE=BE=E6=96=BD=E7=9A=84=E5=9C=B0=E5=9B=BE=E4=B8=8B=E9=9D=A2?= =?UTF-8?q?=E7=9A=84=E5=88=97=E8=A1=A8=E6=9F=A5=E8=AF=A2=E8=AF=AD=E5=8F=A5?= =?UTF-8?q?=E8=BF=9B=E8=A1=8C=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../monitor/controller/Controller.java | 16 +++++++- .../monitor/entity/CameraChannelNew.java | 36 +++++++++++++++++ .../monitor/mapper/CameraChannelMapper.java | 4 +- .../mapper/CameraOrgenizationMapper.java | 7 +++- .../monitor/service/MonitorService.java | 12 ++++++ .../mapper/monitor/CameraChannelMapper.xml | 39 ++++++++++--------- 6 files changed, 90 insertions(+), 24 deletions(-) create mode 100644 renren-admin/src/main/java/io/renren/modules/monitor/entity/CameraChannelNew.java diff --git a/renren-admin/src/main/java/io/renren/modules/monitor/controller/Controller.java b/renren-admin/src/main/java/io/renren/modules/monitor/controller/Controller.java index 94145c57..25f64e08 100644 --- a/renren-admin/src/main/java/io/renren/modules/monitor/controller/Controller.java +++ b/renren-admin/src/main/java/io/renren/modules/monitor/controller/Controller.java @@ -638,14 +638,26 @@ public class Controller { if (null != labelCodes && labelCodes.length > 0) { list1 = Arrays.asList(labelCodes); } - List list = cameraChannelMapper.selectByParentIdNew(queryMap, list1); + //查询当前地区及下级地区的id,组成list,2022-07-14,ytl + List orgenIds = monitorService.listChildOrgenIds(new ArrayList(), queryMap.get("parentId").toString()); + + + List list = cameraChannelMapper.selectByParentIdNew(queryMap, list1,orgenIds); Result success = Result.success(list); - success.setCount(cameraChannelMapper.selectByParentIdCountNew(queryMap, list1)); + success.setCount(cameraChannelMapper.selectByParentIdCountNew(queryMap, list1,orgenIds)); return success; } + //测试获取某个地区 及旗下的所有地区id + @GetMapping("listChildOrgenIds") + public Result listChildOrgenIds(String id){ + List list = new ArrayList<>(); + List maps = monitorService.listChildOrgenIds(list, id); + return Result.success(maps); + } + /** * 摄像头按照市区进行聚合查询 */ diff --git a/renren-admin/src/main/java/io/renren/modules/monitor/entity/CameraChannelNew.java b/renren-admin/src/main/java/io/renren/modules/monitor/entity/CameraChannelNew.java new file mode 100644 index 00000000..18e228f2 --- /dev/null +++ b/renren-admin/src/main/java/io/renren/modules/monitor/entity/CameraChannelNew.java @@ -0,0 +1,36 @@ +package io.renren.modules.monitor.entity; + +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +@Data +@TableName("t_camera_channel01") +public class CameraChannelNew { + + @TableId + private Long idtCameraChannel; + + private String channelCode; + + private String channelId; + + private String channelName; + + private String gpsX; + + private String gpsY; + + private Integer status;//1在线；0离线 + + private String nodeName; + + private Integer checkStatus;//1正常；0异常 + + private String parentId; + + private String regionCode; + + private String regionName; + +} diff --git a/renren-admin/src/main/java/io/renren/modules/monitor/mapper/CameraChannelMapper.java b/renren-admin/src/main/java/io/renren/modules/monitor/mapper/CameraChannelMapper.java index bc473be9..457bdadb 100644 --- a/renren-admin/src/main/java/io/renren/modules/monitor/mapper/CameraChannelMapper.java +++ b/renren-admin/src/main/java/io/renren/modules/monitor/mapper/CameraChannelMapper.java @@ -64,9 +64,9 @@ public interface CameraChannelMapper extends BaseDao { Integer selectChannelCounts(@Param("path") String path); - List selectByParentIdNew(@Param("map") Map queryMap, @Param("labelCodes") List labelCodes); + List selectByParentIdNew(@Param("map") Map queryMap, @Param("labelCodes") List labelCodes,@Param("orgenIds") List orgenIds); - Integer selectByParentIdCountNew(@Param("map") Map queryMap, @Param("labelCodes") List labelCodes); + Integer selectByParentIdCountNew(@Param("map") Map queryMap, @Param("labelCodes") List labelCodes,@Param("orgenIds") List orgenIds); List selectChannelNumByRegion(); } diff --git a/renren-admin/src/main/java/io/renren/modules/monitor/mapper/CameraOrgenizationMapper.java b/renren-admin/src/main/java/io/renren/modules/monitor/mapper/CameraOrgenizationMapper.java index c3d434a1..27928add 100644 --- a/renren-admin/src/main/java/io/renren/modules/monitor/mapper/CameraOrgenizationMapper.java +++ b/renren-admin/src/main/java/io/renren/modules/monitor/mapper/CameraOrgenizationMapper.java @@ -17,12 +17,15 @@ public interface CameraOrgenizationMapper extends BaseDao { @Select("select * from t_camera_organization where parent_id = #{parentId}") List selectSubOrganization(@Param("parentId") String parentId); - @Select("select * channelCount from t_camera_organization02 where parent_id = #{parentId}") + @Select("select * from t_camera_organization02 where parent_id = #{parentId}") List selectSubOrganizationMap(@Param("parentId") String parentId); + @Select("select name,parent_id,id from t_camera_organization02 where parent_id = #{parentId}") + List selectSubOrganizationMapByPid(@Param("parentId") String parentId); + void batchSaveOrgenization(List list); - @Select("SELECT name,parent_id FROM t_camera_organization02 WHERE id = #{id}") + @Select("SELECT name,parent_id,id FROM t_camera_organization02 WHERE id = #{id}") Map selectOrgenizationById(@Param("id") String id); @Update("UPDATE t_camera_organization02 SET path = TRIM( TRAILING '->' FROM #{path}) where id = #{id}") diff --git a/renren-admin/src/main/java/io/renren/modules/monitor/service/MonitorService.java b/renren-admin/src/main/java/io/renren/modules/monitor/service/MonitorService.java index 7526ea48..b864fc53 100644 --- a/renren-admin/src/main/java/io/renren/modules/monitor/service/MonitorService.java +++ b/renren-admin/src/main/java/io/renren/modules/monitor/service/MonitorService.java @@ -1243,6 +1243,18 @@ public class MonitorService { setNodeName(map,map2.get("parent_id").toString()); } } + + public List listChildOrgenIds(List list,String id){ + Map orgenNow = cameraOrgenMapper.selectOrgenizationById(id); + list.add(orgenNow); + List childs = cameraOrgenMapper.selectSubOrganizationMapByPid(id); + if(childs.size() > 0){ + childs.forEach(child->{ + listChildOrgenIds(list,child.get("id").toString()); + }); + } + return list; + } } diff --git a/renren-admin/src/main/resources/mapper/monitor/CameraChannelMapper.xml b/renren-admin/src/main/resources/mapper/monitor/CameraChannelMapper.xml index e5f4cfc6..3fae9838 100644 --- a/renren-admin/src/main/resources/mapper/monitor/CameraChannelMapper.xml +++ b/renren-admin/src/main/resources/mapper/monitor/CameraChannelMapper.xml @@ -121,9 +121,12 @@ WHERE b.path like concat(#{path},'%') + - - + SELECT COUNT(*) + FROM ( SELECT tcc.* @@ -184,14 +190,13 @@ JOIN t_label tl ON tl.label_code = tcml.label_code WHERE 1 = 1 - - AND tcc.parent_id = #{map.parentId} - + AND tcc.parent_id IN + + #{item.id} + + AND tcc.check_status IN (${map.checkStatus}) - AND tcc.gps_x != '' - AND tcc.gps_y != '' - AND tcc.gps_x IS NOT NULL - AND tcc.gps_y IS NOT NULL + AND tcc.channel_name LIKE CONCAT('%',#{map.cameraName},'%') @@ -206,13 +211,11 @@ distance < ${map.radius} ORDER BY distance - - - LIMIT ${map.pageNum}, ${map.pageSize} - + ) temp + \ No newline at end of file From 5ef9763caedc2bc7e0220bded044024ef51ed3f2 Mon Sep 17 00:00:00 2001 From: wangliwen Date: Fri, 15 Jul 2022 10:01:10 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E8=83=BD=E5=8A=9B=E4=BD=BF=E7=94=A8?= =?UTF-8?q?=E7=94=B3=E8=AF=B7=E5=8F=AF=E7=94=A8=E6=B5=81=E7=A8=8B=E6=98=AF?= =?UTF-8?q?=E5=90=A6=E7=BB=93=E6=9D=9F=E6=9D=A5=E8=BF=9B=E8=A1=8C=E8=BF=87?= =?UTF-8?q?=E6=BB=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/AbilityCenterControllerV2.java | 2 -- .../demanData/entity/TDemandDataEntityFlag.java | 6 +++--- .../entity/TDemandCommentEntityDelFlag.java | 2 +- .../controller/TAbilityApplicationController.java | 4 +++- .../processForm/dto/TAbilityApplicationDTO.java | 3 +++ .../processForm/dto/TAbilityApplicationV2DTO.java | 3 +++ .../impl/TAbilityApplicationServiceImpl.java | 13 +++++++++++-- 7 files changed, 24 insertions(+), 9 deletions(-) diff --git a/renren-admin/src/main/java/io/renren/common/controller/AbilityCenterControllerV2.java b/renren-admin/src/main/java/io/renren/common/controller/AbilityCenterControllerV2.java index 4c615159..13767a71 100644 --- a/renren-admin/src/main/java/io/renren/common/controller/AbilityCenterControllerV2.java +++ b/renren-admin/src/main/java/io/renren/common/controller/AbilityCenterControllerV2.java @@ -98,7 +98,6 @@ public class AbilityCenterControllerV2 { } final String applyFlag = UUID.randomUUID().toString(); abilityBatchApplicationDTO.setApplyFlag(applyFlag); // 同一次的申请标识 -// String applyNumber = codeGenerationUtils.getApplyNumber("NLSY"); final Optional deptDTO = Optional.ofNullable(sysDeptService.getByName(bigDateDeptName)); final UserDetail user = SecurityUser.getUser(); @@ -108,7 +107,6 @@ public class AbilityCenterControllerV2 { return null; } TAbilityApplicationDTO tAbilityApplicationDTO = new TAbilityApplicationDTO(); -// tAbilityApplicationDTO.setApplyNumber(applyNumber); tAbilityApplicationDTO.setArea(abilityBatchApplicationDTO.getArea()); tAbilityApplicationDTO.setAttachment(abilityBatchApplicationDTO.getAttachment()); tAbilityApplicationDTO.setBasis(abilityBatchApplicationDTO.getBasis()); diff --git a/renren-admin/src/main/java/io/renren/modules/demanData/entity/TDemandDataEntityFlag.java b/renren-admin/src/main/java/io/renren/modules/demanData/entity/TDemandDataEntityFlag.java index 59ea0574..adb3b4d8 100644 --- a/renren-admin/src/main/java/io/renren/modules/demanData/entity/TDemandDataEntityFlag.java +++ b/renren-admin/src/main/java/io/renren/modules/demanData/entity/TDemandDataEntityFlag.java @@ -14,15 +14,15 @@ public enum TDemandDataEntityFlag { /** * 1:审批中 */ - UNDER_REVIEW(1, "审批中"), + UNDER_REVIEW(1, "审核中"), /** * 2：审批拒绝 */ - REJECT(2, "审批拒绝"), + REJECT(2, "拒绝"), /** * 3:审批通过 */ - APPROVE(3, "审批通过"), + APPROVE(3, "通过"), /** * 4:未知 */ diff --git a/renren-admin/src/main/java/io/renren/modules/demandComment/entity/TDemandCommentEntityDelFlag.java b/renren-admin/src/main/java/io/renren/modules/demandComment/entity/TDemandCommentEntityDelFlag.java index e57cc2bc..7819b0ec 100644 --- a/renren-admin/src/main/java/io/renren/modules/demandComment/entity/TDemandCommentEntityDelFlag.java +++ b/renren-admin/src/main/java/io/renren/modules/demandComment/entity/TDemandCommentEntityDelFlag.java @@ -11,7 +11,7 @@ public enum TDemandCommentEntityDelFlag { /** * 正常 */ - NORMAL(0, "正常"), + NORMAL(0, "通过"), /** * 已删除 */ diff --git a/renren-admin/src/main/java/io/renren/modules/processForm/controller/TAbilityApplicationController.java b/renren-admin/src/main/java/io/renren/modules/processForm/controller/TAbilityApplicationController.java index 4995273f..c89e380c 100644 --- a/renren-admin/src/main/java/io/renren/modules/processForm/controller/TAbilityApplicationController.java +++ b/renren-admin/src/main/java/io/renren/modules/processForm/controller/TAbilityApplicationController.java @@ -88,7 +88,9 @@ public class TAbilityApplicationController { @ApiImplicitParams({@ApiImplicitParam(name = Constant.PAGE, value = "当前页码，从1开始", paramType = "query", required = true, dataType = "int"), @ApiImplicitParam(name = Constant.LIMIT, value = "每页显示记录数", paramType = "query", required = true, dataType = "int"), @ApiImplicitParam(name = Constant.ORDER_FIELD, value = "排序字段", paramType = "query", dataType = "String"), - @ApiImplicitParam(name = Constant.ORDER, value = "排序方式，可选值(asc、desc)", paramType = "query", dataType = "String")}) + @ApiImplicitParam(name = Constant.ORDER, value = "排序方式，可选值(asc、desc)", paramType = "query", dataType = "String"), + @ApiImplicitParam(name = "ended", value = "是否完成(true, false)", paramType = "query", dataType = "String")} + ) public Result> myPage(@ApiIgnore @RequestParam Map params) { final UserDetail user = SecurityUser.getUser(); params.put("abilityprocess_v2", Boolean.TRUE); // 是否根据流程 abilityprocess_v2 来分页 diff --git a/renren-admin/src/main/java/io/renren/modules/processForm/dto/TAbilityApplicationDTO.java b/renren-admin/src/main/java/io/renren/modules/processForm/dto/TAbilityApplicationDTO.java index 98cce623..e9d4dbd8 100644 --- a/renren-admin/src/main/java/io/renren/modules/processForm/dto/TAbilityApplicationDTO.java +++ b/renren-admin/src/main/java/io/renren/modules/processForm/dto/TAbilityApplicationDTO.java @@ -88,4 +88,7 @@ public class TAbilityApplicationDTO extends AuditingBaseDTO implements Serializa @ApiModelProperty(value = "创建时间") private Date createDate; + + @ApiModelProperty(value = "整个申请单是否结束") + private boolean isEnded; } \ No newline at end of file diff --git a/renren-admin/src/main/java/io/renren/modules/processForm/dto/TAbilityApplicationV2DTO.java b/renren-admin/src/main/java/io/renren/modules/processForm/dto/TAbilityApplicationV2DTO.java index 731676fc..eb39e556 100644 --- a/renren-admin/src/main/java/io/renren/modules/processForm/dto/TAbilityApplicationV2DTO.java +++ b/renren-admin/src/main/java/io/renren/modules/processForm/dto/TAbilityApplicationV2DTO.java @@ -61,6 +61,9 @@ public class TAbilityApplicationV2DTO implements Serializable { @ApiModelProperty(value = "申请单号") private String applyNumber; + @ApiModelProperty(value = "整个申请单是否结束") + private boolean isEnded; + // 以上为申请时公共信息 @ApiModelProperty(value = "资源申请情况(包含资源信息和流程流转)") diff --git a/renren-admin/src/main/java/io/renren/modules/processForm/service/impl/TAbilityApplicationServiceImpl.java b/renren-admin/src/main/java/io/renren/modules/processForm/service/impl/TAbilityApplicationServiceImpl.java index e8ae898f..7e2732d1 100644 --- a/renren-admin/src/main/java/io/renren/modules/processForm/service/impl/TAbilityApplicationServiceImpl.java +++ b/renren-admin/src/main/java/io/renren/modules/processForm/service/impl/TAbilityApplicationServiceImpl.java @@ -37,7 +37,6 @@ public class TAbilityApplicationServiceImpl extends CrudServiceImpl