冲突解决

Administrator

2018-11-28 37ac0c6921dd4e3797205547fe48555702010169

冲突解决

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

@@ -2,12 +2,14 @@


import java.io.PrintWriter;

import java.util.ArrayList;

import java.util.Date;

import java.util.HashMap;

import java.util.List;

import java.util.Map;



import javax.annotation.Resource;



import net.sf.json.JSONArray;

import net.sf.json.JSONObject;



import org.springframework.stereotype.Controller;

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

@@ -15,22 +17,16 @@
import org.yeshi.utils.JsonUtil;



import com.google.gson.Gson;

import com.google.gson.GsonBuilder;

import com.google.gson.reflect.TypeToken;

import com.yeshi.fanli.entity.bus.activity.ActivityUser;

import com.yeshi.fanli.entity.bus.activity.RecommendActivity;

import com.yeshi.fanli.entity.bus.activity.RecommendActivityInviteInfo;

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

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

import com.yeshi.fanli.exception.ActivityException;

import com.yeshi.fanli.service.inter.activity.ActivityService;

import com.yeshi.fanli.service.inter.goods.TaoBaoGoodsBriefService;

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

@RequestMapping("admin/new/api/v1/activity")


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

@@ -6,6 +6,7 @@
import java.util.Map;



import javax.annotation.Resource;

import javax.servlet.http.HttpServletResponse;



import net.sf.json.JSONObject;



@@ -13,10 +14,14 @@
import org.springframework.web.bind.annotation.RequestMapping;

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



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

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

import com.yeshi.fanli.service.AdminUserService;

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

import com.yeshi.fanli.tag.PageEntity;

import com.yeshi.fanli.util.Constant;

import com.yeshi.fanli.util.StringUtil;

import com.yeshi.fanli.util.annotation.RequestNoLogin;



import org.yeshi.utils.JsonUtil;



@@ -26,6 +31,10 @@
    

    @Resource

    private ConfigService configService;

	
    @Resource

    private AdminUserService adminUserService;

	
    

    @RequestMapping(value = "getConfigList", method = RequestMethod.POST)

    public void getConfigList(PrintWriter out){

@@ -97,8 +106,19 @@
     * @param config

     * @param out

     */

    @RequestNoLogin()

    @RequestMapping(value = "saveModify")

    public void saveModify(String callback, Config config, PrintWriter out) {

    public void saveModify(String callback, Config config, Long uid, HttpServletResponse response, PrintWriter out) {

		
        response.setHeader("Access-Control-Allow-Origin", "*");

        response.setHeader("Access-Control-Allow-Methods", "*");



        AdminUser admin = adminUserService.selectByPrimaryKey(uid);

        if (admin == null) {

            out.print(JsonUtil.loadFalseResult("当前账户验证失败"));

            return;

        }

		
        Long id = config.getId();

        if (id == null) {

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

@@ -111,9 +131,20 @@
                JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("操作数据已不存在"));

                return;

            }

            // key 不可修改

            config.setKey(crentconfig.getKey());

            configService.update(config);

			
            if (StringUtil.isNullOrEmpty(config.getName()) || StringUtil.isNullOrEmpty(config.getValue())) {

                JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("说明、有效值不能为空"));

                return;

            }

			
            crentconfig.setName(config.getName());

            crentconfig.setValue(config.getValue());

			
            if (!StringUtil.isNullOrEmpty(config.getBeizhu())) {

                crentconfig.setBeizhu(config.getBeizhu());

            }

			
            configService.update(crentconfig);

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

            

        } catch (Exception e) {