多APP优化

admin

2020-07-03 651a15c78f668bef3859d9ed1bb7ad0b669d3600

 fanli/src/main/java/com/yeshi/fanli/controller/admin/homemodule/SwiperBannerAdminController.java

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

import java.util.Date;

import java.util.HashMap;

import java.util.HashSet;

import java.util.List;

import java.util.Map;

import java.util.Set;

@@ -13,6 +12,8 @@
import javax.annotation.Resource;

import javax.servlet.http.HttpServletRequest;



import com.yeshi.fanli.entity.accept.AdminAcceptData;

import org.apache.commons.beanutils.PropertyUtils;

import org.springframework.stereotype.Controller;

import org.springframework.web.bind.annotation.RequestMapping;

import org.springframework.web.multipart.MultipartHttpServletRequest;

@@ -22,23 +23,28 @@
import com.google.gson.GsonBuilder;

import com.google.gson.reflect.TypeToken;

import com.yeshi.fanli.entity.AppVersionInfo;

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

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

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

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

import com.yeshi.fanli.entity.bus.homemodule.CommonShareInfo.CommonShareInfoEnum;

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

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

import com.yeshi.fanli.entity.common.JumpDetailV2;

import com.yeshi.fanli.exception.banner.SwiperBannerException;

import com.yeshi.fanli.exception.banner.SwiperPictureException;

import com.yeshi.fanli.log.LogHelper;

import com.yeshi.fanli.service.AdminUserService;

import com.yeshi.fanli.service.inter.common.JumpDetailV2Service;

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

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

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

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

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

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

import com.yeshi.fanli.tag.PageEntity;

import com.yeshi.fanli.util.Constant;

import com.yeshi.fanli.util.StringUtil;

import com.yeshi.fanli.vo.homemodule.BannerVO;



import net.sf.json.JSONArray;

import net.sf.json.JSONObject;

@@ -54,25 +60,20 @@
public class SwiperBannerAdminController {



   @Resource

   private AdminUserService adminUserService;



   @Resource

   private SwiperBannerService swiperBannerService;



   @Resource

   private SwiperPictureService swiperPictureService;



   @Resource

   private SystemConfigService systemConfigService;



   @Resource

   private JumpDetailV2Service jumpDetailV2Service;



   @Resource

   private AppVersionService appVersionService;



   @Resource

   private AdActivityVersionControlService adActivityVersionControlService;

	
   @Resource

   private CommonShareInfoService commonShareInfoService;

	


   /**

    * 新增

@@ -82,26 +83,30 @@
    * @param out

    */

   @RequestMapping(value = "saveAdd")

   public void saveAdd(String callback, SwiperBanner swiperBanner, PrintWriter out) {

   public void saveAdd(AdminAcceptData acceptData, String callback, SwiperBanner swiperBanner, PrintWriter out) {



      try {

         String title = swiperBanner.getTitle();

         String card = swiperBanner.getCard();



         if (StringUtil.isNullOrEmpty(title) || StringUtil.isNullOrEmpty(card)) {

            JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("说明与标识不能为空"));

            JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("名称与标识不能为空"));

            return;

         }



         swiperBanner.setState(1);// 默认停用

         if (swiperBanner.getState() == null) {

            swiperBanner.setState(1);// 默认停用

         } 
			
         Date nowTime = new Date();

         swiperBanner.setCreatetime(nowTime);

         swiperBanner.setUpdatetime(nowTime);

         swiperBannerService.insert(swiperBanner);



         swiperBanner.setSystem(acceptData.getSystem());

         swiperBannerService.insertSelective(swiperBanner);

         JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult("添加成功"));

      } catch (Exception e) {

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

         LogHelper.errorDetailInfo(e);

         e.printStackTrace();

      }

   }

