Merge remote-tracking branch 'origin/div' into 2.1.2

admin

2020-05-20 98b1a0affd69bbe63223c21fdd2c404e8bedfccb

 fanli/src/main/java/com/yeshi/fanli/controller/admin/AppPageNotificationAdminController.java

@@ -5,6 +5,7 @@
import java.util.ArrayList;

import java.util.Date;

import java.util.List;

import java.util.Set;



import javax.annotation.Resource;



@@ -15,13 +16,18 @@
import com.google.gson.Gson;

import com.google.gson.GsonBuilder;

import com.google.gson.reflect.TypeToken;

import com.yeshi.fanli.entity.AppVersionInfo;

import com.yeshi.fanli.entity.bus.help.AppPageNotification;

import com.yeshi.fanli.entity.bus.help.AppPageNotification.AppPageNotificationTypeEnum;

import com.yeshi.fanli.entity.bus.homemodule.AdActivityVersionControl;

import com.yeshi.fanli.entity.bus.homemodule.AdActivityVersionControl.AdActivityType;

import com.yeshi.fanli.service.inter.config.AppVersionService;

import com.yeshi.fanli.service.inter.help.AppPageNotificationService;

import com.yeshi.fanli.service.inter.homemodule.AdActivityVersionControlService;

import com.yeshi.fanli.tag.PageEntity;

import com.yeshi.fanli.util.Constant;

import com.yeshi.fanli.util.StringUtil;



import net.sf.json.JSONArray;

import net.sf.json.JSONObject;



@Controller

