From f7961d26a2626136ecc6803a655ee85e39533cea Mon Sep 17 00:00:00 2001
From: zhongrj <646384940@qq.com>
Date: Mon, 03 Apr 2023 20:05:42 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/jtdev' into jtdev
---
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/patrol/service/IPatrolRecordService.java | 2 +
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/patrol/mapper/PatrolGroupItemMapper.xml | 8 ++++
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/patrol/vo/PatrolRecordVO.java | 12 ++++++
skjcmanager/skjcmanager-service/skjcmanager-system/src/main/java/cn/gistack/system/controller/MenuController.java | 14 +++---
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/patrol/mapper/PatrolRecordMapper.java | 2 +
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/patrol/service/impl/PatrolRecordServiceImpl.java | 5 ++
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/patrol/service/IPatrolGroupItemService.java | 2 +
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/patrol/controller/PatrolGroupItemController.java | 12 ++++++
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/patrol/controller/PatrolRecordController.java | 27 +++++++++----
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/patrol/service/impl/PatrolGroupItemServiceImpl.java | 5 ++
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/patrol/mapper/PatrolGroupItemMapper.java | 2 +
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/patrol/mapper/PatrolRecordMapper.xml | 28 +++++++++++++
12 files changed, 103 insertions(+), 16 deletions(-)
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/patrol/controller/PatrolGroupItemController.java b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/patrol/controller/PatrolGroupItemController.java
index 0fce399..db6b5e7 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/patrol/controller/PatrolGroupItemController.java
+++ b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/patrol/controller/PatrolGroupItemController.java
@@ -124,5 +124,17 @@
return R.data(patrolGroupItem);
}
+ /**
+ * 通过itemIds查询
+ *
+ * @return
+ */
+ @ApiOperation(value="巡查指标项目-通过itemIds查询", notes="巡查指标项目-通过itemIds查询")
+ @GetMapping(value = "/getItemByItemIds")
+ public R getItemByItemIds(String itemIds,String groupId){
+ List<PatrolGroupItem> list = patrolGroupItemService.getItemByItemIds(itemIds,groupId);
+ return R.data(list);
+ }
+
}
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/patrol/controller/PatrolRecordController.java b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/patrol/controller/PatrolRecordController.java
index 4162ba0..b2e03f3 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/patrol/controller/PatrolRecordController.java
+++ b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/patrol/controller/PatrolRecordController.java
@@ -34,7 +34,7 @@
/**
* 分页列表查询
*/
- @ApiOperation(value="巡查类型-分页列表查询", notes="巡查类型-分页列表查询")
+ @ApiOperation(value="巡查记录-分页列表查询", notes="巡查记录-分页列表查询")
@GetMapping(value = "/list")
public R queryPageList(PatrolRecord patrolRecord, Query query) {
IPage<PatrolRecord> pageList = patrolRecordService.selectPatrolRecord(Condition.getPage(query),patrolRecord);
@@ -54,7 +54,7 @@
/**
* 添加
*/
- @ApiOperation(value="巡查类型-添加", notes="巡查类型-添加")
+ @ApiOperation(value="巡查记录-添加", notes="巡查记录-添加")
@PostMapping(value = "/add")
public R add(@RequestBody PatrolRecord patrolRecord) {
return R.data(patrolRecordService.save(patrolRecord));
@@ -63,7 +63,7 @@
/**
* 编辑
*/
- @ApiOperation(value="巡查类型-编辑", notes="巡查类型-编辑")
+ @ApiOperation(value="巡查记录-编辑", notes="巡查记录-编辑")
@RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST})
public R edit(@RequestBody PatrolRecord patrolRecord) {
return R.data(patrolRecordService.updateById(patrolRecord));
@@ -75,7 +75,7 @@
* @param id
* @return
*/
- @ApiOperation(value="巡查类型-通过id删除", notes="巡查类型-通过id删除")
+ @ApiOperation(value="巡查记录-通过id删除", notes="巡查记录-通过id删除")
@DeleteMapping(value = "/delete")
public R delete(@RequestParam(name="id",required=true) String id) {
return R.data(patrolRecordService.removeById(id));
@@ -87,7 +87,7 @@
* @param ids
* @return
*/
- @ApiOperation(value="巡查类型-批量删除", notes="巡查类型-批量删除")
+ @ApiOperation(value="巡查记录-批量删除", notes="巡查记录-批量删除")
@DeleteMapping(value = "/deleteBatch")
public R deleteBatch(@RequestParam(name="ids",required=true) String ids) {
return R.data(patrolRecordService.removeByIds(Arrays.asList(ids.split(","))));
@@ -99,7 +99,7 @@
* @param id
* @return
*/
- @ApiOperation(value="巡查类型-通过id查询", notes="巡查类型-通过id查询")
+ @ApiOperation(value="巡查记录-通过id查询", notes="巡查记录-通过id查询")
@GetMapping(value = "/queryById")
public R queryById(@RequestParam(name="id",required=true) String id) {
PatrolRecordVO patrolRecordVO = patrolRecordService.getDetail(id);
@@ -107,15 +107,26 @@
}
/**
- * 通过id查询
+ * 通过taskId,itemsIds查询(用来判断是否完成任务)
* @return
*/
- @ApiOperation(value="巡查类型-通过id查询", notes="巡查类型-通过id查询")
+ @ApiOperation(value="巡查记录-通过taskId,itemsIds查询", notes="巡查记录-通过taskId,itemsIds查询")
@GetMapping(value = "/getPatrolRecordByTaskId")
public R getPatrolRecordByTaskId(String taskId,String itemIds) {
List<PatrolGroupItemVO> list = patrolRecordService.getPatrolRecordByTaskId(taskId,itemIds);
return R.data(list);
}
+ /**
+ * 通过taskId,itemsIds查询(用来查询巡查记录)
+ * @return
+ */
+ @ApiOperation(value="巡查记录-通过itemId查询", notes="巡查记录-通过itemId查询")
+ @GetMapping(value = "/getByTaskIdAndItemId")
+ public R getByTaskIdAndItemId(String taskId,String itemIds){
+ List<PatrolRecordVO> list = patrolRecordService.getByTaskIdAndItemId(taskId,itemIds);
+ return R.data(list);
+ }
+
}
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/patrol/mapper/PatrolGroupItemMapper.java b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/patrol/mapper/PatrolGroupItemMapper.java
index 8a8cf98..0e6052d 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/patrol/mapper/PatrolGroupItemMapper.java
+++ b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/patrol/mapper/PatrolGroupItemMapper.java
@@ -15,4 +15,6 @@
List<PatrolGroupItemVO> selectPatrolGroupItemList(@Param("patrolGroupItem") PatrolGroupItemVO patrolGroupItem);
PatrolGroupItemVO getPatrolGroupItemVOById(@Param("id") Long id);
+
+ List<PatrolGroupItem> getItemByItemIds(@Param("itemIds") String itemIds,@Param("groupId") String groupId);
}
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/patrol/mapper/PatrolGroupItemMapper.xml b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/patrol/mapper/PatrolGroupItemMapper.xml
index fee6c24..096ce5b 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/patrol/mapper/PatrolGroupItemMapper.xml
+++ b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/patrol/mapper/PatrolGroupItemMapper.xml
@@ -26,4 +26,12 @@
WHERE item.is_deleted = 0
AND item.id = #{id}
</select>
+ <select id="getItemByItemIds" resultType="cn.gistack.sm.patrol.entity.PatrolGroupItem">
+ SELECT ID,GROUP_ID,ITEMS_NAME,DESCRIPTION FROM BLADEX.SM_PATROL_GROUP_ITEM
+ WHERE ID IN
+ <foreach collection="itemIds.split(',')" item="item" index="index" open="(" separator="," close=")">
+ #{item}
+ </foreach>
+ AND is_deleted = 0 AND group_id = #{groupId}
+ </select>
</mapper>
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/patrol/mapper/PatrolRecordMapper.java b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/patrol/mapper/PatrolRecordMapper.java
index 7abcca0..e3de405 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/patrol/mapper/PatrolRecordMapper.java
+++ b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/patrol/mapper/PatrolRecordMapper.java
@@ -13,4 +13,6 @@
PatrolRecordVO getDetail(@Param("id") String id);
PatrolRecord selectPatrolRecordByTaskIdAndItemId(@Param("taskId") String taskId, @Param("itemId") Long itemId);
+
+ List<PatrolRecordVO> getByTaskIdAndItemId(@Param("taskId") String taskId, @Param("itemIds") String itemIds);
}
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/patrol/mapper/PatrolRecordMapper.xml b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/patrol/mapper/PatrolRecordMapper.xml
index 4c6e39e..c81ddbb 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/patrol/mapper/PatrolRecordMapper.xml
+++ b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/patrol/mapper/PatrolRecordMapper.xml
@@ -6,13 +6,20 @@
<result column="id" property="id"/>
<result column="patrol_type" property="patrolType"/>
<result column="device_ids" property="deviceIds"/>
- <result column="images" property="images" typeHandler="com.baomidou.mybatisplus.extension.handlers.FastjsonTypeHandler"/>
+ <result column="images" property="images"
+ typeHandler="com.baomidou.mybatisplus.extension.handlers.FastjsonTypeHandler"/>
<result column="content" property="content"/>
<result column="status" property="status"/>
<result column="item_id" property="itemId"/>
<result column="task_id" property="taskId"/>
<result column="patrol_route" property="patrolRoute"/>
<result column="taskRoute" property="taskRoute"/>
+ <result property="groupName" column="groupName"/>
+ <result property="groupId" column="groupId"/>
+ <result property="itemsName" column="itemsName"/>
+ <result property="description" column="description"/>
+ <result property="patrolTime" column="update_time"/>
+ <result property="toUserId" column="to_user_id"/>
</resultMap>
<select id="selectPatrolRecord" resultMap="selectPatrolRecordList">
@@ -45,4 +52,23 @@
<select id="selectPatrolRecordByTaskIdAndItemId" resultType="cn.gistack.sm.patrol.entity.PatrolRecord">
SELECT id FROM sm_patrol_record WHERE is_deleted = 0 AND task_id = #{taskId} AND item_id = #{itemId}
</select>
+
+ <select id="getByTaskIdAndItemId" resultMap="selectPatrolRecordList">
+ SELECT r.id,r.patrol_type,r.device_ids,r.images,r.content,r.status,r.item_id,r.task_id,
+ c.name groupName,c.id groupId,c.items_name itemsName,c.description,t.update_time,t.to_user_id
+ FROM BLADEX.SM_PATROL_RECORD r
+ LEFT JOIN
+ (SELECT g.ID,g.NAME,a.id itemId, a.items_name,description FROM
+ (
+ SELECT ID,GROUP_ID,items_name,description FROM BLADEX.SM_PATROL_GROUP_ITEM WHERE ID IN
+ <foreach collection="itemIds.split(',')" item="item" index="index" open="(" separator="," close=")">
+ #{item}
+ </foreach>
+ ) a ,BLADEX.SM_PATROL_GROUP g
+ WHERE g.is_deleted = 0 AND a.group_id = g.id) c
+
+ ON c.itemId = r.item_id
+ LEFT JOIN BLADEX.SM_PATROL_TASK t ON t.id = r.task_id
+ where r.task_id = #{taskId}
+ </select>
</mapper>
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/patrol/service/IPatrolGroupItemService.java b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/patrol/service/IPatrolGroupItemService.java
index b5b5ad0..bd413fa 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/patrol/service/IPatrolGroupItemService.java
+++ b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/patrol/service/IPatrolGroupItemService.java
@@ -17,4 +17,6 @@
IPage<PatrolGroupItemVO> selectPatrolConfig(IPage<PatrolGroupItemVO> page, PatrolGroupItemVO patrolGroupItem);
PatrolGroupItemVO getPatrolGroupItemVOById(Long id);
+
+ List<PatrolGroupItem> getItemByItemIds(String itemIds,String groupId);
}
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/patrol/service/IPatrolRecordService.java b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/patrol/service/IPatrolRecordService.java
index 38c148f..0132642 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/patrol/service/IPatrolRecordService.java
+++ b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/patrol/service/IPatrolRecordService.java
@@ -22,4 +22,6 @@
* @return
*/
List<PatrolGroupItemVO> getPatrolRecordByTaskId(String taskId, String itemIds);
+
+ List<PatrolRecordVO> getByTaskIdAndItemId(String taskId, String itemIds);
}
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/patrol/service/impl/PatrolGroupItemServiceImpl.java b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/patrol/service/impl/PatrolGroupItemServiceImpl.java
index 9690377..031c289 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/patrol/service/impl/PatrolGroupItemServiceImpl.java
+++ b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/patrol/service/impl/PatrolGroupItemServiceImpl.java
@@ -33,4 +33,9 @@
public PatrolGroupItemVO getPatrolGroupItemVOById(Long id) {
return baseMapper.getPatrolGroupItemVOById(id);
}
+
+ @Override
+ public List<PatrolGroupItem> getItemByItemIds(String itemIds,String groupId) {
+ return baseMapper.getItemByItemIds(itemIds,groupId);
+ }
}
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/patrol/service/impl/PatrolRecordServiceImpl.java b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/patrol/service/impl/PatrolRecordServiceImpl.java
index 9b45e2f..a3ce5b5 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/patrol/service/impl/PatrolRecordServiceImpl.java
+++ b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/patrol/service/impl/PatrolRecordServiceImpl.java
@@ -49,4 +49,9 @@
return patrolGroupItemVOList;
}
+
+ @Override
+ public List<PatrolRecordVO> getByTaskIdAndItemId(String taskId, String itemIds) {
+ return baseMapper.getByTaskIdAndItemId(taskId,itemIds);
+ }
}
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/patrol/vo/PatrolRecordVO.java b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/patrol/vo/PatrolRecordVO.java
index 430beef..3e8ee4b 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/patrol/vo/PatrolRecordVO.java
+++ b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/patrol/vo/PatrolRecordVO.java
@@ -7,4 +7,16 @@
public class PatrolRecordVO extends PatrolRecord {
private String taskRoute;
+
+ private String groupName;
+
+ private String groupId;
+
+ private String itemsName;
+
+ private String description;
+
+ private String patrolTime;
+
+ private String toUserId;
}
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-system/src/main/java/cn/gistack/system/controller/MenuController.java b/skjcmanager/skjcmanager-service/skjcmanager-system/src/main/java/cn/gistack/system/controller/MenuController.java
index dfe346e..28f1e95 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-system/src/main/java/cn/gistack/system/controller/MenuController.java
+++ b/skjcmanager/skjcmanager-service/skjcmanager-system/src/main/java/cn/gistack/system/controller/MenuController.java
@@ -68,7 +68,7 @@
* 详情
*/
@GetMapping("/detail")
- @PreAuth(RoleConstant.HAS_ROLE_ADMINISTRATOR)
+ @PreAuth(RoleConstant.HAS_ROLE_ADMIN)
@ApiOperationSupport(order = 1)
@ApiOperation(value = "详情", notes = "传入menu")
public R<MenuVO> detail(Menu menu) {
@@ -84,7 +84,7 @@
@ApiImplicitParam(name = "code", value = "菜单编号", paramType = "query", dataType = "string"),
@ApiImplicitParam(name = "name", value = "菜单名称", paramType = "query", dataType = "string")
})
- @PreAuth(RoleConstant.HAS_ROLE_ADMINISTRATOR)
+ @PreAuth(RoleConstant.HAS_ROLE_ADMIN)
@ApiOperationSupport(order = 2)
@ApiOperation(value = "列表", notes = "传入menu")
public R<List<MenuVO>> list(@ApiIgnore @RequestParam Map<String, Object> menu) {
@@ -100,7 +100,7 @@
@ApiImplicitParam(name = "code", value = "菜单编号", paramType = "query", dataType = "string"),
@ApiImplicitParam(name = "name", value = "菜单名称", paramType = "query", dataType = "string")
})
- @PreAuth(RoleConstant.HAS_ROLE_ADMINISTRATOR)
+ @PreAuth(RoleConstant.HAS_ROLE_ADMIN)
@ApiOperationSupport(order = 3)
@ApiOperation(value = "懒加载列表", notes = "传入menu")
public R<List<MenuVO>> lazyList(Long parentId, @ApiIgnore @RequestParam Map<String, Object> menu) {
@@ -116,7 +116,7 @@
@ApiImplicitParam(name = "code", value = "菜单编号", paramType = "query", dataType = "string"),
@ApiImplicitParam(name = "name", value = "菜单名称", paramType = "query", dataType = "string")
})
- @PreAuth(RoleConstant.HAS_ROLE_ADMINISTRATOR)
+ @PreAuth(RoleConstant.HAS_ROLE_ADMIN)
@ApiOperationSupport(order = 4)
@ApiOperation(value = "菜单列表", notes = "传入menu")
public R<List<MenuVO>> menuList(@ApiIgnore @RequestParam Map<String, Object> menu) {
@@ -132,7 +132,7 @@
@ApiImplicitParam(name = "code", value = "菜单编号", paramType = "query", dataType = "string"),
@ApiImplicitParam(name = "name", value = "菜单名称", paramType = "query", dataType = "string")
})
- @PreAuth(RoleConstant.HAS_ROLE_ADMINISTRATOR)
+ @PreAuth(RoleConstant.HAS_ROLE_ADMIN)
@ApiOperationSupport(order = 5)
@ApiOperation(value = "懒加载菜单列表", notes = "传入menu")
public R<List<MenuVO>> lazyMenuList(Long parentId, @ApiIgnore @RequestParam Map<String, Object> menu) {
@@ -144,7 +144,7 @@
* 新增或修改
*/
@PostMapping("/submit")
- @PreAuth(RoleConstant.HAS_ROLE_ADMINISTRATOR)
+ @PreAuth(RoleConstant.HAS_ROLE_ADMIN)
@ApiOperationSupport(order = 6)
@ApiOperation(value = "新增或修改", notes = "传入menu")
public R submit(@Valid @RequestBody Menu menu) {
@@ -163,7 +163,7 @@
* 删除
*/
@PostMapping("/remove")
- @PreAuth(RoleConstant.HAS_ROLE_ADMINISTRATOR)
+ @PreAuth(RoleConstant.HAS_ROLE_ADMIN)
@ApiOperationSupport(order = 7)
@ApiOperation(value = "删除", notes = "传入ids")
public R remove(@ApiParam(value = "主键集合", required = true) @RequestParam String ids) {
--
Gitblit v1.9.3