Merge branch 'master' of http://116.63.33.55/git/nazw

nngkxxdp/src/main/java/com/example/nngkxxdp/dao/HlwInterfaceDao.java

@@ -116,6 +116,8 @@ public interface HlwInterfaceDao {
      */
     List<Map<String, Object>> getHlwData(@Param("firstDay") Date firstDay, @Param("lastDay") Date lastDay, @Param("gzqk") String gzqk, @Param("chnilds") String[] chnilds);
 
+    List<Map<String, Object>> getHlwDataGz(@Param("firstDay") Date firstDay, @Param("lastDay") Date lastDay, @Param("gzqk") String gzqkString, @Param("gzdt") String gzdtString, @Param("chnilds") String[] chnilds);
+
     /**
      * 从华龙网获取对应栏目id的文章的
      */

nngkxxdp/src/main/java/com/example/nngkxxdp/enums/UtilEnum.java

@@ -12,6 +12,7 @@ public enum UtilEnum {
     CQNAXF("重庆南岸消防"),
     NAFB("南岸发布"),
     GZQK("工作情况"),
+    GZDT("工作动态"),
     ZCWJ("政策文件"),
     ZXWYTABL("政协委员提案办理");
 

nngkxxdp/src/main/java/com/example/nngkxxdp/task/HlwTask.java

@@ -24,6 +24,7 @@ import com.example.nngkxxdp.entity.Article;
 import com.example.nngkxxdp.entity.Dept;
 import com.example.nngkxxdp.hlw.HlwHttpUtil;
 import com.example.nngkxxdp.util.Blank;
+import com.example.nngkxxdp.util.WzkpRecordUtil;
 import org.apache.xmlbeans.impl.common.XPath;
 import org.jsoup.Jsoup;
 import org.jsoup.internal.StringUtil;
@@ -72,6 +73,9 @@ public class HlwTask {
     @Resource
     private HlwInterfaceDao hlwInterfaceDao;
 
+    @Resource
+    private WzkpRecordUtil wzkpRecordUtil;
+
     public static void main(String[] args) {
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
         long startTime = System.currentTimeMillis();
@@ -183,6 +187,8 @@ public class HlwTask {
         long endTime = System.currentTimeMillis();
         log.info("耗时：" + (endTime - startTime) / 1000 + "秒");
         log.info("耗时：" + (endTime - startTime) / (1000 * 60) + "分");
+        log.info("开始生成重新加扣分详情");
+        wzkpRecordUtil.generateRecord(null);
     }
 
     /**

nngkxxdp/src/main/java/com/example/nngkxxdp/util/NewDeptTaskUtil3.java

@@ -1,29 +1,11 @@
 package com.example.nngkxxdp.util;
 
-import cn.hutool.core.convert.Convert;
-import cn.hutool.core.date.DateField;
-import cn.hutool.core.date.DateUnit;
-import cn.hutool.core.date.DateUtil;
-import cn.hutool.core.util.StrUtil;
-import cn.hutool.log.StaticLog;
-import com.alibaba.fastjson.JSONArray;
-import com.alibaba.fastjson.JSONObject;
-import com.example.nngkxxdp.dao.HlwInterfaceDao;
-import com.example.nngkxxdp.dao.TjDao;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.scheduling.annotation.Async;
 import org.springframework.scheduling.annotation.EnableScheduling;
 import org.springframework.scheduling.annotation.Scheduled;
-import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RestController;
 
 import javax.annotation.Resource;
-import java.security.Key;
-import java.text.DateFormat;
-import java.util.*;
-import java.util.stream.Collectors;
 
 /** 
 * @author Mr.wang

nngkxxdp/src/main/java/com/example/nngkxxdp/util/WzkpRecordUtil.java

@@ -104,13 +104,14 @@ public class WzkpRecordUtil {
             //设置一个list装加扣分
             List<Map<String, Object>> tRecordList = new ArrayList<>();
             String gzqkString = UtilEnum.GZQK.getValue();
+            String gzdtString = UtilEnum.GZDT.getValue();
             String zcwjString = UtilEnum.ZCWJ.getValue();
             if (allDept != null && allDept.size() > 0) {
                 for (int i = 0; i < allDept.size(); i++) {
                     //拿出单个部门拥有的栏目id
                     String[] chnilds = allDept.get(i).get("haveChnlid").toString().split(",");
-                    //获取单个部门在规定的一个时间段内的所有数据(工作情况)
-                    List<Map<String, Object>> hlwDataList = hlwInterfaceDao.getHlwData(firstDay, lastDay, gzqkString, chnilds);
+                    //获取单个部门在规定的一个时间段内的所有数据(工作情况,工作动态)
+                    List<Map<String, Object>> hlwDataList = hlwInterfaceDao.getHlwDataGz(firstDay, lastDay, gzqkString, gzdtString, chnilds);
                     //计算工作情况加分
                     int gzqkjiafen = 0;
                     int gzqksum = 0;

nngkxxdp/src/main/resources/mapper/HlwInterfaceDao.xml

@@ -253,6 +253,20 @@
         order by chnlid,DOCRELTIME
     </select>
 
+    <select id="getHlwDataGz" resultType="map">
+        SELECT id,CHNLID,CHANNELNAME,DOCPUBURL,DOCRELTIME,DOCTITLE
+        from save_hlw_interface_data
+        where DOCRELTIME BETWEEN
+        #{firstDay} and #{lastDay} and (CHANNELNAME =
+        #{gzqk} or CHANNELNAME =
+        #{gzdt})
+        and CHNLID in
+        <foreach item="item" collection="chnilds" open="(" separator="," close=" )">
+            #{item}
+        </foreach>
+        order by chnlid,DOCRELTIME
+    </select>
+
     <select id="getDeptList" resultType="map">
         SELECT * from save_hlw_interface_data where DOCRELTIME BETWEEN #{firstDay1} and #{lastDay} and chnlid in
         <foreach item="item" collection="newChnlids" open="(" separator="," close=" )">