八项作业作废时，监控删除，视频监控列表

src/main/java/com/zcloud/controller/video/VideoManagerController.java

@@ -38,7 +38,7 @@ public class VideoManagerController extends BaseController {
 	 * @throws Exception
 	 */
 	@RequestMapping(value="/add")
-	@RequiresPermissions("videomanager:add")
+//	@RequiresPermissions("videomanager:add")
 	@ResponseBody
 	@LogAnno(menuType= "监测预警",menuServer= "视频管理",instructionsOperate = "视频维护",instructionsType = "新增")
 	public Object add() throws Exception{
@@ -61,7 +61,7 @@ public class VideoManagerController extends BaseController {
 	 * @throws Exception
 	 */
 	@RequestMapping(value="/delete")
-	@RequiresPermissions("videomanager:del")
+//	@RequiresPermissions("videomanager:del")
 	@ResponseBody
 	@LogAnno(menuType= "监测预警",menuServer= "视频管理",instructionsOperate = "视频维护",instructionsType = "删除")
 	public Object delete() throws Exception{
@@ -108,7 +108,7 @@ public class VideoManagerController extends BaseController {
 	 * @throws Exception
 	 */
 	@RequestMapping(value="/edit")
-	@RequiresPermissions("videomanager:edit")
+//	@RequiresPermissions("videomanager:edit")
 	@ResponseBody
 	@LogAnno(menuType= "监测预警",menuServer= "视频管理",instructionsOperate = "视频维护",instructionsType = "修改")
 	public Object edit() throws Exception{
@@ -121,6 +121,24 @@ public class VideoManagerController extends BaseController {
 		return map;
 	}
 
+	/**修改人员定位系统ID
+	 * @param
+	 * @throws Exception
+	 */
+	@RequestMapping(value="/editPls")
+//	@RequiresPermissions("videomanager:edit")
+	@ResponseBody
+	@LogAnno(menuType= "监测预警",menuServer= "视频管理",instructionsOperate = "视频维护",instructionsType = "修改")
+	public Object editPls() throws Exception{
+		Map<String,Object> map = new HashMap<String,Object>();
+		String errInfo = "success";
+		PageData pd = new PageData();
+		pd = this.getPageData();
+		videomanagerService.editPls(pd);
+		map.put("result", errInfo);
+		return map;
+	}
+
 	/**列表
 	 * @param page
 	 * @throws Exception
@@ -187,7 +205,7 @@ public class VideoManagerController extends BaseController {
 	 * @throws Exception
 	 */
 	@RequestMapping(value="/goEdit")
-	@RequiresPermissions("videomanager:edit")
+//	@RequiresPermissions("videomanager:edit")
 	@ResponseBody
 	@LogAnno(menuType= "监测预警",menuServer= "视频管理",instructionsOperate = "视频维护",instructionsType = "去修改页面获取数据")
 	public Object goEdit() throws Exception{

src/main/java/com/zcloud/mapper/datasource/video/VideoManagerMapper.java

@@ -35,6 +35,9 @@ public interface VideoManagerMapper {
 	 * @throws Exception
 	 */
 	void edit(PageData pd);
+
+	void editPls(PageData pd);
+
 	void editIsShow(PageData pd);
 	void editIsShowBycorpinfoid(PageData pd);
 

src/main/java/com/zcloud/service/eightWork/impl/ConfinedSpaceServiceImpl.java

@@ -211,7 +211,6 @@ public class ConfinedSpaceServiceImpl implements ConfinedSpaceService {
 		}else if (cpd!=null && cpd.size()>0 && cpd.getString("ANALYZE_TIME") == null){
 			pd.put("APPLY_STATUS",-98);
 			confinedspaceMapper.cancel(pd);
-			eightworkvideomanagerService.editStatus(cpd);
 			PageData pd2 = new PageData();
 			pd2 = confinedspaceMapper.checkno(pd);
 			PageData pd3 = new PageData();
@@ -243,10 +242,11 @@ public class ConfinedSpaceServiceImpl implements ConfinedSpaceService {
 			params2.put("value", "受限空间作业");// 存入上面参数名称所传递的值
 			paramsList.add(params2);
 			sendMessageUtil.sendMessages(mes, paramsList);
+			eightworkvideomanagerService.editStatus(cpd);
+
 		}else if (cpd!=null && cpd.size()>0 && cpd.getString("ANALYZE_TIME") != null && cpd.getString("GUARDIAN_USER_SIGNER_TIME") == null){
 			pd.put("APPLY_STATUS",-99);
 			confinedspaceMapper.cancel(pd);
-			eightworkvideomanagerService.editStatus(cpd);
 			PageData pd2 = new PageData();
 			pd2 = confinedspaceMapper.checkno(pd);
 			PageData pd3 = new PageData();
@@ -278,6 +278,8 @@ public class ConfinedSpaceServiceImpl implements ConfinedSpaceService {
 			params2.put("value", "受限空间作业");// 存入上面参数名称所传递的值
 			paramsList.add(params2);
 			sendMessageUtil.sendMessages(mes, paramsList);
+			eightworkvideomanagerService.editStatus(cpd);
+
 		}
 		map.put("result", errInfo);                //返回结果
 		return ;

src/main/java/com/zcloud/service/eightWork/impl/ElectricityServiceImpl.java

@@ -177,7 +177,6 @@ public class ElectricityServiceImpl implements ElectricityService {
 					return;
 				} else {
 					electricityMapper.cancel(pd);
-					eightworkvideomanagerService.editStatus(cpd);
 					PageData mes = new PageData();
 					mes.put("RECEIVER_ID", pd.get("CONFIRM_USER_ID"));// 收信人userid
 					mes.put("templateCode", "YD_ZF");// 短信模板编码
@@ -196,13 +195,14 @@ public class ElectricityServiceImpl implements ElectricityService {
 					params2.put("value", "临时用电安全作业");// 存入上面参数名称所传递的值
 					paramsList.add(params2);
 					sendMessageUtil.sendMessages(mes, paramsList);
+					eightworkvideomanagerService.editStatus(cpd);
+
 				}
 			} catch (ParseException e) {
 				e.printStackTrace();
 			}
 		}else{
 			electricityMapper.cancel(pd);
-			eightworkvideomanagerService.editStatus(cpd);
 			PageData pd2 = new PageData();
 			pd2 = electricityMapper.checkno(pd);
 			PageData pd3 = new PageData();
@@ -234,6 +234,7 @@ public class ElectricityServiceImpl implements ElectricityService {
 			params2.put("value", "临时用电安全作业");// 存入上面参数名称所传递的值
 			paramsList.add(params2);
 			sendMessageUtil.sendMessages(mes, paramsList);
+			eightworkvideomanagerService.editStatus(cpd);
 		}
 		map.put("result", errInfo);                //返回结果
 	}

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

@@ -165,7 +165,6 @@ public class HotworkServiceImpl implements HotworkService {
 		}else if (cpd!=null && cpd.size()>0 && cpd.getString("ANALYZE_TIME") == null){
 			pd.put("APPLY_STATUS",-98);
 			hotworkMapper.cancel(pd);
-			eightworkvideomanagerService.editStatus(cpd);
 			PageData pd2 = new PageData();
 			pd2 = hotworkMapper.checkno(pd);
 			PageData pd3 = new PageData();
@@ -197,10 +196,11 @@ public class HotworkServiceImpl implements HotworkService {
 			params2.put("value", "动火作业");// 存入上面参数名称所传递的值
 			paramsList.add(params2);
 			sendMessageUtil.sendMessages(mes, paramsList);
+			eightworkvideomanagerService.editStatus(cpd);
+
 		}else if (cpd!=null && cpd.size()>0 && cpd.getString("ANALYZE_TIME") != null && cpd.getString("MONITOR_USER_SIGNER_TIME") == null){
 			pd.put("APPLY_STATUS",-99);
 			hotworkMapper.cancel(pd);
-			eightworkvideomanagerService.editStatus(cpd);
 			PageData pd2 = new PageData();
 			pd2 = hotworkMapper.checkno(pd);
 			PageData pd3 = new PageData();
@@ -232,6 +232,8 @@ public class HotworkServiceImpl implements HotworkService {
 			params2.put("value", "动火作业");// 存入上面参数名称所传递的值
 			paramsList.add(params2);
 			sendMessageUtil.sendMessages(mes, paramsList);
+			eightworkvideomanagerService.editStatus(cpd);
+
 		}
 
 		map.put("result", errInfo);                //返回结果

src/main/java/com/zcloud/service/video/VideoManagerService.java

@@ -35,6 +35,9 @@ public interface VideoManagerService {
 	 * @throws Exception
 	 */
 	public void edit(PageData pd)throws Exception;
+
+	public void editPls(PageData pd)throws Exception;
+
 	public void editIsShowBycorpinfoid(PageData pd)throws Exception;
 	public void editIsShow(PageData pd)throws Exception;
 

src/main/java/com/zcloud/service/video/impl/VideoManagerServiceImpl.java

@@ -50,6 +50,11 @@ public class VideoManagerServiceImpl implements VideoManagerService {
 	public void edit(PageData pd)throws Exception{
 		videomanagerMapper.edit(pd);
 	}
+
+	public void editPls(PageData pd)throws Exception{
+		videomanagerMapper.editPls(pd);
+	}
+
 	public void editIsShowBycorpinfoid(PageData pd)throws Exception{
 		videomanagerMapper.editIsShowBycorpinfoid(pd);
 	}

src/main/resources/mybatis/datasource/eightWork/EightWorkVideoManagerMapper.xml

@@ -173,9 +173,9 @@
 		<if test="pd.KEYWORDS != null and pd.KEYWORDS != ''"><!-- 关键词检索 -->
 			and
 			(
-			f.NAME LIKE CONCAT(CONCAT('%', #{pd.KEYWORDS}),'%')
+			bc.VIDEONAME LIKE CONCAT(CONCAT('%', #{pd.KEYWORDS}),'%')
 			or
-			f.CHECK_NO LIKE CONCAT(CONCAT('%', #{pd.KEYWORDS}),'%')
+			bc.GBS_NUM LIKE CONCAT(CONCAT('%', #{pd.KEYWORDS}),'%')
 			)
 		</if>
 		ORDER BY f.CREATTIME DESC

src/main/resources/mybatis/datasource/video/VideoManagerMapper.xml

@@ -22,7 +22,9 @@
 		f.ISDELETE,
 		f.ISSHOW,
 		f.GBS_NUM,
-		f.VIDEOMANAGER_ID
+		f.VIDEOMANAGER_ID,
+		f.PLS_ID,
+		f.CODE
 	</sql>
 
 	<!-- 字段用于新增 -->
@@ -34,7 +36,9 @@
 		OPUSER,
 		ISDELETE,
 		ISSHOW,
-		VIDEOMANAGER_ID
+		VIDEOMANAGER_ID,
+		PLS_ID,
+		CODE
 	</sql>
 
 	<!-- 字段值 -->
@@ -46,7 +50,9 @@
 		#{OPUSER},
 		#{ISDELETE},
 		#{ISSHOW},
-		#{VIDEOMANAGER_ID}
+		#{VIDEOMANAGER_ID},
+		#{PLS_ID},
+		#{CODE}
 	</sql>
 
 	<!-- 新增-->
@@ -87,11 +93,25 @@
 			<if test="ISSHOW != null and ISSHOW != ''"><!-- 关键词检索 -->
 				ISSHOW = #{ISSHOW},
 			</if>
+			<if test="CODE != null and CODE != ''"><!-- 关键词检索 -->
+				CODE = #{CODE},
+			</if>
 
 			VIDEOMANAGER_ID = VIDEOMANAGER_ID
 		where
 			VIDEOMANAGER_ID = #{VIDEOMANAGER_ID}
 	</update>
+
+	<!-- 修改 -->
+	<update id="editPls" parameterType="pd">
+		update
+		<include refid="tableName"></include>
+		set
+		PLS_ID = #{PLS_ID}
+		where
+		VIDEOMANAGER_ID = #{VIDEOMANAGER_ID}
+	</update>
+
 	<update id="editIsShowBycorpinfoid" parameterType="pd">
 		update
 		<include refid="tableName"></include>