kangwei ： 能环保态势大屏-后端,添加新水使用量

           考试记录，拦截器

@@ -7,6 +7,7 @@ import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.skua.core.aspect.annotation.Dict;
+import com.skua.modules.quartz.util.BaseUtil;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -64,7 +65,6 @@ public class AjhMeetingSend {
     @ApiModelProperty(value = "会议地点")
 	private String meetLocation;
 	/**会议内容*/
-	@Excel(name = "会议内容", width = 15,orderNum = "11")
     @ApiModelProperty(value = "会议内容")
 	private String meetContent;
 	/**回执二维码*/
@@ -141,4 +141,13 @@ public class AjhMeetingSend {
 	@ApiModelProperty(value = "参与人数")
 	private java.lang.String particNum;
 
+	@TableField(exist = false)
+	@Excel(name = "会议内容", width = 15,orderNum = "11")
+	@ApiModelProperty(value = "会议内容")
+	private String meetContentHtml;
+
+	public String getMeetContentHtml() {
+		meetContentHtml = BaseUtil.delHTMLTag(  this.getMeetContent());
+		return meetContentHtml;
+	}
 }

@@ -63,8 +63,6 @@ public class QuestionDBController {
 	 * 	分页列表查询
 	 * </pre>
 	 * @param questionDB
-	 * @param pageNo
-	 * @param pageSize
 	 * @param req
 	 * @return
 	 * @author 开发者姓名, 开发时间

@@ -81,7 +81,6 @@ public class PurchasePlanController {
 		if(StringUtils.isNotEmpty( purchasePlan.getStatus() ) ){
 			queryWrapper.eq("status", purchasePlan.getStatus());
 		}
-
 		if( StringUtils.isNotEmpty( purchasePlan.getApplyYear() ) ){
 			queryWrapper.eq("apply_year", purchasePlan.getApplyYear());
 		}

@@ -10,6 +10,8 @@ import java.time.LocalDate;
 import java.time.format.DateTimeFormatter;
 import java.util.Calendar;
 import java.util.Date;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
 
 public class BaseUtil {
 	/**
@@ -395,6 +397,31 @@ public class BaseUtil {
 	    return calendar.get(Calendar.SECOND);
 	}
 
+	/**
+	 * 过滤html标签
+	 * @param htmlStr
+	 * @return
+	 */
+	public synchronized static String delHTMLTag(String htmlStr){
+		String regEx_script="<script[^>]*?>[\\s\\S]*?<\\/script>"; //定义script的正则表达式
+		String regEx_style="<style[^>]*?>[\\s\\S]*?<\\/style>"; //定义style的正则表达式
+		String regEx_html="<[^>]+>"; //定义HTML标签的正则表达式
+
+		Pattern p_script=Pattern.compile(regEx_script,Pattern.CASE_INSENSITIVE);
+		Matcher m_script=p_script.matcher(htmlStr);
+		htmlStr=m_script.replaceAll(""); //过滤script标签
+
+		Pattern p_style=Pattern.compile(regEx_style,Pattern.CASE_INSENSITIVE);
+		Matcher m_style=p_style.matcher(htmlStr);
+		htmlStr=m_style.replaceAll(""); //过滤style标签
+
+		Pattern p_html=Pattern.compile(regEx_html,Pattern.CASE_INSENSITIVE);
+		Matcher m_html=p_html.matcher(htmlStr);
+		htmlStr=m_html.replaceAll(""); //过滤html标签
+
+		return htmlStr.trim(); //返回文本字符串
+	}
+
 	public static void main(String[] args) {
 //		System.out.println(dateTostring(new Date(), "yyyy-MM-dd HH"));
 //		System.out.println(timeStampDate("1471493776", "yyyy-MM-dd HH:mm:ss"));

@@ -15,8 +15,8 @@ public interface SafetyOffenceRecordMapper extends BaseMapper<SafetyOffenceRecor
     /***
      * 统计数量：全部、未处理、已处理
      * @param departId
-     * @param handleStatus
+     * @param status
      * @return
      */
-    public Integer  statisticsSafetyOffenceRecord(@Param("reportType")  String reportType, @Param("departId") String departId,  @Param("handleStatus") String handleStatus);
+    public Integer  statisticsSafetyOffenceRecord(@Param("reportType")  String reportType, @Param("departId") String departId,  @Param("status") String status);
 }

@@ -15,7 +15,7 @@
               AND depart_id  in ( ${departId})
             </if>
             <if test="handleStatus != null ">
-                AND handle_status  = #{handleStatus}
+                AND status  = #{status}
             </if>
         </where>
     </select>

@@ -127,7 +127,7 @@ mybatis-plus:
   configuration:
     call-setters-on-nulls: true
     # 这个配置会将执行的sql打印出来，在开发或测试的时候可以用
-#    log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
+    log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
 #数矿专用配置
 skua:
   web-url: http://103.85.171.27:8096

@@ -54,7 +54,7 @@ public class JnhbLargeScreenVO {
 		this.getHeadStatisticsList().get(1).setValue( reportData.getWsfhl() );
 		this.getHeadStatisticsList().get(2).setValue( reportData.getDh() );
 		this.getHeadStatisticsList().get(3).setValue( reportData.getQy() );
-		//this.getHeadStatisticsList().get(4).setValue( reportData.getWssjcll() );
+		this.getHeadStatisticsList().get(4).setValue( reportData.getXssyl() );
 		this.getHeadStatisticsList().get(5).setValue( reportData.getZhnyxhl() );
 		this.getHeadStatisticsList().get(6).setValue( reportData.getEyhtpfl() );
 		this.getHeadStatisticsList().get(7).setValue( reportData.getDsdh() );
@@ -66,7 +66,7 @@ public class JnhbLargeScreenVO {
 		this.getHeadStatisticsList().get(1).setValueTb( reportData.getWsfhl() );
 		this.getHeadStatisticsList().get(2).setValueTb( reportData.getDh() );
 		this.getHeadStatisticsList().get(3).setValueTb( reportData.getQy() );
-		//this.getHeadStatisticsList().get(4).setValueTb( reportData.getWssjcll() );
+		this.getHeadStatisticsList().get(4).setValueTb( reportData.getXssyl() );
 		this.getHeadStatisticsList().get(5).setValueTb( reportData.getZhnyxhl() );
 		this.getHeadStatisticsList().get(6).setValueTb( reportData.getEyhtpfl() );
 		this.getHeadStatisticsList().get(7).setValueTb( reportData.getDsdh() );
@@ -78,7 +78,7 @@ public class JnhbLargeScreenVO {
 		this.getHeadStatisticsList().get(1).setValueHb( reportData.getWsfhl() );
 		this.getHeadStatisticsList().get(2).setValueHb( reportData.getDh() );
 		this.getHeadStatisticsList().get(3).setValueHb( reportData.getQy() );
-		//this.getHeadStatisticsList().get(4).setValueHb( reportData.getWssjcll() );
+		this.getHeadStatisticsList().get(4).setValueHb( reportData.getXssyl() );
 		this.getHeadStatisticsList().get(5).setValueHb( reportData.getZhnyxhl() );
 		this.getHeadStatisticsList().get(6).setValueHb( reportData.getEyhtpfl() );
 		this.getHeadStatisticsList().get(7).setValueHb( reportData.getDsdh() );

@@ -84,6 +84,10 @@ public class MybatisInterceptor implements Interceptor {
         //巡检触发方式卡片配置
         add("inspection_point_trigger_config");
 
+        //用户试卷
+        add("edu_user_paper");
+        add("edu_paper");
+
     }};
 
     //过滤不需要走部门ID查询的URL
@@ -121,6 +125,7 @@ public class MybatisInterceptor implements Interceptor {
                     || "com.skua.modules.ajh.mapper.AjhMeetingMinutesMapper.getDataById".equalsIgnoreCase(sqlId)
                     || "com.skua.modules.system.mapper.SysDepartMapper.queryUserDeparts".equalsIgnoreCase(sqlId)
                     || "com.skua.modules.system.mapper.SysAnnouncementMapper.querySysCementListByUserId".equals(sqlId)
+                    || "com.skua.modules.supplies.mapper.EquipmentSparepartSuppliesMapper.selectPageByOut".equals(sqlId)
                     || "com.skua.modules.product.equipRemoteControl.mapper.RemoteControlMapper.queryEquipListDetail".equals(sqlId)) {
                 return invocation.proceed();
             }