履职任务调试

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/resumption/controller/ResumptionRecordController.java

@@ -0,0 +1,97 @@
+package com.xunmei.core.resumption.controller;
+
+import com.xunmei.common.core.vo.IdNameVo;
+import com.xunmei.common.core.web.controller.BaseController;
+import com.xunmei.common.core.web.domain.AjaxResult;
+import com.xunmei.common.core.web.page.TableDataInfo;
+import com.xunmei.core.resumption.dto.resumptionRecord.ResumptionNFCDto;
+import com.xunmei.core.resumption.dto.resumptionRecord.ResumptionRecordPageDto;
+import com.xunmei.core.resumption.dto.resumptionRecord.ResumptionRoleDto;
+import com.xunmei.core.resumption.service.IResumptionRecordService;
+import com.xunmei.core.resumption.vo.resumptionRecord.NFCRecordVo;
+import com.xunmei.core.resumption.vo.resumptionRecord.ResumptionRecordInfoVo;
+import com.xunmei.core.resumption.vo.resumptionRecord.ResumptionRoleVo;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+import javax.servlet.http.HttpServletResponse;
+import javax.validation.Valid;
+import java.util.List;
+
+/**
+ * @author jingyuanchao
+ * @date 2022/5/11 14:24
+ */
+@Slf4j
+@Api(description = "履职记录")
+@RestController
+@RequestMapping("/resumption/record")
+public class ResumptionRecordController extends BaseController {
+    @Resource
+    IResumptionRecordService resumptionRecordService;
+
+    @ApiOperation(value = "履职记录分页")
+    @PostMapping("/page")
+    public TableDataInfo page(@RequestBody @Valid ResumptionRecordPageDto pageDto) {
+        return resumptionRecordService.selectList(pageDto);
+    }
+
+    @ApiOperation(value = "履职记录详情")
+    @GetMapping("/{id}")
+    public AjaxResult list(@PathVariable String id) {
+        List<ResumptionRecordInfoVo> list = resumptionRecordService.selectInfo(id);
+        return success(list);
+    }
+
+//    @ApiOperation(value = "secBookDtInst字典表")
+//    @GetMapping("/sec")
+//    public JsonResponse<?> sec() {
+//        return JsonResponse.success(resumptionRecordService.selectSecBookDtInstList());
+//    }
+
+
+    @ApiOperation(value = "履职记录角色下拉框")
+    @PostMapping("/role")
+    public AjaxResult role(@RequestBody ResumptionRoleDto roleDto) {
+        List<IdNameVo> list = resumptionRecordService.selectResumptionRole(roleDto);
+
+        return success(list);
+    }
+
+//    @ApiOperation(value = "履职计划下拉框")
+//    @PostMapping("/plan")
+//    public JsonResponse<?> plan(@RequestBody ResumptionRoleDto roleDto) {
+//        List<ResumptionRoleVo> list = resumptionRecordService.selectResumptionPlan(roleDto);
+//        return JsonResponse.success(list);
+//    }
+
+
+    @ApiOperation(value = "履职记录NFC记录")
+    @PostMapping("/nfc")
+    public AjaxResult nfc(@RequestBody ResumptionNFCDto dto) {
+        List<NFCRecordVo> list = resumptionRecordService.selectNFCRecord(dto);
+        return success(list);
+    }
+   /* @ApiOperation(value = "履职记录导出")
+    @PostMapping("/export")
+    public JsonResponse<?> export(@RequestBody ResumptionRecordPageDto pageDto) {
+        String export = StringUtil.EMPTY_STRING;
+        try {
+            export = resumptionRecordService.export(pageDto);
+            return JsonResponse.success(export);
+        } catch (FileNotFoundException e) {
+            log.error("履职记录下载失败,{}", e.getMessage());
+            e.printStackTrace();
+        }
+        return JsonResponse.fail(export);
+    }*/
+   @ApiOperation(value = "履职记录导出")
+   @PostMapping("/export")
+   public void export(@RequestBody ResumptionRecordPageDto pageDto, HttpServletResponse response) throws Exception {
+
+       resumptionRecordService.export(pageDto,response);
+   }
+}

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/resumption/dto/resumptionRecord/ResumptionRoleDto.java

@@ -11,16 +11,12 @@ import java.util.List;
  */
 @Data
 public class ResumptionRoleDto {
-    @ApiModelProperty("机构id")
-    private Long orgId;
-
-    @ApiModelProperty("执行周期")
-    private Integer  type;
-
-    @ApiModelProperty("机构id")
-    private List<Long> idList;
-
-    private Long roleId;
-    private String orgPath;
-
+//    @ApiModelProperty("机构id")
+//    private Long orgId;
+//
+//    @ApiModelProperty("执行周期")
+//    private Integer  type;
+//
+//    @ApiModelProperty("机构id")
+//    private List<Long> idList;
 }

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/resumption/mapper/ResumptionRecordMapper.java

