item：监督检查业检查项关系删除接口新增

amos-boot-module/amos-boot-module-biz/amos-boot-module-supervision-biz/src/main/java/com/yeejoin/amos/supervision/business/controller/RoutePointItemController.java

@@ -6,7 +6,7 @@ import com.yeejoin.amos.supervision.business.service.intfc.IRoutePointItemServic
 import com.yeejoin.amos.supervision.business.util.CommonResponse;
 import com.yeejoin.amos.supervision.business.util.CommonResponseUtil;
 import com.yeejoin.amos.supervision.business.util.InputItemParamUtil;
-import com.yeejoin.amos.supervision.business.vo.InputItemVo;
+import com.yeejoin.amos.supervision.business.vo.RoutePointItemVo;
 import com.yeejoin.amos.supervision.core.common.request.CommonPageable;
 import com.yeejoin.amos.supervision.core.common.request.CommonRequest;
 import com.yeejoin.amos.supervision.dao.entity.Plan;
@@ -88,7 +88,26 @@ public class RoutePointItemController extends AbstractBaseController {
         HashMap<String, Object> paramMap = new HashMap<String, Object>();
         paramMap.put("orgCode", loginOrgCode);
         InputItemPageParam criterias = InputItemParamUtil.fillInputItemPageParam(queryRequests, pageable, paramMap);
-        Page<InputItemVo> page = routePointItemService.queryPage(criterias);
+        Page<RoutePointItemVo> page = routePointItemService.queryPage(criterias);
         return CommonResponseUtil.success(page);
     }
+
+    /**
+     * 删除巡检路线点项关系
+     *
+     * @param ids
+     * @return CommonResponse
+     */
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @ApiOperation(value = "删除巡检路线点项关系", notes = "删除巡检路线点项关系")
+    @PostMapping(value = "/deleteByIdIn", produces = "application/json;charset=UTF-8")
+    public CommonResponse deleteByIdIn(@ApiParam(value = "ids", required = true) @RequestParam List<Long> ids) {
+        try {
+            routePointItemService.deleteByIdIn(ids);
+            return CommonResponseUtil.success();
+        } catch (Exception e) {
+            log.error(e.getMessage(), e);
+            return CommonResponseUtil.failure("删除巡检路线点项关系失败！");
+        }
+    }
 }

amos-boot-module/amos-boot-module-biz/amos-boot-module-supervision-biz/src/main/java/com/yeejoin/amos/supervision/business/dao/mapper/RoutePointItemMapper.java

@@ -2,18 +2,18 @@ package com.yeejoin.amos.supervision.business.dao.mapper;
 
 
 import com.yeejoin.amos.supervision.business.param.InputItemPageParam;
-import com.yeejoin.amos.supervision.business.vo.InputItemVo;
+import com.yeejoin.amos.supervision.business.vo.RoutePointItemVo;
 import com.yeejoin.amos.supervision.dao.entity.RoutePointItem;
 
 import java.util.List;
 
