Merge remote-tracking branch 'origin/dev' into dev

src/main/java/com/zcloud/controller/mapApi/MapController.java

@@ -4,7 +4,10 @@ import com.alibaba.fastjson.JSONObject;
 import com.zcloud.controller.base.BaseController;
 import com.zcloud.entity.Page;
 import com.zcloud.entity.PageData;
+import com.zcloud.service.eightwork.ConfinedspaceService;
 import com.zcloud.service.eightwork.EightWorkService;
+import com.zcloud.service.eightwork.HighworkService;
+import com.zcloud.service.eightwork.HotworkService;
 import com.zcloud.service.system.UsersService;
 import com.zcloud.service.video.VideoManagerService;
 import com.zcloud.util.DateUtil;
@@ -34,7 +37,12 @@ public class MapController extends BaseController {
     private EightWorkService eightWorkService;
     @Autowired
     private VideoManagerService videomanagerService;
-
+    @Autowired
+    private HotworkService hotworkService;
+    @Autowired
+    private ConfinedspaceService confinedspaceService;
+    @Autowired
+    private HighworkService highworkService;
 // ----------人员定位相关-------------//
 
     /**
@@ -91,6 +99,17 @@ public class MapController extends BaseController {
        return ReturnMap.ok().put("data", PLSUtil.getRealTimeList(Jurisdiction.getCORPINFO_ID()));
     }
 
+    /**
+     * @Description: 电子围栏信息
+     * @Param: [] []
+     * @Return: com.zcloud.util.ReturnMap
+     */
+    @RequestMapping(value = "/getFenceList")
+    @ResponseBody
+    public ReturnMap getFenceList() throws Exception {
+        return ReturnMap.ok().put("data", PLSUtil.getRyRegionList(Jurisdiction.getCORPINFO_ID(),"",1,999999));
+    }
+
     /**
      * @Description: 获取八项作业数
      * @Param: [] []
@@ -101,6 +120,40 @@ public class MapController extends BaseController {
     public ReturnMap getEightWorks() throws Exception {
         return eightWorkService.getEightWorks();
     }
+
+    /**
+     * @Description: 获取动火作业
+     * @Param: [] []
+     * @Return: com.zcloud.util.ReturnMap
+     */
+    @RequestMapping(value = "/getHotworkList")
+    @ResponseBody
+    public ReturnMap getHotworkList() throws Exception {
+        return hotworkService.getMapList();
+    }
+
+    /**
+     * @Description: 获取受限空间作业
+     * @Param: [] []
+     * @Return: com.zcloud.util.ReturnMap
+     */
+    @RequestMapping(value = "/getConfinedspaceWorkList")
+    @ResponseBody
+    public ReturnMap getConfinedspaceWorkList() throws Exception {
+        return confinedspaceService.getMapList();
+    }
+
+    /**
+     * @Description: 获取高处作业
+     * @Param: [] []
+     * @Return: com.zcloud.util.ReturnMap
+     */
+    @RequestMapping(value = "/getHighWorkList")
+    @ResponseBody
+    public ReturnMap getHighWorkList() throws Exception {
+        return highworkService.getMapList();
+    }
+
     // ----------摄像头相关-------------//
 
     // 摄像头告警数 disposed

src/main/java/com/zcloud/controller/system/MainController.java

@@ -245,7 +245,7 @@ public class MainController extends BaseController {
 				}
 			}
 			if (menuList.get(i).isHasMenu()) {        //判断是否有此菜单权限
-				this.readRoute(USERNAME, menuList.get(i).getSubMenu(), roleRights, arrayRoleRights, shiroSet, uqxmap, uqxmap2);//是：继续排查其子菜单
+				this.readRoute(USERNAME, menuList.get(i).getChildren(), roleRights, arrayRoleRights, shiroSet, uqxmap, uqxmap2);//是：继续排查其子菜单
 			}
 		}
 		return menuList;

src/main/java/com/zcloud/entity/system/Route.java