@@ -114,9 +119,8 @@
    * @param out

    */

   @RequestMapping(value = "saveModify")

   public void saveModify(String callback, SwiperBanner swiperBanner, PrintWriter out) {

   public void saveModify(AdminAcceptData acceptData, String callback, SwiperBanner swiperBanner, PrintWriter out) {

      try {



         Long id = swiperBanner.getId();

         if (id == null) {

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

@@ -136,6 +140,10 @@
            return;

         }



         if (swiperBanner.getState() == null) {

            swiperBanner.setState(1);// 默认停用

         } 
			
         if (StringUtil.isNullOrEmpty(title)) {

            swiperBanner.setTitle(null);

         }

@@ -143,75 +151,48 @@
         if (StringUtil.isNullOrEmpty(card)) {

            swiperBanner.setCard(null);

         }



         swiperBanner.setUpdatetime(new Date());

         swiperBannerService.updateByPrimaryKeySelective(swiperBanner);



         JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult("修改成功"));



      } catch (SwiperBannerException e) {

      } catch (Exception e) {

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

         LogHelper.errorDetailInfo(e);

         e.printStackTrace();

      }

   }



	
   /**

    * 修该状态

    * 
    * 修改状态

    * @param callback

    * @param id

    * @param out

    */

   @RequestMapping(value = "updateState")

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

   @RequestMapping(value = "switchState")

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

      try {



         if (id == null) {

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

            return;

         }



         SwiperBanner resultObj = swiperBannerService.selectByPrimaryKey(id);

         if (resultObj == null) {

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

            return;

         }



         Integer state = resultObj.getState();

         if (state == null || state.equals(1) || state == 1) {

            resultObj.setState(0);

         } else {

            resultObj.setState(1);

         }



         swiperBannerService.updateByPrimaryKeySelective(resultObj);



         JSONObject data = new JSONObject();

         data.put("state", resultObj.getState());



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



         swiperBannerService.switchState(id);

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

      } catch (SwiperBannerException e) {

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

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

      } catch (Exception e) {

         JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("操作失败"));

         LogHelper.errorDetailInfo(e);

         e.printStackTrace();

      }

   }



   /**

    * 查询

    * 
    * @param acceptData

    * @param callback

    * @param pageIndex

    * @param pageSize

    * @param key

    *            模糊查询：说明、标识

    * @param sort

    *            排序 ： 创建时间倒序1 默认正序

    * @param key   模糊查询：说明、标识

    * @param sort   排序 ： 创建时间倒序1 默认正序

    * @param out

    */

   @RequestMapping(value = "query")

   public void query(String callback, Integer pageIndex, Integer pageSize, String key, Integer sort, PrintWriter out) {



   public void query(AdminAcceptData acceptData, String callback, Integer pageIndex, Integer pageSize, String key, Integer sort, PrintWriter out) {

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

         pageIndex = 1;

      }

@@ -219,23 +200,24 @@
      if (pageSize == null || pageSize < 1) {

         pageSize = Constant.PAGE_SIZE;

      }



      try {

         List<SwiperBanner> list = swiperBannerService.query((pageIndex - 1) * pageSize, pageSize, key, sort);



         List<SwiperBanner> list = swiperBannerService.query((pageIndex - 1) * pageSize, pageSize, key, sort,acceptData.getSystem());

         if (list == null || list.size() == 0) {

            JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("暂无数据"));

            return;

         }



         for (SwiperBanner swiperBanne : list) {

            if (swiperBanne.getState() != null && swiperBanne.getState() == 0) {

               swiperBanne.setState(1);

            } else {

               swiperBanne.setState(0);

            }

            long TotalPic = swiperPictureService.countQueryByBannerID(swiperBanne.getId());



            swiperBanne.setTotalPic(TotalPic);

         }



         long count = swiperBannerService.countQuery(key);



         long count = swiperBannerService.countQuery(key,acceptData.getSystem());

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

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



@@ -246,14 +228,12 @@
         JSONObject data = new JSONObject();

         data.put("pe", pe);

         data.put("result_list", gson.toJson(list));



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



      } catch (Exception e) {

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

         LogHelper.errorDetailInfo(e);

         e.printStackTrace();

      }



   }



   /**

@@ -264,8 +244,7 @@
    * @param out

    */

   @RequestMapping(value = "delete")

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



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

      try {

         if (StringUtil.isNullOrEmpty(idArray)) {

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

@@ -280,28 +259,25 @@
            JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("未检测到删除的数据"));

            return;

         }



         int count = swiperBannerService.deleteBatchByPrimaryKey(list);



         JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult("成功删除[" + count + "]条数据"));



      } catch (Exception e) {

         JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("删除失败"));

         LogHelper.errorDetailInfo(e);

         e.printStackTrace();

      }

   }



   @RequestMapping(value = "getEffectiveOption")

   public void getEffectiveOption(String callback, PrintWriter out) {

   public void getEffectiveOption(AdminAcceptData acceptData, String callback, PrintWriter out) {

      try {

         List<Object> list = new ArrayList<Object>();



         Map<String, Object> mapDefalut = new HashMap<String, Object>();

         mapDefalut.put("key", 0);

         mapDefalut.put("value", "--未选择--");

         list.add(mapDefalut);



         List<SwiperBanner> listBanner = swiperBannerService.getEffectiveOption();

         List<SwiperBanner> listBanner = swiperBannerService.getEffectiveOption(acceptData.getSystem());

         if (listBanner != null && listBanner.size() > 0) {

            for (SwiperBanner swiperBanner : listBanner) {

               Map<String, Object> map = new HashMap<String, Object>();

@@ -314,9 +290,9 @@
         JSONObject data = new JSONObject();

         data.put("result_list", list);

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



      } catch (Exception e) {

         JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("删除失败"));

         LogHelper.errorDetailInfo(e);

         e.printStackTrace();

      }

   }

@@ -331,24 +307,18 @@
    * @param out

    */

   @RequestMapping(value = "queryPicInfo")

   public void queryPicInfo(String callback, Integer pageIndex, Integer pageSize, Long bannerId, String version,

   public void queryPicInfo(AdminAcceptData acceptData, String callback, Integer pageIndex, Integer pageSize, Long bannerId, String version,

         String platform, PrintWriter out) {



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

         pageIndex = 1;

      }



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

         pageSize = Constant.PAGE_SIZE;

      }



      pageSize = 100;



      if (bannerId == null) {

         out.print(JsonUtil.loadFalseResult("轮播图管理ID不能为空"));

         return;

      }



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

         pageIndex = 1;

      }

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

         pageSize = 100;

      }

      List<AppVersionInfo> versionList = null;

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

         versionList = new ArrayList<>();

