Browse Source

修改新媒体矩阵后端接口,添加type参数

hyx 2 năm trước cách đây
mục cha
commit
76175a9316

+ 9 - 8
nngkxxdp/src/main/java/com/example/nngkxxdp/controller/ArticleController.java

@@ -90,8 +90,8 @@ public class ArticleController {
      * @return
      */
     @GetMapping("getRegionAllOfficialAccount")
-    public Map<String, Object> getRegionAllOfficialAccount(String official) {
-        return SendUtil.send(true, null, articleService.getRegionAllOfficialAccount(official));
+    public Map<String, Object> getRegionAllOfficialAccount(String official, Integer type) {
+        return SendUtil.send(true, null, articleService.getRegionAllOfficialAccount(official, type));
     }
 
     @GetMapping("getOfficialAccountByPaging")
@@ -155,16 +155,17 @@ public class ArticleController {
 
     /**
      * 分页查询华龙网接口数据
-     * @param page 当前页码
-     * @param limit 每页展示条数
-     * @param chnlid 栏目id
-     * @param docTitle 栏目标题
-     * @param docrelTime 发布时间
+     *
+     * @param page        当前页码
+     * @param limit       每页展示条数
+     * @param chnlid      栏目id
+     * @param docTitle    栏目标题
+     * @param docrelTime  发布时间
      * @param channelName
      * @return
      */
     @GetMapping("/getHlwAllDataPage")
-    public Map<String,Object> getHlwAllData(int page, int limit,String chnlid,String docTitle,String docrelTime ,String channelName){
+    public Map<String, Object> getHlwAllData(int page, int limit, String chnlid, String docTitle, String docrelTime, String channelName) {
         try {
             if (Blank.isNotEmpty(page) && Blank.isNotEmpty(limit) && page > 0 && limit > 0) {
                 return articleService.getHlwAllDataPage(page, limit, chnlid, docTitle, docrelTime, channelName);

+ 1 - 1
nngkxxdp/src/main/java/com/example/nngkxxdp/dao/SmsMessageDao.java

@@ -59,7 +59,7 @@ public interface SmsMessageDao {
 	 */
 	List<Map<String, Object>> getArticleFrequencyList(Map<String, Object> map);
 
-	List<Map<String, Object>> getRegionAllOfa();
+	List<Map<String, Object>> getRegionAllOfa(Integer type);
 
 	List<Map<String, Object>> getRegionAllOfaList(String official, Integer num);
 

+ 15 - 12
nngkxxdp/src/main/java/com/example/nngkxxdp/service/ArticleService.java

@@ -166,24 +166,26 @@ public interface ArticleService {
 
     /**
      * CQSNARMZF("重庆市南岸人民政府"),
-     *     GYWZCSTC("广阳湾智创生态城"),
-     *     NAWL("南岸文旅"),
-     *     NAJKWS("南岸健康卫士"),
-     *     NAGA("南岸公安"),
-     *     CQNAXF("重庆南岸消防"),
-     *     NAFB("南岸发布"),
+     * GYWZCSTC("广阳湾智创生态城"),
+     * NAWL("南岸文旅"),
+     * NAJKWS("南岸健康卫士"),
+     * NAGA("南岸公安"),
+     * CQNAXF("重庆南岸消防"),
+     * NAFB("南岸发布"),
      * 获取最新的7个公众号的最新一条数据
+     *
      * @return
      */
     Map<String, Object> getNewHlw();
 
     /**
      * 分页查询华龙网接口数据
-     * @param page 当前页码
-     * @param limit 每页展示条数
-     * @param chnlid 栏目id
-     * @param docTitle 栏目标题
-     * @param docrelTime 发布时间
+     *
+     * @param page        当前页码
+     * @param limit       每页展示条数
+     * @param chnlid      栏目id
+     * @param docTitle    栏目标题
+     * @param docrelTime  发布时间
      * @param channelName
      * @return
      */
@@ -191,10 +193,11 @@ public interface ArticleService {
 
     /**
      * 获取区县公众号信息
+     *
      * @param official
      * @return
      */
-    Map getRegionAllOfficialAccount(String official);
+    Map getRegionAllOfficialAccount(String official, Integer type);
 
     Map<String, Object> getRegionOfficialAccountByPaging(Map<String, Object> map);
 }

+ 2 - 2
nngkxxdp/src/main/java/com/example/nngkxxdp/service/impl/ArticleServiceImpl.java

@@ -697,9 +697,9 @@ public class ArticleServiceImpl implements ArticleService {
     }
 
     @Override
-    public Map getRegionAllOfficialAccount(String official) {
+    public Map getRegionAllOfficialAccount(String official,Integer type) {
         Integer num = 8;
-        List<Map<String, Object>> ofaList = smsMessageDao.getRegionAllOfa();
+        List<Map<String, Object>> ofaList = smsMessageDao.getRegionAllOfa(type);
         List<Map<String, Object>> list = smsMessageDao.getRegionAllOfaList(official, num);
 
         Map<String, Object> map = new HashMap<>();

+ 1 - 1
nngkxxdp/src/main/resources/mapper/SmsMessageDao.xml

@@ -63,7 +63,7 @@
 
     <select id="getAllOfa" resultType="java.util.Map">
         select *
-        from w_ofa
+        from w_ofa where w_area_type=#{type}
         order by update_time desc
     </select>