1.八项作业强制回档

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

@@ -38,21 +38,25 @@ public class CORSFilter implements Filter {
 //				(referer.trim().startsWith("http://192.168.192.201:8992/"))||
 //				(referer.trim().startsWith("http://192.168.192.201:8993/"))||
 //				(referer.trim().startsWith("https://skqhdg.porthebei.com:9005/"))){
-			response.setContentType("textml;charset=UTF-8");
+		response.setContentType("textml;charset=UTF-8");
-			response.setHeader("Access-Control-Allow-Origin", request.getHeader("Origin"));
+		response.setHeader("Access-Control-Allow-Origin", request.getHeader("Origin"));
-			response.setHeader("Access-Control-Allow-Methods", "POST, GET, OPTIONS, DELETE");
+		response.setHeader("Access-Control-Allow-Methods", "POST, GET, OPTIONS, DELETE");
-			response.setHeader("Access-Control-Max-Age", "0");
+		response.setHeader("Access-Control-Max-Age", "0");
-			response.setHeader("Access-Control-Allow-Headers","Origin, No-Cache, X-Requested-With, If-Modified-Since, Pragma, Last-Modified, Cache-Control, Expires, Content-Type, X-E4M-With,userId,token");
+		response.setHeader("Access-Control-Allow-Headers","Origin, No-Cache, X-Requested-With, If-Modified-Since, Pragma, Last-Modified, Cache-Control, Expires, Content-Type, X-E4M-With,userId,token");
-			response.setHeader("Access-Control-Allow-Credentials", "true"); // 是否支持cookie跨域        
+		response.setHeader("Access-Control-Allow-Credentials", "true"); // 是否支持cookie跨域        
-			response.setHeader("XDomainRequestAllowed", "1");
+		response.setHeader("XDomainRequestAllowed", "1");
-			response.setHeader("x-frame-options","SAMEORIGIN"); // ****
+		response.setHeader("x-frame-options","SAMEORIGIN"); // ****
-			response.setHeader("X-Content-Type-Options","nosniff");
+		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("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-XSS-Protection", "1; mode=block");
-			response.setHeader("X-Permitted-Cross-Domain-Policies", "none");
+		response.setHeader("X-Permitted-Cross-Domain-Policies", "none");
-			response.setHeader("Strict-Transport-Security", "max-age=31536000; includeSubDomains; preload");
+		response.setHeader("Strict-Transport-Security", "max-age=31536000; includeSubDomains; preload");
-			response.setHeader("Referrer-Policy", "strict-origin-when-cross-origin");
+		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

@@ -153,7 +153,7 @@ public class HotWorkApplicationController extends BaseController {
 		return map;
 	}
 
-	 /**去修改页面获取数据
+	/**去修改页面获取数据
 	 * @param
 	 * @throws Exception
 	 */
@@ -573,7 +573,7 @@ public class HotWorkApplicationController extends BaseController {
 		return map;
 	}
 
-	 /**批量删除
+	/**批量删除
 	 * @param
 	 * @throws Exception
 	 */
@@ -597,7 +597,7 @@ public class HotWorkApplicationController extends BaseController {
 		return map;
 	}
 
-	 /**导出到excel
+	/**导出到excel
 	 * @param
 	 * @throws Exception
 	 */
@@ -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

@@ -79,7 +79,7 @@ public interface HotWorkApplicationMapper{
 
 	Integer getJobNumber(PageData pd);
 
-    List<PageData> hotworkdatalistPage(Page page);
+	List<PageData> hotworkdatalistPage(Page page);
 
 	void cleanUpJobNumber(PageData pd);
 
@@ -90,8 +90,10 @@ public interface HotWorkApplicationMapper{
 	 * @return
 	 * @throws Exception
 	 */
-    void updateState4ids(PageData pageData);
+	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,9 +46,9 @@ 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 static final String HTTPFILEURL = "https://qgqy.qhdsafety.com/file/";
 	public final static String APPID = "wx9199de454d31b016";
 	public final static String SECRET = "183cdcac380e1f98f00c793491e27d88";
 	public static final String XCX_MCH_ID = "1607757714";

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>
 
@@ -143,10 +146,10 @@
 
 	<!-- 修改 -->
 	<update id="editState" parameterType="pd">
-	update
+		update
-	<include refid="tableName"></include>
+		<include refid="tableName"></include>
-	set
+		set
-	STATE = #{STATE}
+		STATE = #{STATE}
 		where
 		HOTWORKAPPLICATION_ID = #{HOTWORKAPPLICATION_ID}
 	</update>
@@ -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,
@@ -215,15 +219,15 @@
 			)
 		</if>
 		<if test="pd.CORPINFO_ID != null and pd.CORPINFO_ID != ''">
-            and	f.CORPINFO_ID = #{pd.CORPINFO_ID}
+			and	f.CORPINFO_ID = #{pd.CORPINFO_ID}
-        </if>
+		</if>
-        <if test="pd.CREATOR != null and pd.CREATOR != ''">
+		<if test="pd.CREATOR != null and pd.CREATOR != ''">
-            and	(f.CREATOR = #{pd.CREATOR})
+			and	(f.CREATOR = #{pd.CREATOR})
-        </if>
+		</if>
-        <if test="pd.HOT_WORK_LEVEL_INDEX != null and pd.HOT_WORK_LEVEL_INDEX != ''">
+		<if test="pd.HOT_WORK_LEVEL_INDEX != null and pd.HOT_WORK_LEVEL_INDEX != ''">
 			and	(HOT_WORK_LEVEL_INDEX = #{pd.HOT_WORK_LEVEL_INDEX})
-        </if>
+		</if>
-        <if test="pd.roleLevel != null and pd.roleLevel != ''"><!-- 权限显示 -->
+		<if test="pd.roleLevel != null and pd.roleLevel != ''"><!-- 权限显示 -->
 			<choose>
 				<when test='pd.roleLevel == "0"'>
 				</when>
@@ -409,9 +413,9 @@
 		<include refid="Field"></include>
 		from
 		<include refid="tableName"></include> f
-		     where 1=1
+		where 1=1
 		<if test="INSTATES != null and  INSTATES.size() > 0">
-		    and STATE  in
+			and STATE  in
 			<foreach item="item" index="index" collection="INSTATES" open="(" separator="," close=")">
 				#{item}
 			</foreach>
@@ -430,7 +434,7 @@
 			#{item}
 		</foreach>
 	</delete>
-<!--	bus_hotwork_measures-->
+	<!--	bus_hotwork_measures-->
 
 	<!-- 列表(全部) -->
 	<select id="listAllMeasures" parameterType="pd" resultType="pd">
@@ -438,19 +442,19 @@
 			f.BUS_HOTWORK_MEASURES_ID,
 			f.PROTECTIVE_MEASURES,
 			f.QUESTION1,
-            f.QUESTION2,
+			f.QUESTION2,
-            f.QUESTION3,
+			f.QUESTION3,
-            f.QUESTION4,
+			f.QUESTION4,
-            f.ISDELETE,
+			f.ISDELETE,
-            f.ORDERBY,
+			f.ORDERBY,
 			hwtm.ANSWER1,
 			hwtm.ANSWER2,
 			hwtm.ANSWER3,
 			hwtm.ANSWER4
 
 		FROM
-		     BUS_HOTWORK_MEASURES f
+			BUS_HOTWORK_MEASURES f
-		LEFT JOIN BUS_HOTWORKTOMEASURES hwtm on f.BUS_HOTWORK_MEASURES_ID = hwtm.BUS_HOTWORK_MEASURES_ID and hwtm.HOTWORKAPPLICATION_ID = #{HOTWORKAPPLICATION_ID}
+				LEFT JOIN BUS_HOTWORKTOMEASURES hwtm on f.BUS_HOTWORK_MEASURES_ID = hwtm.BUS_HOTWORK_MEASURES_ID and hwtm.HOTWORKAPPLICATION_ID = #{HOTWORKAPPLICATION_ID}
 		WHERE f.ISDELETE = '0'
 		oRDER BY f.ORDERBY
 	</select>
@@ -485,8 +489,8 @@
 	<select id="getCountByMyApproval" parameterType="pd" resultType="pd">
 		select  f.STATE ,fu.USER_ID,count(distinct HOTWORKAPPLICATION_ID) as count
 		from bus_hotworkapplication f
-		left join  bus_hotworkapplicationuser fu on fu.FOREIGN_KEY = f.HOTWORKAPPLICATION_ID
+			left join  bus_hotworkapplicationuser fu on fu.FOREIGN_KEY = f.HOTWORKAPPLICATION_ID
-		and f.STATE = fu.state
+			and f.STATE = fu.state
 		where fu.user_id =  #{USER_ID} AND fu.ISDELETE = '0' and f.STATE != 11 and f.STATE != -3
 		GROUP BY f.STATE
 	</select>
@@ -500,20 +504,20 @@
 			LEFT JOIN bus_hotworkapplicationuser fu ON fu.FOREIGN_KEY = f.HOTWORKAPPLICATION_ID
 		WHERE
 			fu.user_id = #{USER_ID}
-			AND fu.STATE = '24'
+		  AND fu.STATE = '24'
-			and f.STATE  in ('1','2','3','4','5','6'
+		  and f.STATE  in ('1','2','3','4','5','6'
 			,'7','8','9')
 	</select>
 
 	<!-- 列表(全部) -->
 	<select id="getCountByDate" parameterType="pd"  resultType="integer">
 		select
-			count(*) as count
+		count(*) as count
 		from
 		<include refid="tableName"></include> f
-		 where 1=1
+		where 1=1
-		 and CREATOR >= #{startData}
+		and CREATOR >= #{startData}
-		 and CREATOR &lt;=  #{endDate}
+		and CREATOR &lt;=  #{endDate}
 	</select>
 	<!-- 列表(全部) -->
 	<update id="updateState4ids" parameterType="pd" >
@@ -530,20 +534,20 @@
 	</update>
 	<insert id="saveJobNumber" parameterType="pd">
 		insert into
-		bus_hotworkapplicationnumber
+			bus_hotworkapplicationnumber
 		(
-		JOB_NUMBER
+			JOB_NUMBER
 		) values (
-			#{JOB_NUMBER}
+					 #{JOB_NUMBER}
-		)
+				 )
 	</insert>
 	<select id="getJobNumber" parameterType="pd" resultType="integer">
 		SELECT
 			count(*) count
 		FROM
-		bus_hotworkapplicationnumber f
+			bus_hotworkapplicationnumber f
 		WHERE
-		 f.JOB_NUMBER LIKE CONCAT(CONCAT('%', #{JOB_NUMBER}),'%')
+			f.JOB_NUMBER LIKE CONCAT(CONCAT('%', #{JOB_NUMBER}),'%')
 	</select>
 
 	<delete id="cleanUpJobNumber" parameterType="pd">
@@ -598,8 +602,23 @@
 	<select id="getCountByMyApprovalForDelayedHotWork" parameterType="pd" resultType="pd">
 		select  f.STATE,u.USER_ID,count(distinct HOTWORKAPPLICATION_ID) as count
 		from bus_hotworkapplication f
-		left join bus_hotworkapplicationuser fu on fu.FOREIGN_KEY = f.HOTWORKAPPLICATION_ID and f.STATE = fu.state
+			left join bus_hotworkapplicationuser fu on fu.FOREIGN_KEY = f.HOTWORKAPPLICATION_ID and f.STATE = fu.state
-		left join sys_user u on u.DEPARTMENT_ID = fu.USER_ID
+			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>