@@ -357,7 +327,7 @@
            if (appVersion != null)

               versionList.add(appVersion);

         } else {

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

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

            if (appVersionList != null) {

               versionList.addAll(appVersionList);

            }

@@ -365,55 +335,84 @@
      }



      try {



         List<SwiperPicture> list = swiperPictureService.queryByBannerID((pageIndex - 1) * pageSize, pageSize,

         List<SwiperPicture> listPic = swiperPictureService.queryByBannerID((pageIndex - 1) * pageSize, pageSize,

               bannerId);



         if (list == null || list.size() == 0) {

         if (listPic == null || listPic.size() == 0) {

            JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("暂无数据"));

            return;

         }



         List<BannerVO> list = new ArrayList<BannerVO>();

         // 跳转链接

         for (SwiperPicture swiperPicture : list) {



            SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm");

            Date startTime = swiperPicture.getStartTime();

         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm");

         for (SwiperPicture swiperPicture : listPic) {

            BannerVO bannerVO = new BannerVO();

            try {

               PropertyUtils.copyProperties(bannerVO, swiperPicture);

            } catch (Exception e) {

               e.printStackTrace();

               continue;

            }

				
				
            if (bannerVO.getState() != null && bannerVO.getState() == 0) {

               bannerVO.setState(1);

            } else {

               bannerVO.setState(0);

            }

				
				
            Date startTime = bannerVO.getStartTime();

            if (startTime == null) {

               swiperPicture.setStartTime_str("");

               bannerVO.setStartTime_str("");

            } else {

               swiperPicture.setStartTime_str(sdf.format(startTime));

               bannerVO.setStartTime_str(sdf.format(startTime));

            }



            Date endTime = swiperPicture.getEndTime();

            Date endTime = bannerVO.getEndTime();

            if (endTime == null) {

               swiperPicture.setEndTime_str("");

               bannerVO.setEndTime_str("");

            } else {

               swiperPicture.setEndTime_str(sdf.format(endTime));

               bannerVO.setEndTime_str(sdf.format(endTime));

            }



            String params = swiperPicture.getParams();

            String params = bannerVO.getParams();

            if (params == null) {

               swiperPicture.setParams("");

               bannerVO.setParams("");

            }



            String remark = swiperPicture.getRemark();

            String remark = bannerVO.getRemark();

            if (remark == null) {

               swiperPicture.setRemark("");

               bannerVO.setRemark("");

            }



            JumpDetailV2 jumpDetail = swiperPicture.getJumpDetail();

            JumpDetailV2 jumpDetail = bannerVO.getJumpDetail();

            if (jumpDetail == null) {

               // 默认未选择

               JumpDetailV2 jumpDetailV2 = new JumpDetailV2();

               jumpDetailV2.setName("-未选择-");

               jumpDetailV2.setType("default");

               swiperPicture.setJumpDetail(jumpDetailV2);

               bannerVO.setJumpDetail(jumpDetailV2);

            }

				
            // 分享补充信息

            CommonShareInfo info = commonShareInfoService.getByPidAndType(bannerVO.getId(),

                  CommonShareInfoEnum.banner.name());

            if (info == null) {

               bannerVO.setNeedSpin(false);

               bannerVO.setComment("");

            } else {

               bannerVO.setNeedSpin(info.getNeedSpin());

               if (StringUtil.isNullOrEmpty(info.getComment())) {

                  bannerVO.setComment("");

               } else {

                  bannerVO.setComment(info.getComment());

               }

            }

            list.add(bannerVO);

         }



         long count = swiperPictureService.countQueryByBannerID(bannerId);



         // 过滤

         if (versionList != null) {

            if (versionList.size() > 0) {

@@ -449,11 +448,10 @@
         JSONObject data = new JSONObject();

         data.put("pe", pe);

         data.put("result_list", gson.toJson(list));



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



      } catch (SwiperPictureException e) {

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

         LogHelper.errorDetailInfo(e);

         e.printStackTrace();

      }



@@ -467,15 +465,16 @@
    * @param out

    */

   @RequestMapping(value = "savePicInfo")

   public void savePicInfo(String callback, SwiperPicture record, String jumpType, HttpServletRequest request,

         PrintWriter out) {

   public void savePicInfo(AdminAcceptData acceptData, String callback, SwiperPicture record, String jumpType, CommonShareInfo extra,

         HttpServletRequest request,   PrintWriter out) {

      try {

         record.setSystem(acceptData.getSystem());

         // 1. 先判断httpRequest 是否含有文件类型

         if (request instanceof MultipartHttpServletRequest) {

            MultipartHttpServletRequest fileRequest = (MultipartHttpServletRequest) request;

            swiperPictureService.saveObject(fileRequest.getFile("file"), record, jumpType);

            swiperPictureService.saveObject(fileRequest.getFile("file"), record, jumpType, extra);

         } else {

            swiperPictureService.saveObject(null, record, jumpType);

            swiperPictureService.saveObject(null, record, jumpType, extra);

         }



         JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult("保存成功"));

@@ -483,10 +482,33 @@
         JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult(e.getMsg()));

      } catch (Exception e) {

         JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("保存失败"));

         LogHelper.errorDetailInfo(e);

         e.printStackTrace();

      }

   }



	
   /**

    * 修改状态

    * @param callback

    * @param id

    * @param out

    */

   @RequestMapping(value = "switchStatePic")

   public void switchStatePic(AdminAcceptData acceptData, String callback, Long id, PrintWriter out) {

      try {

         swiperPictureService.switchState(id);

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

      } catch (SwiperPictureException e) {

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

      } catch (Exception e) {

         JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("操作失败"));

         LogHelper.errorDetailInfo(e);

         e.printStackTrace();

      }

   }

	
	
   /**

    * 删除图片以及信息

    * 

@@ -495,8 +517,7 @@
    * @param out

    */

   @RequestMapping(value = "deletePicInfo")

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



   public void deletePicInfo(AdminAcceptData acceptData, String callback, String idArray, PrintWriter out) {

      try {

         if (StringUtil.isNullOrEmpty(idArray)) {

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

@@ -513,11 +534,10 @@
         }



         int count = swiperPictureService.deleteBatchByPrimaryKey(list);



         JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult("成功删除[" + count + "]条数据"));



      } catch (Exception e) {

         JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("删除失败"));

         LogHelper.errorDetailInfo(e);

         e.printStackTrace();

      }

   }