@@ -1,6 +1,7 @@
 package com.xunmei.core.resumption.mapper;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.xunmei.common.core.vo.IdNameVo;
 import com.xunmei.core.resumption.vo.resumptionRecord.AppResumptionDataInfoVo;
 import com.xunmei.core.resumption.dto.resumptionRecord.ResumptionNFCDto;
 import com.xunmei.core.resumption.dto.resumptionRecord.ResumptionRecordPageDto;
@@ -25,8 +26,9 @@ import java.util.Set;
  */
 @Mapper
 public interface ResumptionRecordMapper {
-//    @DS(DataSourceName.SHARDING_DATA_SOURCE_NAME)
+    //    @DS(DataSourceName.SHARDING_DATA_SOURCE_NAME)
     List<ResumptionRecordPageVo> selectListByCondition(@Param("pageDto") ResumptionRecordPageDto pageDto, @Param("hashMap") HashMap<String, Object> hashMap, @Param("isTime") Boolean isTime, @Param("ymdQuarters") Set<Integer> ymdQuarters);
+
     //@DS(DataSourceName.SHARDING_DATA_SOURCE_NAME)
 //    @DS(DataSourceName.SHARDING_DATA_SOURCE_NAME)
     Page<ResumptionRecordPageVo> selectPageByCondition(@Param("page") Page<ResumptionRecordPageVo> page, @Param("pageDto") ResumptionRecordPageDto pageDto, @Param("hashMap") HashMap<String, Object> hashMap, @Param("isTime") Boolean isTime, @Param("ymdQuarters") Set<Integer> ymdQuarters);
@@ -39,15 +41,16 @@ public interface ResumptionRecordMapper {
      */
     List<ResumptionRecordInfoVo> selectInfo(@Param("resumptionId") String resumptionId);
 
-//    List<ResumptionRoleVo> selectResumptionRole(@Param("roleDto") ResumptionRoleDto roleDto);
+    //    List<ResumptionRoleVo> selectResumptionRole(@Param("roleDto") ResumptionRoleDto roleDto);
 //    @DS(DataSourceName.SHARDING_DATA_SOURCE_NAME)
     List<AppResumptionDataInfoVo> selectResumptionDataList(@Param("resumptionId") String resumptionId);
-//    @DS(DataSourceName.SHARDING_DATA_SOURCE_NAME)
+
+    //    @DS(DataSourceName.SHARDING_DATA_SOURCE_NAME)
     List<NFCRecordVo> selectNFCRecord(@Param("dto") ResumptionNFCDto dto);
 
 //    List<SecBookDtInst> selectSecBookDtInstList();
 
-//    List<SecBookDtiInst> selectSecBookDtiInstList(@Param("secBookDtInstId") Long secBookDtInstId);
+    //    List<SecBookDtiInst> selectSecBookDtiInstList(@Param("secBookDtInstId") Long secBookDtInstId);
 //    @DS(DataSourceName.SHARDING_DATA_SOURCE_NAME)
     List<AppResumptionDataInfoVo> selectDataInfo(@Param("ruleItemId") Long ruleItemId, @Param("resumptionId") String resumptionId);
 
@@ -57,15 +60,18 @@ public interface ResumptionRecordMapper {
 
     ResumptionRecordInfoVo selectRuleItemInfo(@Param("ruleItemId") Long ruleItemId);
 
-//    List<ResumptionRoleVo> selectResumptionPlan(@Param("planDto") ResumptionRoleDto planDto);
+    //    List<ResumptionRoleVo> selectResumptionPlan(@Param("planDto") ResumptionRoleDto planDto);
 //    @DS(DataSourceName.SHARDING_DATA_SOURCE_NAME)
 //    RegisterBookItemInfoVo selectData(@Param("id") String id);
 //    @DS(DataSourceName.SHARDING_DATA_SOURCE_NAME)
     List<Long> selectResumptionDataPointId(@Param("id") String id);
 
+    List<IdNameVo> selectResumptionRoles();
+
     List<ResumptionRecordTempVo> selectAbnormalData(@Param("ruleItemIdList") List<Long> ruleItemIdList, @Param("resumptionIdList") List<String> resumptionIdList);
-//    @DS(DataSourceName.SHARDING_DATA_SOURCE_NAME)
-    List<Long> selectItemIdList(@Param("resumptionId")String resumptionId);
+
+    //    @DS(DataSourceName.SHARDING_DATA_SOURCE_NAME)
+    List<Long> selectItemIdList(@Param("resumptionId") String resumptionId);
 
     List<Long> selectRuleItemIdListNew(@Param("ruleItemIdList") List<Long> ruleItemIdList);
 }

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/resumption/service/IResumptionRecordService.java

@@ -1,5 +1,6 @@
 package com.xunmei.core.resumption.service;
 
+import com.xunmei.common.core.vo.IdNameVo;
 import com.xunmei.common.core.web.page.TableDataInfo;
 import com.xunmei.core.resumption.dto.resumptionRecord.ResumptionNFCDto;
 import com.xunmei.core.resumption.dto.resumptionRecord.ResumptionRecordPageDto;
@@ -25,7 +26,7 @@ public interface IResumptionRecordService {
 
     List<ResumptionRecordInfoVo> selectInfo(String resumptionId);
 
-//    List<ResumptionRoleVo> selectResumptionRole(ResumptionRoleDto roleDto);
+    List<IdNameVo> selectResumptionRole(ResumptionRoleDto roleDto);
 
     List<NFCRecordVo> selectNFCRecord(ResumptionNFCDto dto);
 

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/resumption/service/impl/ResumptionRecordServiceImpl.java

@@ -16,6 +16,7 @@ import com.xunmei.common.core.web.page.TableDataInfo;
 import com.xunmei.core.resumption.domain.AppResumptionTaskDataRemarkimg;
 import com.xunmei.core.resumption.dto.resumptionRecord.ResumptionNFCDto;
 import com.xunmei.core.resumption.dto.resumptionRecord.ResumptionRecordPageDto;
+import com.xunmei.core.resumption.dto.resumptionRecord.ResumptionRoleDto;
 import com.xunmei.core.resumption.mapper.AppPlanMapper;
 import com.xunmei.core.resumption.mapper.AppResumptionTaskDataRemarkimgMapper;
 import com.xunmei.core.resumption.mapper.ResumptionRecordMapper;
@@ -286,7 +287,7 @@ public class ResumptionRecordServiceImpl implements IResumptionRecordService {
                     dataInfoVo.setAppResumptionDataImgList(imgList);
                     final String executeResult = dataInfoVo.getExecuteResult();
                     if (StringUtils.isNotEmpty(executeResult)) {
-                        final Long dataTypeId = dataInfoVo.getDataTypeId();
+//                        final Long dataTypeId = dataInfoVo.getDataTypeId();
 //                        final SecBookDtInst secBookDtInst = secBookDtList.stream().filter(sec -> sec.getId().equals(dataTypeId)).findFirst().orElse(null);
 //                        if (secBookDtInst != null) {
 //                            final List<SecBookDtiInst> dataItemList = secBookDtInst.getDataItemList();
@@ -318,15 +319,11 @@ public class ResumptionRecordServiceImpl implements IResumptionRecordService {
         return arrayList;
     }
 
-//    @Override
-//    public List<ResumptionRoleVo> selectResumptionRole(ResumptionRoleDto roleDto) {
-//        // 1.12.1版本性能优化，此接口不再从履职数据中获取，根据履职计划查询
-//        /*final Org org = orgService.find(roleDto.getOrgId());
-//        roleDto.setOrgPath(org.getPath());
-//        return resumptionRecordMapper.selectResumptionRole(roleDto);*/
-//        return objectMapper.selectResumptionRoleIdAndName(roleDto);
-//    }
-//
+    @Override
+    public List<IdNameVo> selectResumptionRole(ResumptionRoleDto roleDto) {
+        return resumptionRecordMapper.selectResumptionRoles();
+    }
+
 //    @Override
 //    public List<ResumptionRoleVo> selectResumptionPlan(ResumptionRoleDto planDto) {
 //        /*final Org org = orgService.find(planDto.getOrgId());

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/resumption/vo/resumptionRecord/AppResumptionDataInfoVo.java

@@ -14,21 +14,17 @@ import java.util.List;
  */
 @Data
 public class AppResumptionDataInfoVo {
-
-    @ApiModelProperty("检查点编号")
-    private Integer rulePointNum;
-
     @ApiModelProperty("履职任务详情id")
     private Long dataId;
 
-    @ApiModelProperty("检查点名称")
-    private String rulePointName;
+    @ApiModelProperty("履职内容")
+    private String pointName;
 
 //    @ApiModelProperty(value = "安防类型,字典表")
 //    private String safeType;
 
     @ApiModelProperty(value = "检查区域,区域表id")
-    private String checkAreaName;
+    private String areaName;
 
     @ApiModelProperty(value = "执行结果")
     private String executeResult;
@@ -49,8 +45,4 @@ public class AppResumptionDataInfoVo {
 
     @ApiModelProperty(value = "状态")
     private Integer executeStatus;
-
-    @ApiModelProperty("数据类型id")
-    private Long dataTypeId;
-
 }

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/resumption/vo/resumptionRecord/ResumptionRecordInfoVo.java

@@ -14,19 +14,13 @@ public class ResumptionRecordInfoVo {
     @ApiModelProperty(value = "任务id")
     private String resumptionId;
 
-    @ApiModelProperty(value = "检查项id")
+    @ApiModelProperty(value = "履职项id")
     private Long itemId;
 
-    @ApiModelProperty(value = "检查项编号")
-    private Integer itemNum;
-
-    @ApiModelProperty(value = "检查项名称")
+    @ApiModelProperty(value = "履职项名称")
     private String itemName;
 
-    @ApiModelProperty(value = "检查项标准及要求")
-    private String itemDesc;
-
-    @ApiModelProperty(value = "标题")
+    @ApiModelProperty(value = "任务名称")
     private String planName;
 
     private List<AppResumptionDataInfoVo> dataInfoList;

soc-modules/soc-modules-core/src/main/resources/mapper/resumption/ResumptionRecordMapper.xml

@@ -235,7 +235,7 @@
     <resultMap id="infoResultMap" type="com.xunmei.core.resumption.vo.resumptionRecord.ResumptionRecordInfoVo">
         <id column="id" jdbcType="BIGINT" javaType="java.lang.Long" property="itemId"/>
         <result column="item_name" jdbcType="VARCHAR" javaType="java.lang.String" property="itemName"/>
-        <result column="item_desc" jdbcType="VARCHAR" javaType="java.lang.String" property="itemDesc"/>
+<!--        <result column="item_desc" jdbcType="VARCHAR" javaType="java.lang.String" property="itemDesc"/>-->
         <collection property="dataInfoList"
                     ofType="com.xunmei.core.resumption.vo.resumptionRecord.AppResumptionDataInfoVo"
                     select="selectResumptionDataList"
@@ -246,8 +246,7 @@
     <select id="selectInfo" parameterType="java.lang.String" resultMap="infoResultMap">
         select distinct #{resumptionId} as resumptionId,
                         i.id,
-                        i.item_name,
-                        i.item_desc
+                        i.item_name
         from core_resumption_rule_item i
         where i.id in (select item_id
                        from core_resumption_plan_to_item pti
@@ -310,10 +309,8 @@
 <!--    </select>-->
 
     <select id="selectDataInfo" resultType="com.xunmei.core.resumption.vo.resumptionRecord.AppResumptionDataInfoVo">
-        SELECT p.point_num   AS rulePointNum,
-               p.point_name  AS rulePointName,
-               p.safe_type   AS safeType,
-               a.`name`      AS checkAreaName,
+        SELECT  p.point_name  AS pointName,
+               a.`name`      AS areaName,
                d.res_value   AS executeResult,
                d.submit_time AS executeTime,
                d.res_remark  AS resRemark,
@@ -325,7 +322,6 @@
                  INNER JOIN sys_area a ON a.id = p.area_id
         WHERE d.resumption_id = #{resumptionId}
           and p.item_id = #{ruleItemId}
-
     </select>
 
     <select id="selectRuleItemIdList" resultType="java.lang.Long">
@@ -369,13 +365,13 @@
         </if>
     </select>
 
-    <select id="selectData" resultType="com.xunmei.core.resumption.vo.registerBook.RegisterBookItemInfoVo">
-        select distinct o.name as orgName, r.start_time as date, #{id} as resumptionId
-        from core_resumption r
-                 inner join sys_org o on r.org_id = o.id
-                 inner join core_resumption_data d on r.id = d.resumption_id
-        where d.resumption_id = #{id}
-    </select>
+<!--    <select id="selectData" resultType="com.xunmei.core.resumption.vo.registerBook.RegisterBookItemInfoVo">-->
+<!--        select distinct o.name as orgName, r.start_time as date, #{id} as resumptionId-->
+<!--        from core_resumption r-->
+<!--                 inner join sys_org o on r.org_id = o.id-->
+<!--                 inner join core_resumption_data d on r.id = d.resumption_id-->
+<!--        where d.resumption_id = #{id}-->
+<!--    </select>-->
 
     <select id="selectResumptionDataPointId" resultType="java.lang.Long">
         select item_id
@@ -408,4 +404,16 @@
             #{rulePointId}
         </foreach>
     </select>
+
+    <select id="selectResumptionRoles" resultType="com.xunmei.common.core.vo.IdNameVo">
+        select distinctrow r.id,r.name
+        from core_resumption_plan p
+        inner join core_resumption_plan_to_role pr on p.id=pr.plan_id
+        inner join sys_role r on pr.role_id=r.id
+        where p.plan_status = 0
+<!--        <if test="roleDto.type != null">-->
+<!--            and plan_cycle=#{roleDto.type}-->
+<!--        </if>-->
+
+    </select>
 </mapper>