删除了部分残余代码

admin

2019-03-20 435bed78efa8ab34bbf456ef55eb586ccfc113f1

 fanli/src/main/java/com/yeshi/fanli/controller/client/SystemClientController.java

@@ -1,10 +1,8 @@
package com.yeshi.fanli.controller.client;



import java.io.PrintWriter;

import java.lang.reflect.InvocationTargetException;

import java.util.ArrayList;

import java.util.List;

import java.util.Properties;



import javax.annotation.Resource;



@@ -17,12 +15,12 @@
import com.google.gson.GsonBuilder;

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

import com.yeshi.fanli.entity.push.DeviceActive;

import com.yeshi.fanli.entity.system.BusinessSystem;

import com.yeshi.fanli.entity.system.CustomerContent;

import com.yeshi.fanli.entity.system.System;

import com.yeshi.fanli.entity.system.SystemClientParams;

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

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

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

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

import com.yeshi.fanli.service.inter.push.DeviceActiveService;

import com.yeshi.fanli.service.inter.push.IOSPushService;

import com.yeshi.fanli.util.ThreadUtil;

@@ -34,7 +32,7 @@
public class SystemClientController {



   @Resource

   private SystemService systemService;

   private BusinessSystemService businessSystemService;



   @Resource

   private SystemClientParamsService systemClientParamsService;

@@ -50,13 +48,13 @@


   @RequestMapping("getsystemclientparams")

   public void getSystemClientParams(AcceptData acceptData, PrintWriter out) {

      System system = systemService.getSystemCache(acceptData.getPlatform(), acceptData.getPackages());

      BusinessSystem system = businessSystemService.getBusinessSystemCache(acceptData.getPlatform(), acceptData.getPackages());

      if (system == null) {

         out.print("系统不存在");

         return;

      }

      List<SystemClientParams> systemClientParamsList = systemClientParamsService

            .getSystemClientParamsBySystemId(system.getId());

            .getSystemClientParamsBySystemId(system.getId(),Integer.parseInt(acceptData.getVersion()));

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

         out.print(JsonUtil.loadFalseResult("暂无数据"));

         return;

@@ -73,17 +71,17 @@


         }



         if (sp.getKey().equalsIgnoreCase("iosonling") && "ios".equalsIgnoreCase(acceptData.getPlatform())

         if (ssp.getKey().equalsIgnoreCase("iosonling") && "ios".equalsIgnoreCase(acceptData.getPlatform())

               && configService.iosOnLining(Integer.parseInt(acceptData.getVersion()))) {

            sp.setValue("1");

         } else if (sp.getKey().equalsIgnoreCase("home_weex_url")) {

            ssp.setValue("1");

         } else if (ssp.getKey().equalsIgnoreCase("home_weex_url")) {

            if (("android".equalsIgnoreCase(acceptData.getPlatform())

                  && Integer.parseInt(acceptData.getVersion()) < 36)) {

               // 老版本weex（1.5.1之前的）

               sp.setValue("http://ec-1255749512.file.myqcloud.com/resource/weex/flq_index_v2.js");

               ssp.setValue("http://ec-1255749512.file.myqcloud.com/resource/weex/flq_index_v2.js");

            } else if ("ios".equalsIgnoreCase(acceptData.getPlatform())

                  && Integer.parseInt(acceptData.getVersion()) < 44)

               sp.setValue("http://ec-1255749512.file.myqcloud.com/resource/weex/flq_index_v2.js");

               ssp.setValue("http://ec-1255749512.file.myqcloud.com/resource/weex/flq_index_v2.js");

         }

         list.add(ssp);

      }