@@ -530,8 +550,7 @@
    * @param out

    */

   @RequestMapping(value = "saveOrder")

   public void saveOrder(String callback, Long id, Integer moveType, PrintWriter out) {



   public void saveOrder(AdminAcceptData acceptData, String callback, Long id, Integer moveType, PrintWriter out) {

      if (moveType == null || (!moveType.equals(1) && !moveType.equals(-1))) {

         JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("传递的类型不正确"));

         return;

@@ -543,7 +562,6 @@
      }



      try {



         SwiperPicture resultObj = swiperPictureService.selectByPrimaryKey(id);

         if (resultObj == null) {

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

@@ -558,21 +576,17 @@
            SwiperPicture changeObj = list.get(0);

            // 交换排序序号

            resultObj.setOrder(changeObj.getOrder());



            changeObj.setOrder(oldOrder);



            swiperPictureService.updateByPrimaryKeySelective(changeObj);

         }



         swiperPictureService.updateByPrimaryKeySelective(resultObj);



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



      } catch (Exception e) {

         e.printStackTrace();

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

         LogHelper.errorDetailInfo(e);

         e.printStackTrace();

      }



   }



   /**

@@ -580,12 +594,10 @@
    * 

    * @param callback

    * @param id

    * @param moveType

    * @param sex

    * @param out

    */

   @RequestMapping(value = "setVersions")

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

   public void setVersions(AdminAcceptData acceptData, 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++) {

@@ -601,7 +613,7 @@
   }



   @RequestMapping(value = "getVersions")

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

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

      List<AdActivityVersionControl> list = adActivityVersionControlService

            .listByTypeAndSourceId(AdActivityType.banner, id);