@@ -26,7 +26,7 @@ public class Route implements Serializable {
 
 
     private String target;
-    private List<Route> subMenu;
+    private List<Route> children;
     private boolean hasMenu = false;
 
     public String getROUTE_ID() {
@@ -141,12 +141,12 @@ public class Route implements Serializable {
         this.target = target;
     }
 
-    public List<Route> getSubMenu() {
+    public List<Route> getChildren() {
-        return subMenu;
+        return children;
     }
 
-    public void setSubMenu(List<Route> subMenu) {
+    public void setChildren(List<Route> children) {
-        this.subMenu = subMenu;
+        this.children = children;
     }
 
     public boolean isHasMenu() {

src/main/java/com/zcloud/mapper/datasource/eightwork/ConfinedspaceMapper.java

@@ -17,6 +17,7 @@ public interface ConfinedspaceMapper {
     void edit(PageData pd);
     void editGasTime(PageData pd);
     void editStep(PageData pd);
+    void setPosition(PageData pd);
     List<PageData> datalistPage(Page page);
 
     List<PageData> listAllMeasures();
@@ -24,4 +25,6 @@ public interface ConfinedspaceMapper {
     List<PageData> checkWorkCount(PageData pd);
 
     List<PageData> getFlowList(PageData pd);
+
+    List<PageData> getMapList(PageData pd);
 }

src/main/java/com/zcloud/mapper/datasource/eightwork/HighworkMapper.java

@@ -25,4 +25,6 @@ public interface HighworkMapper {
     List<PageData> getFlowList(PageData pd);
 
     void setPosition(PageData pd);
+
+    List<PageData> getMapList(PageData pd);
 }

src/main/java/com/zcloud/mapper/datasource/eightwork/HotworkMapper.java

@@ -36,4 +36,5 @@ public interface HotworkMapper {
 
     List<PageData> getFlowList(PageData pd);
 
+    List<PageData> getMapList(PageData pd);
 }

src/main/java/com/zcloud/service/eightwork/ConfinedspaceService.java

@@ -2,6 +2,7 @@ package com.zcloud.service.eightwork;
 
 import com.zcloud.entity.Page;
 import com.zcloud.entity.PageData;
+import com.zcloud.util.ReturnMap;
 import org.springframework.web.multipart.MultipartFile;
 
 import java.util.List;
@@ -39,4 +40,6 @@ public interface ConfinedspaceService {
     void saveGas(PageData pd,MultipartFile[] files) throws Exception;
 
     List<PageData> getFlowList(PageData pd)throws Exception;
+
+    ReturnMap getMapList()throws Exception;
 }

src/main/java/com/zcloud/service/eightwork/HighworkService.java

@@ -2,6 +2,7 @@ package com.zcloud.service.eightwork;
 
 import com.zcloud.entity.Page;
 import com.zcloud.entity.PageData;
+import com.zcloud.util.ReturnMap;
 import org.springframework.web.multipart.MultipartFile;
 
 import java.util.List;
@@ -38,4 +39,6 @@ public interface HighworkService {
 
 
     List<PageData> getFlowList(PageData pd)throws Exception;
+
+    ReturnMap getMapList()throws Exception;
 }

src/main/java/com/zcloud/service/eightwork/HotworkService.java

@@ -2,6 +2,7 @@ package com.zcloud.service.eightwork;
 
 import com.zcloud.entity.Page;
 import com.zcloud.entity.PageData;
+import com.zcloud.util.ReturnMap;
 import org.springframework.web.multipart.MultipartFile;
 
 import java.util.List;
@@ -42,4 +43,6 @@ public interface HotworkService {
     void saveGas(PageData pd,MultipartFile[] files) throws Exception;
 
     List<PageData> getFlowList(PageData pd)throws Exception;
+
+    ReturnMap getMapList()throws Exception;
 }

src/main/java/com/zcloud/service/eightwork/impl/ConfinedspaceServiceImpl.java

@@ -6,10 +6,7 @@ import com.zcloud.entity.Page;
 import com.zcloud.entity.PageData;
 import com.zcloud.mapper.datasource.eightwork.*;
 import com.zcloud.service.eightwork.ConfinedspaceService;
-import com.zcloud.util.Const;
+import com.zcloud.util.*;
-import com.zcloud.util.DateUtil;
-import com.zcloud.util.Smb;
-import com.zcloud.util.UuidUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -70,6 +67,7 @@ public class ConfinedspaceServiceImpl implements ConfinedspaceService {
             PageData flow = getStep(pd.get("TASK_ID"),"1");
             saveLog(pd,pd.getString("CREATOR"),"1");
             saveNextSigner(pd,flow);
+            setPosition(pd);
         }
     }
 
@@ -85,6 +83,7 @@ public class ConfinedspaceServiceImpl implements ConfinedspaceService {
             PageData flow = getStep(pd.get("TASK_ID"),"1");
             saveLog(pd,pd.getString("CREATOR"),"1");
             saveNextSigner(pd,flow);
+            setPosition(pd);
         }
     }
 
@@ -295,6 +294,15 @@ public class ConfinedspaceServiceImpl implements ConfinedspaceService {
         return confinedspaceMapper.getFlowList(pd);
     }
 
+    @Override
+    public ReturnMap getMapList() throws Exception {
+        ReturnMap returnMap = new ReturnMap();
+        PageData pd = new PageData();
+        pd.put("CORPINFO_ID",Jurisdiction.getCORPINFO_ID());
+        returnMap.put("varList",confinedspaceMapper.getMapList(pd));
+        return returnMap;
+    }
+
     private void saveNextSigner(PageData pd,PageData flow) throws Exception {
 
         pd.put("STEP_ID",flow.get("NEXT_STEP_ID"));
@@ -389,14 +397,12 @@ public class ConfinedspaceServiceImpl implements ConfinedspaceService {
         eightWorkFlowLogMapper.save(log);
     }
 
-//    private void saveNext(PageData pd,PageData flow) throws Exception {
+    private void setPosition(PageData pd) throws Exception {
-//        PageData log = new PageData();
+        JSONObject body = PLSUtil.getRyRegionInfo(pd.getString("CORPINFO_ID"),Integer.parseInt(pd.getString("PLS_ID")));
-//        log.put("LOG_ID", UuidUtil.get32UUID());
+        List pointList = (List)((Map) body.get("data")).get("list");
-//        log.put("WORK_ID", pd.get(primary_key));
+        List<String> positions = PLSUtil.getRandomPointInPolygon(pointList);
-//        log.put("TASK_ID", pd.get("TASK_ID"));
+        pd.put("WORK_POSITION", String.join(",",positions));
-//        log.put("STEP_ID", flow.get("NEXT_STEP_ID"));
+        confinedspaceMapper.setPosition(pd);
-//        log.put("STATUS", "0");
+    }
-//        eightWorkFlowLogMapper.save(log);
-//    }
 
 }

src/main/java/com/zcloud/service/eightwork/impl/HighworkServiceImpl.java

@@ -229,6 +229,14 @@ public class HighworkServiceImpl implements HighworkService {
         return highworkMapper.getFlowList(pd);
     }
 
+    @Override
+    public ReturnMap getMapList() throws Exception {
+        ReturnMap returnMap = new ReturnMap();
+        PageData pd = new PageData();
+        pd.put("CORPINFO_ID",Jurisdiction.getCORPINFO_ID());
+        returnMap.put("varList",highworkMapper.getMapList(pd));
+        return returnMap;
+    }
     private void saveNextSigner(PageData pd,PageData flow) throws Exception {
 
         pd.put("STEP_ID",flow.get("NEXT_STEP_ID"));

src/main/java/com/zcloud/service/eightwork/impl/HotworkServiceImpl.java

@@ -297,6 +297,15 @@ public class HotworkServiceImpl implements HotworkService {
         return hotworkMapper.getFlowList(pd);
     }
 
+    @Override
+    public ReturnMap getMapList() throws Exception {
+        ReturnMap returnMap = new ReturnMap();
+        PageData pd = new PageData();
+        pd.put("CORPINFO_ID",Jurisdiction.getCORPINFO_ID());
+        returnMap.put("varList",hotworkMapper.getMapList(pd));
+        return returnMap;
+    }
+
     private void saveNextSigner(PageData pd,PageData flow) throws Exception {
 
         pd.put("STEP_ID",flow.get("NEXT_STEP_ID"));
@@ -393,7 +402,7 @@ public class HotworkServiceImpl implements HotworkService {
     }
 
     private void setPosition(PageData pd) throws Exception {
-        JSONObject body = PLSUtil.getRyRegionInfo(Jurisdiction.getCORPINFO_ID(),Integer.parseInt(pd.getString("PLS_ID")));
+        JSONObject body = PLSUtil.getRyRegionInfo(pd.getString("CORPINFO_ID"),Integer.parseInt(pd.getString("PLS_ID")));
         List pointList = (List)((Map) body.get("data")).get("list");
         List<String> positions = PLSUtil.getRandomPointInPolygon(pointList);
         pd.put("WORK_POSITION", String.join(",",positions));

src/main/java/com/zcloud/service/system/impl/RouteServiceImpl.java

@@ -184,7 +184,7 @@ public class RouteServiceImpl implements RouteService {
     public List<Route> listAllMenuJur(String MENU_ID) throws Exception {
         List<Route> routeList = this.listSubRouteByParentId(MENU_ID);
         for (Route route : routeList) {
-            route.setSubMenu(this.listAllMenuJur(route.getROUTE_ID()));
+            route.setChildren(this.listAllMenuJur(route.getROUTE_ID()));
             route.setTarget("treeFrame");
         }
         return routeList;

src/main/resources/mybatis/datasource/eightwork/ConfinedspaceMapper.xml

@@ -349,6 +349,16 @@
             CONFINEDSPACE_ID = #{CONFINEDSPACE_ID}
     </update>
 
+    <!-- 修改位置 -->
+    <update id="setPosition" parameterType="pd">
+        update
+        <include refid="tableName"></include>
+        set
+        WORK_POSITION = #{WORK_POSITION}
+        where
+        CONFINEDSPACE_ID = #{CONFINEDSPACE_ID}
+    </update>
+
     <!-- 列表 -->
     <select id="datalistPage" parameterType="page" resultType="pd">
         select
@@ -488,4 +498,18 @@
         order by
             flow.ORDER_BY
     </select>
+
+    <select id="getMapList" resultType="pd">
+        select
+        f.CONFINEDSPACE_ID,
+        f.CHECK_NO,
+        f.WORK_POSITION
+        from
+        <include refid="tableName"></include> f
+        left join (select * from(select * from vi_eightwork_flow_log log having 1 order by log.ACT_TIME desc
+        ) tmp group by tmp.WORK_ID) log on log.WORK_ID = f.CONFINEDSPACE_ID
+        where f.ISDELETE = '0' and f.WORK_POSITION is not null
+        and f.CORPINFO_ID = #{CORPINFO_ID}
+        and f.STEP_ID &gt; 0 and log.NEXT_STEP_ID != 99
+    </select>
 </mapper>

src/main/resources/mybatis/datasource/eightwork/HighWorkMapper.xml

@@ -500,4 +500,18 @@
         where
         HIGHWORK_ID = #{HIGHWORK_ID}
     </update>
+
+    <select id="getMapList" resultType="pd">
+        select
+        f.HIGHWORK_ID,
+        f.CHECK_NO,
+        f.WORK_POSITION
+        from
+        <include refid="tableName"></include> f
+        left join (select * from(select * from vi_eightwork_flow_log log having 1 order by log.ACT_TIME desc
+        ) tmp group by tmp.WORK_ID) log on log.WORK_ID = f.HIGHWORK_ID
+        where f.ISDELETE = '0' and f.WORK_POSITION is not null
+        and f.CORPINFO_ID = #{CORPINFO_ID}
+        and f.STEP_ID &gt; 0 and log.NEXT_STEP_ID != 99
+    </select>
 </mapper>

src/main/resources/mybatis/datasource/eightwork/HotWorkMapper.xml

@@ -571,4 +571,18 @@
         order by
             flow.ORDER_BY
     </select>
+
+    <select id="getMapList" resultType="pd">
+        select
+        f.HOTWORK_ID,
+        f.CHECK_NO,
+        f.WORK_POSITION
+        from
+        <include refid="tableName"></include> f
+        left join (select * from(select * from vi_eightwork_flow_log log having 1 order by log.ACT_TIME desc
+        ) tmp group by tmp.WORK_ID) log on log.WORK_ID = f.HOTWORK_ID
+        where f.ISDELETE = '0' and f.WORK_POSITION is not null
+        and f.CORPINFO_ID = #{CORPINFO_ID}
+        and f.STEP_ID &gt; 0 and log.NEXT_STEP_ID != 99
+    </select>
 </mapper>