1.八项作业强制回档

src/main/java/com/zcloud/config/CORSFilter.java

@@ -48,11 +48,15 @@ public class CORSFilter implements Filter {
 		response.setHeader("x-frame-options","SAMEORIGIN"); // ****
 		response.setHeader("X-Content-Type-Options","nosniff");
 		response.setHeader("Content-Security-Policy","default-src 'none'; script-src 'self'; connect-src 'self'; img-src 'self'; style-src 'self';");
-			// 一公司烯体哦那个系统漏洞修复
+		// 系统漏洞修复
 		response.setHeader("X-XSS-Protection", "1; mode=block");
 		response.setHeader("X-Permitted-Cross-Domain-Policies", "none");
 		response.setHeader("Strict-Transport-Security", "max-age=31536000; includeSubDomains; preload");
 		response.setHeader("Referrer-Policy", "strict-origin-when-cross-origin");
+		response.setHeader("X-Download-Options", "noopen");
+		response.setHeader("X-Content-TYpe-OPtions", "nosniff");
+		response.setHeader("Content-Security-Policy", "default-src 'self'");
+
 		filterChain.doFilter(servletRequest, servletResponse);
 //		}
 	}

src/main/java/com/zcloud/controller/bus/HotWorkApplicationController.java

@@ -1344,4 +1344,26 @@ public class HotWorkApplicationController extends BaseController {
 		map.put("result", errInfo);
 		return map;
 	}
+
+	/**强制结束动火
+	 * @param
+	 * @throws Exception
+	 */
+	@RequestMapping(value="/forcedEnd")
+//	@RequiresPermissions("hotwork:del")
+	@ResponseBody
+	public Object forcedEnd() throws Exception{
+		Map<String,String> map = new HashMap<String,String>();
+		String errInfo = "success";
+		PageData pd = new PageData();
+		pd = this.getPageData();
+		String userid = Jurisdiction.getUSER_ID();
+		if(!Tools.isEmpty(pd.getString("HOTWORKAPPLICATION_ID"))){
+			hotworkapplicationService.forcedEndHotwork(pd.getString("HOTWORKAPPLICATION_ID"),
+					userid, pd.getString("STATE"));
+		}
+
+		map.put("result", errInfo);				//返回结果
+		return map;
+	}
 }

src/main/java/com/zcloud/mapper/datasource/highriskwork/HotWorkApplicationMapper.java

@@ -93,5 +93,7 @@ public interface HotWorkApplicationMapper{
 	void updateState4ids(PageData pageData);
 
 	PageData getCountByMyApprovalForDelayedHotWork(PageData pageData);
+
+	void forcedEndHotwork (PageData pageData);
 }
 

src/main/java/com/zcloud/service/highriskwork/HotWorkApplicationService.java

@@ -112,6 +112,8 @@ public interface HotWorkApplicationService{
 	public void updateState4ids(PageData pageData);
 
 	PageData getCountByMyApprovalForDelayedHotWork(String user_id) throws Exception;
+
+	void forcedEndHotwork (String HOTWORKAPPLICATION_ID,String user_id ,String state) throws Exception;
 }
 
 

src/main/java/com/zcloud/service/highriskwork/impl/HotWorkApplicationServiceImpl.java

@@ -259,5 +259,23 @@ public class HotWorkApplicationServiceImpl implements HotWorkApplicationService{
 	public List<PageData> archivelist(Page page)throws Exception{
 		return hotworkapplicationMapper.filedatalistPage(page);
 	}
+
+	/**
+	 * 方法名称：强制结束动火
+	 * 方法描述：轻质结束正在进行中的动火或者已经过去的动火信息
+	 * 创建人：guoyuepeng
+	 * 时间：2024/9/3 14:48
+	 * @param HOTWORKAPPLICATION_ID 动火ID
+	 * @return void
+	 */
+	public void forcedEndHotwork(String HOTWORKAPPLICATION_ID ,String userid,String state) throws Exception{
+		PageData pd = new PageData();
+		pd.put("OPERATOR", userid);
+		pd.put("OPERATTIME", DateUtil.date2Str(new Date()));
+		pd.put("HOTWORKAPPLICATION_ID", HOTWORKAPPLICATION_ID);
+		pd.put("STATE", "11");
+		pd.put("FORCED_END_STATE", state);
+		hotworkapplicationMapper.forcedEndHotwork(pd);
+	}
 }
 