-public interface RoutePointItemMapper extends BaseMapper{
+public interface RoutePointItemMapper extends BaseMapper {
 
-    public void updateRoutePointItem( RoutePointItem pointItem);
+    public void updateRoutePointItem(RoutePointItem pointItem);
 
     int delRoutePointItemByRouteId(Long routeId);
 
     long queryPageCount(InputItemPageParam param);
 
-    List<InputItemVo> queryPage(InputItemPageParam param);
+    List<RoutePointItemVo> queryPage(InputItemPageParam param);
 }

amos-boot-module/amos-boot-module-biz/amos-boot-module-supervision-biz/src/main/java/com/yeejoin/amos/supervision/business/dao/repository/IRoutePointItemDao.java

@@ -22,7 +22,7 @@ public interface IRoutePointItemDao extends BaseDao<RoutePointItem, Long> {
     @Modifying
     @Transactional
     @Query(value = "delete from p_route_point_item WHERE id in (?1)", nativeQuery = true)
-    void deleteByRoutePointItemId(List<Long> delRoutePointItemIds);
+    int deleteByRoutePointItemId(List<Long> delRoutePointItemIds);
 
     @Modifying
     @Transactional

amos-boot-module/amos-boot-module-biz/amos-boot-module-supervision-biz/src/main/java/com/yeejoin/amos/supervision/business/service/impl/CheckServiceImpl.java

 
 package com.yeejoin.amos.supervision.business.service.impl;
 
-import java.text.SimpleDateFormat;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import java.util.stream.Collectors;
-
-import javax.annotation.Resource;
-import javax.transaction.Transactional;
-
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
+import com.google.common.base.Joiner;
+import com.google.common.collect.Lists;
+import com.google.common.collect.Maps;
+import com.yeejoin.amos.boot.biz.common.bo.DepartmentBo;
 import com.yeejoin.amos.boot.biz.common.bo.ReginParams;
+import com.yeejoin.amos.feign.privilege.model.AgencyUserModel;
+import com.yeejoin.amos.feign.privilege.model.CompanyModel;
+import com.yeejoin.amos.feign.privilege.model.DepartmentModel;
 import com.yeejoin.amos.supervision.business.constants.XJConstant;
 import com.yeejoin.amos.supervision.business.dao.mapper.CheckMapper;
+import com.yeejoin.amos.supervision.business.dao.mapper.PlanTaskDetailMapper;
+import com.yeejoin.amos.supervision.business.dao.mapper.PlanTaskMapper;
+import com.yeejoin.amos.supervision.business.dao.mapper.RouteMapper;
+import com.yeejoin.amos.supervision.business.dao.repository.*;
+import com.yeejoin.amos.supervision.business.dto.CheckDto;
+import com.yeejoin.amos.supervision.business.dto.CheckRecordDto;
+import com.yeejoin.amos.supervision.business.entity.mybatis.*;
+import com.yeejoin.amos.supervision.business.feign.EquipFeign;
 import com.yeejoin.amos.supervision.business.param.*;
 import com.yeejoin.amos.supervision.business.service.intfc.ICheckService;
 import com.yeejoin.amos.supervision.business.service.intfc.IEquipmentHandlerService;
 import com.yeejoin.amos.supervision.business.service.intfc.IPlanTaskService;
 import com.yeejoin.amos.supervision.business.service.intfc.IPointService;
+import com.yeejoin.amos.supervision.business.util.CheckDetailInputPageParam;
 import com.yeejoin.amos.supervision.business.util.ToolUtils;
 import com.yeejoin.amos.supervision.business.vo.CheckAnalysisVo;
 import com.yeejoin.amos.supervision.business.vo.CheckInfoVo;
 import com.yeejoin.amos.supervision.business.vo.CheckVo;
-import com.yeejoin.amos.supervision.business.vo.RoutePointItemVo;
 import com.yeejoin.amos.supervision.common.enums.*;
 import com.yeejoin.amos.supervision.core.common.request.CommonPageable;
+import com.yeejoin.amos.supervision.core.common.response.*;
 import com.yeejoin.amos.supervision.core.util.DateUtil;
 import com.yeejoin.amos.supervision.core.util.StringUtil;
+import com.yeejoin.amos.supervision.dao.entity.*;
 import com.yeejoin.amos.supervision.feign.RemoteSecurityService;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.cxf.common.util.CollectionUtils;
@@ -46,58 +50,10 @@ import org.springframework.stereotype.Service;
 import org.springframework.util.ObjectUtils;
 import org.typroject.tyboot.core.foundation.utils.Bean;
 
-import com.alibaba.fastjson.JSONArray;
-import com.alibaba.fastjson.JSONObject;
-import com.google.common.base.Joiner;
-import com.google.common.collect.Lists;
-import com.google.common.collect.Maps;
-import com.yeejoin.amos.boot.biz.common.bo.DepartmentBo;
-import com.yeejoin.amos.feign.privilege.model.AgencyUserModel;
-import com.yeejoin.amos.feign.privilege.model.CompanyModel;
-import com.yeejoin.amos.feign.privilege.model.DepartmentModel;
-import com.yeejoin.amos.supervision.business.dao.mapper.PlanTaskDetailMapper;
-import com.yeejoin.amos.supervision.business.dao.mapper.PlanTaskMapper;
-import com.yeejoin.amos.supervision.business.dao.mapper.RouteMapper;
-import com.yeejoin.amos.supervision.business.dao.repository.ICatalogTreeDao;
-import com.yeejoin.amos.supervision.business.dao.repository.ICheckDao;
-import com.yeejoin.amos.supervision.business.dao.repository.ICheckInputDao;
-import com.yeejoin.amos.supervision.business.dao.repository.ICheckShotDao;
-import com.yeejoin.amos.supervision.business.dao.repository.IInputItemDao;
-import com.yeejoin.amos.supervision.business.dao.repository.IPlanTaskDao;
-import com.yeejoin.amos.supervision.business.dao.repository.IPlanTaskDetailDao;
-import com.yeejoin.amos.supervision.business.dao.repository.IPointClassifyDao;
-import com.yeejoin.amos.supervision.business.dao.repository.IPointDao;
-import com.yeejoin.amos.supervision.business.dto.CheckDto;
-import com.yeejoin.amos.supervision.business.dto.CheckRecordDto;
-import com.yeejoin.amos.supervision.business.entity.mybatis.CheckDetailBo;
-import com.yeejoin.amos.supervision.business.entity.mybatis.CheckInfoBo;
-import com.yeejoin.amos.supervision.business.entity.mybatis.CheckInputBo;
-import com.yeejoin.amos.supervision.business.entity.mybatis.CheckTraListBo;
-import com.yeejoin.amos.supervision.business.entity.mybatis.CheckUserBo;
-import com.yeejoin.amos.supervision.business.entity.mybatis.EquipmentInputItemRo;
-import com.yeejoin.amos.supervision.business.entity.mybatis.PlanRoutePointBo;
-import com.yeejoin.amos.supervision.business.entity.mybatis.PointCheckDetailBo;
-import com.yeejoin.amos.supervision.business.feign.EquipFeign;
-import com.yeejoin.amos.supervision.business.util.CheckDetailInputPageParam;
-import com.yeejoin.amos.supervision.business.util.Toke;
-import com.yeejoin.amos.supervision.core.common.response.AppCheckInputRespone;
-import com.yeejoin.amos.supervision.core.common.response.AppPointCheckRespone;
-import com.yeejoin.amos.supervision.core.common.response.CalendarStatusCountRespone;
-import com.yeejoin.amos.supervision.core.common.response.CommonPage;
-import com.yeejoin.amos.supervision.core.common.response.GraphInitDataResponse;
-import com.yeejoin.amos.supervision.core.common.response.PatrolUserRespone;
-import com.yeejoin.amos.supervision.core.common.response.PointInfoResponse;
-import com.yeejoin.amos.supervision.core.common.response.PointPositionInfoSyn3DRespone;
-import com.yeejoin.amos.supervision.core.common.response.QueryCriteriaRespone;
-import com.yeejoin.amos.supervision.core.common.response.RouteResponse;
-import com.yeejoin.amos.supervision.dao.entity.Check;
-import com.yeejoin.amos.supervision.dao.entity.CheckInput;
-import com.yeejoin.amos.supervision.dao.entity.CheckShot;
-import com.yeejoin.amos.supervision.dao.entity.InputItem;
-import com.yeejoin.amos.supervision.dao.entity.PlanTask;
-import com.yeejoin.amos.supervision.dao.entity.PlanTaskDetail;
-import com.yeejoin.amos.supervision.dao.entity.Point;
-import com.yeejoin.amos.supervision.dao.entity.PointClassify;
+import javax.annotation.Resource;
+import javax.transaction.Transactional;
+import java.util.*;
+import java.util.stream.Collectors;
 
 @Service("checkService")
 public class CheckServiceImpl implements ICheckService {

amos-boot-module/amos-boot-module-biz/amos-boot-module-supervision-biz/src/main/java/com/yeejoin/amos/supervision/business/service/impl/RoutePointItemServiceImpl.java

@@ -8,7 +8,7 @@ import com.yeejoin.amos.supervision.business.dao.repository.IRoutePointDao;
 import com.yeejoin.amos.supervision.business.dao.repository.IRoutePointItemDao;
 import com.yeejoin.amos.supervision.business.param.InputItemPageParam;
 import com.yeejoin.amos.supervision.business.service.intfc.IRoutePointItemService;
-import com.yeejoin.amos.supervision.business.vo.InputItemVo;
+import com.yeejoin.amos.supervision.business.vo.RoutePointItemVo;
 import com.yeejoin.amos.supervision.common.enums.PlanStatusEnum;
 import com.yeejoin.amos.supervision.dao.entity.InputItem;
 import com.yeejoin.amos.supervision.dao.entity.Plan;
@@ -52,7 +52,7 @@ public class RoutePointItemServiceImpl implements IRoutePointItemService {
             if (status) {
                 planDao.updatePlanStatus(PlanStatusEnum.EXAMINE_DEVELOPED.getValue(), planId);
             }
-            routePointItemDao.deleteByPlanId(planId);
+//            routePointItemDao.deleteByPlanId(planId);
             List<InputItem> inputItemList = inputItemMapper.findByIdIn(inputItemIds);
             List<RoutePoint> routePointList = routePointDao.findByRouteId(routeId);
             if (CollectionUtils.isNotEmpty(inputItemList) && CollectionUtils.isNotEmpty(routePointList)) {
@@ -78,10 +78,18 @@ public class RoutePointItemServiceImpl implements IRoutePointItemService {
     }
 
     @Override
-    public Page<InputItemVo> queryPage(InputItemPageParam param) {
+    public Page<RoutePointItemVo> queryPage(InputItemPageParam param) {
         long total = routePointItemMapper.queryPageCount(param);
-        List<InputItemVo> content = routePointItemMapper.queryPage(param);
-        Page<InputItemVo> result = new PageImpl<InputItemVo>(content, param, total);
+        List<RoutePointItemVo> content = routePointItemMapper.queryPage(param);
+        Page<RoutePointItemVo> result = new PageImpl<RoutePointItemVo>(content, param, total);
         return result;
     }
+
+    @Override
+    public Integer deleteByIdIn(List<Long> ids) {
+        if (CollectionUtils.isNotEmpty(ids)) {
+            return routePointItemDao.deleteByRoutePointItemId(ids);
+        }
+        return 0;
+    }
 }

amos-boot-module/amos-boot-module-biz/amos-boot-module-supervision-biz/src/main/java/com/yeejoin/amos/supervision/business/service/intfc/IRoutePointItemService.java

 package com.yeejoin.amos.supervision.business.service.intfc;
 
 import com.yeejoin.amos.supervision.business.param.InputItemPageParam;
-import com.yeejoin.amos.supervision.business.vo.InputItemVo;
+import com.yeejoin.amos.supervision.business.vo.RoutePointItemVo;
 import com.yeejoin.amos.supervision.dao.entity.Plan;
 import com.yeejoin.amos.supervision.dao.entity.RoutePointItem;
 import org.springframework.data.domain.Page;
@@ -12,5 +12,7 @@ public interface IRoutePointItemService {
 
     List<RoutePointItem> addRoutePointItemList(Plan plan, List<Long> inputItemIds, Boolean status, String userId);
 
-    Page<InputItemVo> queryPage(InputItemPageParam criterias);
+    Page<RoutePointItemVo> queryPage(InputItemPageParam criterias);
+
+    Integer deleteByIdIn(List<Long> ids);
 }

amos-boot-module/amos-boot-module-biz/amos-boot-module-supervision-biz/src/main/java/com/yeejoin/amos/supervision/business/vo/CheckVo.java

 package com.yeejoin.amos.supervision.business.vo;
 
+import lombok.Data;
+
 import java.util.Date;
 
+@Data
 public class CheckVo {
 
     /**

amos-boot-module/amos-boot-module-biz/amos-boot-module-supervision-biz/src/main/java/com/yeejoin/amos/supervision/business/vo/RoutePointItemVo.java

 package com.yeejoin.amos.supervision.business.vo;
 
-import java.util.Date;
+import lombok.Data;
 
+@Data
 public class RoutePointItemVo {
 
+    private Long id;
+
     /**
      * 检查项ID
      */
-    private Long inputItemId;
+    private Long itemId;
 
     /**
      * 检查项名称
      */
-    private String inputItemName;
-
-    /**
-     * 安全隐患个数
-     */
-    private Integer safetyDangerNum;
-
-    /**
-     * 重大隐患个数
+    private String itemName;
+    private String itemType;
+    private String inputClassify;
+    private String checkType;
+    private String itemClassify;
+    private String itemTypeClassify;
+    private String itemLevel;
+}
\ No newline at end of file
-     */
-    private Integer majorDangerNum;
-
-    /**
-     * 检查时间
-     */
-    private Date checkTime;
-
-    /**
-     * 检查人
-     */
-    private String userName;
-
-    /**
-     * 责任单位ID
-     */
-    private String companyId;
-
-    /**
-     * 责任单位
-     */
-    private String companyName;
-
-    /**
-     * 扩展属性
-     */
-    private String ext;
-}

amos-boot-system-supervision/src/main/resources/db/mapper/routePointItemMapper.xml

@@ -56,11 +56,18 @@
         <if test="orgCode!=null"> and i.org_Code = #{orgCode}</if>
     </select>
     <!--查询 -->
-    <select id="queryPage" resultMap="com.yeejoin.amos.supervision.business.vo.InputItemVo">
+    <select id="queryPage" resultMap="com.yeejoin.amos.supervision.business.vo.RoutePointItemVo">
         SELECT
-            i.*
+        pi.id,
+        i.id AS itemId,
+        i.`name` AS itemName,
+        i.item_type,
+        i.input_classify,
+        i.check_type,
+        i.item_classify,
+        i.item_type_classify,i.item_level
         FROM
-            p_route_point_item pi
+        p_route_point_item pi
         LEFT JOIN p_input_item i ON i.id = pi.input_item_id
         <if test="name!=null"> and i.name like concat(concat("%",#{name}),"%")</if>
         <if test="itemTypeClassifyIds != null and itemTypeClassifyIds != ''"> and i.item_type_classify_ids = #{itemTypeClassifyIds}</if>