巡检计划安排调整；移动端到位录入问题

src/main/java/com/tofly/dyrq/custom/controller/CustomPlanController.java

@@ -176,6 +176,12 @@ public class CustomPlanController {
         return ResultRespone.success(customPlanService.getPlanPoint(planPointSearch));
     }
 
+    @GetMapping("/planchild/getPlanPointPage")
+    @ApiOperation(tags = "巡检计划表接口", value = "分页获取巡检计划所有的点")
+    public ResultRespone getPlanPointPage(Page page,@ModelAttribute PlanPointSearch planPointSearch) {
+        return ResultRespone.success(customPlanService.getPlanPointPage(page,planPointSearch));
+    }
+
     @GetMapping("/planchild/getPointNum")
     @ApiOperation(tags = "巡检计划表接口", value = "获取用户计划点数量")
     public ResultRespone getPointNum(PointNumSearch pointNumSearch) {

src/main/java/com/tofly/dyrq/custom/entity/ReceiptMessageReault.java

@@ -46,4 +46,7 @@ public class ReceiptMessageReault {
     private String receiptUserAvatar;
 
     private String createUserAvatar;
+
+    @ApiModelProperty(value = "模块")
+    private String module;
 }

src/main/java/com/tofly/dyrq/custom/entity/SentMessageReault.java

@@ -37,6 +37,9 @@ public class SentMessageReault {
 
     private List<Map> receipt;
 
+    @ApiModelProperty(value = "模块")
+    private String module;
+
 //    @ApiModelProperty(value = "消息是否接收，0：未接收，1：已接收")
 //    private String flag;
 //

src/main/java/com/tofly/dyrq/custom/mapper/CustomPlanMapper.java

@@ -18,6 +18,7 @@ public interface CustomPlanMapper {
      List<Map> getPlanChildPageByMoblie(Page page, @Param("childPlanSearch") ChildPlanSearch childPlanSearch,@Param("list") List<String> list);
      List<Map> getTransferPage(Page page, @Param("transferSearch") TransferSearch transferSearch, @Param("list") List<String> list);
      List<Map> getPlanPoint(@Param("planPointSearch") PlanPointSearch planPointSearch,@Param("list") List<String> list);
+     List<Map> getPlanPointPage(Page page,@Param("planPointSearch") PlanPointSearch planPointSearch,@Param("list") List<String> list);
      List<Map> getPointNum(@Param("pointNumSearch") PointNumSearch pointNumSearch,@Param("list") List<String> list);
      List<Map> getChildPlanInfo(@Param("childPlanId") Long childPlanId);
      Long getPlanTempMaxId(@Param("tableName") String tableName);

src/main/java/com/tofly/dyrq/custom/service/CustomPlanService.java

@@ -35,6 +35,8 @@ public interface CustomPlanService {
 
     List<Map> getPlanPoint(PlanPointSearch planPointSearch);
 
+    Page<Map> getPlanPointPage(Page page,PlanPointSearch planPointSearch);
+
     void uploadPlanState();
 
     List<Map> getPointNum(PointNumSearch pointNumSearch);

src/main/java/com/tofly/dyrq/custom/service/impl/CustomMaintenanceServiceImpl.java

@@ -202,22 +202,24 @@ public class CustomMaintenanceServiceImpl implements CustomMaintenanceService {
         Long recordId = addMaintenance.getId();
         maintenanceContentService.remove(Wrappers.<MaintenanceContent>lambdaQuery().eq(MaintenanceContent::getRecordId, recordId));
         //保存记录关联的检查内容
-        addMaintenance.getContent().forEach(content -> {
-            //记录设备信息和备注
-            MaintenanceContent maintenanceContent = new MaintenanceContent();
-            maintenanceContent.setRecordId(recordId);
-            maintenanceContent.setMenuId(content.getParentId());
-            maintenanceContent.setNote(content.getNote());
-            maintenanceContentService.save(maintenanceContent);
-            //存储子检查内容
+        if(addMaintenance.getContent() != null) {
+            addMaintenance.getContent().forEach(content -> {
+                //记录设备信息和备注
+                MaintenanceContent maintenanceContent = new MaintenanceContent();
+                maintenanceContent.setRecordId(recordId);
+                maintenanceContent.setMenuId(content.getParentId());
+                maintenanceContent.setNote(content.getNote());
+                maintenanceContentService.save(maintenanceContent);
+                //存储子检查内容
 //            List menuIds = Arrays.asList(content.getMenuIds().split(","));
-            content.getMenuIds().forEach(id -> {
-                MaintenanceContent maintenanceContent2 = new MaintenanceContent();
-                maintenanceContent2.setRecordId(recordId);
-                maintenanceContent2.setMenuId((Long) id);
-                maintenanceContentService.save(maintenanceContent2);
+                content.getMenuIds().forEach(id -> {
+                    MaintenanceContent maintenanceContent2 = new MaintenanceContent();
+                    maintenanceContent2.setRecordId(recordId);
+                    maintenanceContent2.setMenuId((Long) id);
+                    maintenanceContentService.save(maintenanceContent2);
+                });
             });
-        });
+        }
         //清除文件
         List<MaintenanceFile> files = maintenanceFileService.list(Wrappers.<MaintenanceFile>lambdaQuery().eq(MaintenanceFile::getMaintenanceId, recordId));
         files.forEach(file -> {
@@ -375,12 +377,14 @@ public class CustomMaintenanceServiceImpl implements CustomMaintenanceService {
         maintenanceDeviceService.save(addMaintenanceDevice);
         Long recordId = addMaintenanceDevice.getId();
         //保存记录关联的保养内容
-        addMaintenanceDevice.getContent().stream().forEach(content -> {
-            MaintenanceDeviceCon maintenanceDeviceCon = new MaintenanceDeviceCon();
-            maintenanceDeviceCon.setDeviceRecordId(recordId);
-            maintenanceDeviceCon.setTypeId(content);
-            maintenanceDeviceConService.save(maintenanceDeviceCon);
-        });
+        if(addMaintenanceDevice.getContent() != null) {
+            addMaintenanceDevice.getContent().stream().forEach(content -> {
+                MaintenanceDeviceCon maintenanceDeviceCon = new MaintenanceDeviceCon();
+                maintenanceDeviceCon.setDeviceRecordId(recordId);
+                maintenanceDeviceCon.setTypeId(content);
+                maintenanceDeviceConService.save(maintenanceDeviceCon);
+            });
+        }
 
         //遍历请求中key包含photo的所有文件，包括photo1，photo2中的多个文件
         MultiValueMap<String, MultipartFile> multiFileMap = ((MultipartHttpServletRequest) request).getMultiFileMap();
@@ -419,12 +423,14 @@ public class CustomMaintenanceServiceImpl implements CustomMaintenanceService {
         Long recordId = addMaintenanceDevice.getId();
         maintenanceDeviceConService.remove(Wrappers.<MaintenanceDeviceCon>lambdaQuery().eq(MaintenanceDeviceCon::getDeviceRecordId, recordId));
         //保存记录关联的检查内容
-        addMaintenanceDevice.getContent().forEach(content -> {
-            MaintenanceDeviceCon maintenanceDeviceCon = new MaintenanceDeviceCon();
-            maintenanceDeviceCon.setDeviceRecordId(recordId);
-            maintenanceDeviceCon.setTypeId(content);
-            maintenanceDeviceConService.save(maintenanceDeviceCon);
-        });
+        if (addMaintenanceDevice.getContent() != null){
+            addMaintenanceDevice.getContent().forEach(content -> {
+                MaintenanceDeviceCon maintenanceDeviceCon = new MaintenanceDeviceCon();
+                maintenanceDeviceCon.setDeviceRecordId(recordId);
+                maintenanceDeviceCon.setTypeId(content);
+                maintenanceDeviceConService.save(maintenanceDeviceCon);
+            });
+        }
         //清除文件
         List<MaintenanceDeviceFile> files = maintenanceDeviceFileService.list(Wrappers.<MaintenanceDeviceFile>lambdaQuery().eq(MaintenanceDeviceFile::getMaintenanceDeviceId, recordId));
         files.forEach(file -> {

src/main/java/com/tofly/dyrq/custom/service/impl/CustomPlanServiceImpl.java

@@ -819,6 +819,20 @@ public class CustomPlanServiceImpl implements CustomPlanService {
         return customPlanMapper.getPlanPoint(planPointSearch, list);
     }
 
+
+    @Override
+    public Page<Map> getPlanPointPage(Page page,PlanPointSearch planPointSearch) {
+//        if (planPointSearch.getSearchDate() == null) {
+//            planPointSearch.setSearchDate(Date8Util.getCurrentDate());
+//        }
+        //planChildId批量查询
+        List<String> list = new ArrayList<>();
+        if (StringUtil.isNotEmpty(planPointSearch.getPlanChildIds())) {
+            list = Arrays.asList(planPointSearch.getPlanChildIds().split(","));
+        }
+        return page.setRecords(customPlanMapper.getPlanPointPage(page,planPointSearch, list));
+    }
+
     @Override
     @Transactional(rollbackFor = Exception.class)
     public void uploadPlanState() {

src/main/java/com/tofly/dyrq/custom/service/impl/CustomTroubleServiceImpl.java

@@ -859,6 +859,9 @@ public class CustomTroubleServiceImpl implements CustomTroubleService {
         if (trouble.getProcessId() != 8 && trouble.getProcessId() != 10 && trouble.getProcessId() != 12 && trouble.getProcessId() != 14) {
             throw new ToflyDeniedException("当前隐患不为工单负责人处理阶段");
         }
+        if(!SecurityUtils.getUserId().equals(trouble.getDutyUserId())){
+            throw new ToflyDeniedException("当前用户不是该工单负责人");
+        }
         /*if (!SecurityUtils.getUserId().equals(trouble.getHandleUserId())) {
             throw new ToflyDeniedException("当前用户不是该隐患工单处理人");
         }*/

src/main/resources/customMapper/CustomPlanMapper.xml

@@ -384,7 +384,7 @@
         left join tf_plan_point_type d
         on b.device_type_id = d.id
         left join tf_plan e on a.main_plan_id=e.id
-        where 1=1
+        where a.DEL_FLAG = '1'
         <!--        <![CDATA[   and a.child_plan_state<>5 and a.child_plan_state<>7  ]]>-->
         <if test="planPointSearch.searchDate != null">
             <![CDATA[   and a.child_begin_date <= #{planPointSearch.searchDate} and #{planPointSearch.searchDate} <= a.child_end_date  ]]>
@@ -397,6 +397,74 @@
         </if>
     </select>
 
+    <select id="getPlanPointPage" resultType="java.util.Map">
+        select case
+        when d.type = 0 then
+        b.lat
+        else
+        c.lat
+        end lat,
+        case
+        when d.type = 0 then
+        b.lng
+        else
+        c.lng
+        end lng,
+        case
+        when d.type = 0 then
+        b.isover
+        else
+        c.isover
+        end isover,
+        case
+        when d.type = 0 then
+        b.id
+        else
+        c.id
+        end temp_id,
+        case
+        when d.type = 0 then
+        null
+        else
+        b.id
+        end path_id,
+        d.type,
+        b.user_id,
+        c.num,
+        a.main_plan_id main_plan_id,
+        a.id plan_child_id,
+        a.child_begin_date,
+        a.child_end_date,
+        b.trouble_id,
+        b.code,
+        b.point_id,
+        b.state,
+        e.plan_mode,
+        decode(state,'1','处理结束','正在处理') as state_name,
+        decode(e.plan_mode,'0','人巡','1','车巡') as plan_mode_name,
+        (select real_name from tf_smpn_user_x u where u.id = b.user_id) as user_name
+        from
+        tf_plan_child a left join
+        tf_plan_point_temp b on a.id=b.child_plan_id
+        left join tf_plan_path_temp c
+        on b.id = c.temp_id
+        left join tf_plan_point_type d
+        on b.device_type_id = d.id
+        left join tf_plan e on a.main_plan_id=e.id
+        where a.DEL_FLAG = '1'
+        <!--        <![CDATA[   and a.child_plan_state<>5 and a.child_plan_state<>7  ]]>-->
+        <if test="planPointSearch.searchDate != null">
+            <![CDATA[   and a.child_begin_date <= #{planPointSearch.searchDate} and #{planPointSearch.searchDate} <= a.child_end_date  ]]>
+        </if>
+        <if test="planPointSearch.planChildIds != null and !''.equals(planPointSearch.planChildIds.trim())">
+            and a.id in
+            <foreach item="item" collection="list" separator="," open="(" close=")" index="">
+                #{item}
+            </foreach>
+        </if>
+    </select>
+
+
     <!-- 获取用户计划数量 -->
     <select id="getPointNum" resultType="java.util.Map">
         <![CDATA[select a.id planChildId,a.point_num from tf_plan_child a left join tf_plan b on a.main_plan_id=b.id where a.DEL_FLAG = '1' and