src/main/java/com/zcloud/service/highriskwork/impl/HotWorkApplicationUserServiceImpl.java

@@ -277,6 +277,9 @@ public class HotWorkApplicationUserServiceImpl implements HotWorkApplicationUser
 				&& 0 > Integer.parseInt(hotVal.get("STATE").toString())){
 				hotVal.put("examineUserName", hotVal.get("OPERATORNAME"));
 			}
+			if("1".equals(hotVal.getString("IS_FORCED_END"))){ //如果是强制回档
+				hotVal.put("examineUserName", hotVal.get("OPERATORNAME"));
+			}
 		}
 		PageData pd = new PageData();
 		pd.put("hotIds",hotIds);

src/main/java/com/zcloud/util/Const.java

@@ -24,7 +24,7 @@ public class Const {
 	public static final String SYSNAME = "sysName";									//系统名称
 	public static final String SHOWCOUNT = "showCount";								//每页条数
 
-	public static final String  basePath = "/mnt/qask/file/";
+	public static final String  basePath = "/mnt/vdc1/qask/file/";
 	public static final String FILEPATHFILE = "/uploadFiles/file/";					//文件上传路径
 	public static final String FILEPATHHEADPHONE = "/uploadFiles/headPhone/";		//用户头像
 	public static final String BIFILEPATHFILE = "/uploadFiles/Bfile/";					//文件上传路径
@@ -46,7 +46,7 @@ public class Const {
 	public static final String IS_MAIN = "IS_MAIN";						//是否主账号
 	public static final String ISSUPERVISE = "ISSUPERVISE";						//是否监管部门
 	public static final String DEFAULT_PASSWORD = "Aa@123456789";						//系统默认密码
-	public static final String FILEURL = "/mnt/qask/file/";						//文件服务器地址
+	public static final String FILEURL = "/mnt/vdc1/qask/file/";						//文件服务器地址
 	public static final String HTTPFILEURL = "https://skqhdg.porthebei.com:9004/file/";						//文件服务器地址
 	//	public static final String HTTPFILEURL = "https://qgqy.qhdsafety.com/file/";
 	public final static String APPID = "wx9199de454d31b016";

src/main/resources/mybatis/datasource/highriskwork/HotWorkApplicationMapper.xml

@@ -36,6 +36,7 @@
 		f.IS_SAFETY_DIRECTOR,
 		f.IS_GAS_TESTING,
 		f.SPARE,
+		f.IS_FORCED_END,
 		f.HOTWORKAPPLICATION_ID
 	</sql>
 
@@ -63,6 +64,7 @@
 		IS_SAFETY_DIRECTOR,
 		IS_GAS_TESTING,
 		SPARE,
+		IS_FORCED_END,
 		HOTWORKAPPLICATION_ID
 	</sql>
 
@@ -90,6 +92,7 @@
 		#{IS_SAFETY_DIRECTOR},
 		#{IS_GAS_TESTING},
 		#{SPARE},
+		#{IS_FORCED_END},
 		#{HOTWORKAPPLICATION_ID}
 	</sql>
 
@@ -191,6 +194,7 @@
 		f.IS_SAFETY_DIRECTOR,
 		f.IS_GAS_TESTING,
 		f.SPARE,
+		f.IS_FORCED_END,
 		f.HOTWORKAPPLICATION_ID,
 		u.NAME CREATORNAME,
 		d.NAME DEPARTMENTNAME,
@@ -602,4 +606,19 @@
 			left join sys_user u on u.DEPARTMENT_ID = fu.USER_ID
 		where u.USER_ID =  #{USER_ID} AND fu.ISDELETE = '0' and f.STATE = 10
 	</select>
+
+
+	<!-- 强制结束动火 -->
+	<update id="forcedEndHotwork" parameterType="pd">
+		update
+		<include refid="tableName"></include>
+		set
+		STATE = #{STATE},
+		OPERATOR = #{OPERATOR},
+		OPERATTIME = #{OPERATTIME},
+		FORCED_END_STATE = #{state},
+		IS_FORCED_END ='1'
+		where
+		HOTWORKAPPLICATION_ID = #{HOTWORKAPPLICATION_ID}
+	</update>
 </mapper>