@@ -30,6 +36,12 @@


   @Resource

   private AppPageNotificationService appPageNotificationService;

	
   @Resource

   private AppVersionService appVersionService;

	
   @Resource

   private AdActivityVersionControlService adActivityVersionControlService;

   

   

   /**

@@ -79,6 +91,10 @@
            return;

         }

         

         if (!canClose && StringUtil.isNullOrEmpty(contentUrl)) {

            JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("跳转链接不能为空"));

            return;

         }

         

         SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm");

         

@@ -113,13 +129,12 @@
   @RequestMapping(value = "saveModify")

   public void saveModify(String callback, AppPageNotification appPageNotification, PrintWriter out) {

      try {

         AppPageNotificationTypeEnum type = appPageNotification.getType();

         if (type == null) {

         if (appPageNotification.getId() == null) {

            JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("ID不能为空"));

            return;

         }

         

         AppPageNotification old = appPageNotificationService.getAppPageNotificationByType(type.name());

         AppPageNotification old = appPageNotificationService.selectByPrimaryKey(appPageNotification.getId());

         if (old == null) {

            JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("操作对象已不存在"));

            return;

@@ -148,6 +163,11 @@
            return;

         }

         

         if (!canClose && StringUtil.isNullOrEmpty(appPageNotification.getContentUrl())) {

            JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("跳转链接不能为空"));

            return;

         }

			
         SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm");

         

         String beginTimeVO = appPageNotification.getBeginTimeVO();

@@ -160,7 +180,7 @@
            appPageNotification.setEndTime(format.parse(endTimeVO.replaceAll("T", " ")));

         }

         

         appPageNotification.setMd5(StringUtil.Md5(type.name() + "#" + content + "#" + appPageNotification.getContentUrl()));

         appPageNotification.setMd5(StringUtil.Md5(appPageNotification.getType() + "#" + content + "#" + appPageNotification.getContentUrl()));

         appPageNotification.setUpdateTime(new Date());

         

         appPageNotification.setId(old.getId());

@@ -189,15 +209,13 @@
    */

   @RequestMapping(value = "query")

   public void query(String callback, Integer pageIndex, Integer pageSize, String key,

          Integer show, Integer canClose, PrintWriter out) {

          Integer show, Integer canClose,String version, String platform,  PrintWriter out) {



      if (pageIndex == null || pageIndex < 1) {

         pageIndex = 1;

      }



      if (pageSize == null || pageSize < 1) {

         pageSize = Constant.PAGE_SIZE;

      }

      pageSize =Integer.MAX_VALUE;



      try {

         List<AppPageNotification> list = appPageNotificationService.listQuery((pageIndex - 1) * pageSize, 

@@ -212,7 +230,6 @@
         for (AppPageNotification notification: list) {

            AppPageNotificationTypeEnum type = notification.getType();

            notification.setPageName(type.getDesc());

				
            

            Date startTime = notification.getBeginTime();

            if (startTime == null) {

@@ -229,8 +246,46 @@
            }

         }

         

			
         long count = appPageNotificationService.countQuery(key, show, canClose);

			
         List<AppVersionInfo> versionList = null;

         if (!StringUtil.isNullOrEmpty(version) || !StringUtil.isNullOrEmpty(platform)) {

            versionList = new ArrayList<>();

            if (!StringUtil.isNullOrEmpty(version)) {

               AppVersionInfo appVersion = appVersionService.selectByPrimaryKey(Long.parseLong(version));

               if (appVersion != null)

                  versionList.add(appVersion);

            } else {

               List<AppVersionInfo> appVersionList = appVersionService.getAppVersionInfoListByPlatform(platform);

               if (appVersionList != null) {

                  versionList.addAll(appVersionList);

               }

            }

         }

			
         // 过滤

         if (versionList != null) {

            if (versionList.size() > 0) {

               List<Long> sourceIdList = new ArrayList<>();

               for (AppPageNotification record : list) {

                  sourceIdList.add(record.getId());

               }

               List<Long> versionIdList = new ArrayList<>();

               for (AppVersionInfo versionInfo : versionList)

                  versionIdList.add(versionInfo.getId());

               Set<Long> sets = adActivityVersionControlService.filterSourceIdByVersion(sourceIdList,

                     AdActivityType.notification, versionIdList);

               for (int i = 0; i < list.size(); i++) {

                  if (!sets.contains(list.get(i).getId())) {

                     list.remove(i--);

                  }

               }

               count = list.size();

            } else {

               list.clear();

               count = 0;

            }

         }

         

         int totalPage = (int) (count % pageSize == 0 ? count / pageSize : count / pageSize + 1);

         PageEntity pe = new PageEntity(pageIndex, pageSize, count, totalPage);

@@ -259,15 +314,15 @@
    * @param id

    * @param out

    */

   @RequestMapping(value = "updateCanCloseState")

   public void updateCanCloseState(String callback, String type, PrintWriter out) {

   @RequestMapping(value = "switchShutOff")

   public void switchShutOff(String callback, Long id,  PrintWriter out) {

      try {

         if (type == null) {

         if (id == null) {

            JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("ID不能为空"));

            return;

         }

         

         AppPageNotification resultObj = appPageNotificationService.getAppPageNotificationByType(type);

         AppPageNotification resultObj = appPageNotificationService.selectByPrimaryKey(id);

         if (resultObj == null) {

            JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("操作数据已不存在"));

            return;

@@ -285,6 +340,11 @@
            return;

         }

         

         if (!canClose && StringUtil.isNullOrEmpty(resultObj.getContentUrl())) {

            JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("跳转链接不能为空"));

            return;

         }

			
         AppPageNotification newOBj = new AppPageNotification();

         newOBj.setId(resultObj.getId());

         newOBj.setCanClose(canClose);

@@ -293,7 +353,6 @@
         JSONObject data = new JSONObject();

         data.put("state", newOBj.getCanClose());

         JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult(data));



      } catch (Exception e) {

         JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("操作异常"));

         e.printStackTrace();

@@ -306,16 +365,15 @@
    * @param id

    * @param out

    */

   @RequestMapping(value = "updateShowState")

   public void updateShowState(String callback, String type, PrintWriter out) {

   @RequestMapping(value = "switchState")

   public void switchState(String callback, Long id, PrintWriter out) {

      try {



         if (type == null) {

         if (id == null) {

            JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("ID不能为空"));

            return;

         }

         

         AppPageNotification resultObj = appPageNotificationService.getAppPageNotificationByType(type);

         AppPageNotification resultObj = appPageNotificationService.selectByPrimaryKey(id);

         if (resultObj == null) {

            JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("操作数据已不存在"));

            return;

@@ -332,11 +390,7 @@
         newOBj.setId(resultObj.getId());

         newOBj.setShow(show);

         appPageNotificationService.updateByPrimaryKeySelective(newOBj);

			
         JSONObject data = new JSONObject();

         data.put("state", newOBj.getShow());

         JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult(data));



         JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult("操作成功"));

      } catch (Exception e) {

         JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("操作异常"));

         e.printStackTrace();

@@ -351,7 +405,6 @@
    */

   //@RequestMapping(value = "delete")

   public void delete(String callback, String idArray, PrintWriter out) {



      try {

         if (StringUtil.isNullOrEmpty(idArray)) {

            JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("请选择操作的数据"));

@@ -375,5 +428,42 @@
         e.printStackTrace();

      }

   }

	
   /**

    * 设置版本

    * 
    * @param callback

    * @param id

    * @param moveType

    * @param sex

    * @param out

    */

   @RequestMapping(value = "setVersions")

   public void setVersions(String callback, Long id, String versions, PrintWriter out) {

      JSONArray versionArray = JSONArray.fromObject(versions);

      List<Long> versionIds = new ArrayList<>();

      for (int i = 0; i < versionArray.size(); i++) {

         Long version = versionArray.optLong(i);

         versionIds.add(version);

      }

      try {

         appPageNotificationService.setVersions(id, versionIds);

         JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult(""));

      } catch (Exception e) {

         JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult(e.getMessage()));

      }

   }



   @RequestMapping(value = "getVersions")

   public void getVersions(String callback, Long id, PrintWriter out) {

      List<AdActivityVersionControl> list = adActivityVersionControlService

            .listByTypeAndSourceId(AdActivityType.notification, id);



      List<Long> versionList = new ArrayList<>();

      if (list != null)

         for (AdActivityVersionControl control : list)

            versionList.add(control.getVersion().getId());

      JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult(versionList));

   }



}