修改bug

svr/svr-base/src/main/java/com/yihu/jw/version/controller/ServerVersionLogController.java

@@ -4,14 +4,12 @@ import com.yihu.jw.restmodel.base.version.BaseVersionContants;
import com.yihu.jw.restmodel.base.version.MBaseServerVersionLog;
import com.yihu.jw.restmodel.common.Envelop;
import com.yihu.jw.restmodel.common.EnvelopRestController;
import com.yihu.jw.restmodel.exception.ApiException;
import com.yihu.jw.version.model.BaseServerVersionLog;
import com.yihu.jw.version.service.ServerVersionLogService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.MediaType;
import org.springframework.web.bind.annotation.*;
import javax.servlet.http.HttpServletRequest;
@@ -29,7 +27,7 @@ public class ServerVersionLogController extends EnvelopRestController {
    @Autowired
    private ServerVersionLogService serverVersionLogService;
    @PostMapping(value = BaseVersionContants.BaseServerVersionLog.api_create, consumes = MediaType.APPLICATION_JSON_UTF8_VALUE)
    /*@PostMapping(value = BaseVersionContants.BaseServerVersionLog.api_create, consumes = MediaType.APPLICATION_JSON_UTF8_VALUE)
    @ApiOperation(value = "创建服务器版本日志", notes = "创建单个服务器版本日志")
    public Envelop createBaseServerVersionLog(
            @ApiParam(name = "json_data", value = "", defaultValue = "")
@@ -66,7 +64,7 @@ public class ServerVersionLogController extends EnvelopRestController {
        } catch (ApiException e) {
            return Envelop.getError(e.getMessage(), e.getErrorCode());
        }
    }
    }*/
    @RequestMapping(value = BaseVersionContants.BaseServerVersionLog.api_getBaseServerVersionLog, method = RequestMethod.GET)

svr/svr-base/src/main/java/com/yihu/jw/version/service/ServerVersionLogService.java

@@ -1,18 +1,12 @@
package com.yihu.jw.version.service;
import com.yihu.jw.mysql.query.BaseJpaService;
import com.yihu.jw.restmodel.base.version.BaseVersionContants;
import com.yihu.jw.restmodel.common.CommonContants;
import com.yihu.jw.restmodel.exception.ApiException;
import com.yihu.jw.version.dao.ServerVersionDao;
import com.yihu.jw.version.dao.ServerVersionLogDao;
import com.yihu.jw.version.model.BaseServerVersion;
import com.yihu.jw.version.model.BaseServerVersionLog;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.jdbc.core.JdbcTemplate;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.util.StringUtils;
/**
 * Created by chenweida on 2017/5/19.
@@ -24,7 +18,7 @@ public class ServerVersionLogService extends BaseJpaService<BaseServerVersion, S
    @Autowired
    private JdbcTemplate jdbcTemplate;
    @Transactional
    /*@Transactional
    public BaseServerVersionLog createBaseServerVersionLog(BaseServerVersionLog baseServerVersionLog) throws ApiException {
        if (StringUtils.isEmpty(baseServerVersionLog.getName())) {
            throw new ApiException(BaseVersionContants.BaseServerVersion.message_fail_name_is_null, CommonContants.common_error_params_code);
@@ -52,7 +46,7 @@ public class ServerVersionLogService extends BaseJpaService<BaseServerVersion, S
            throw new ApiException(BaseVersionContants.BaseServerVersion.message_fail_code_no_exist, CommonContants.common_error_params_code);
        }
        baseServerVersion.setStatus(-1);
    }
    }*/
}

svr/svr-base/src/main/java/com/yihu/jw/wx/controller/WechatController.java

@@ -48,8 +48,8 @@ public class WechatController extends EnvelopRestController {
            @ApiParam(name = "json_data", value = "", defaultValue = "")
            @RequestBody String jsonData) {
        try {
            WxWechat Wechat = toEntity(jsonData, WxWechat.class);
            return Envelop.getSuccess(WxContants.Wechat.message_success_update, wechatService.updateWxchat(Wechat));
            WxWechat wechat = toEntity(jsonData, WxWechat.class);
            return Envelop.getSuccess(WxContants.Wechat.message_success_update, wechatService.updateWxchat(wechat));
        } catch (ApiException e) {
            return Envelop.getError(e.getMessage(), e.getErrorCode());
        }

svr/svr-manage/src/main/java/com/yihu/jw/manage/controller/wechat/WechatConfigController.java

@@ -63,17 +63,9 @@ public class WechatConfigController {
    @PostMapping(value = "/wechat")
    @ApiOperation(value = "保存微信配置", notes = "保存微信配置")
    public Envelop save(@ModelAttribute @Valid WechatConfig wechatConfig) throws JsonProcessingException {
        return wechatConfigService.save(wechatConfig);
        return wechatConfigService.saveOrUpdate(wechatConfig);
    }
    @PutMapping(value = "/wechat")
    @ApiOperation(value = "更新微信配置", notes = "更新微信配置")
    public Envelop Update(@ModelAttribute @Valid WechatConfig wechatConfig){
        return wechatConfigService.update(wechatConfig);
    }
    /*@GetMapping("/getByCode")
    @ApiOperation(value = "根据code查找微信图文消息", notes = "根据code查找微信图文消息")
    public Envelop findByCode(

svr/svr-manage/src/main/java/com/yihu/jw/manage/service/wechat/WechatConfigService.java

@@ -64,25 +64,25 @@ public class WechatConfigService {
        return envelop;
    }
    public Envelop save(WechatConfig wechatConfig) throws JsonProcessingException {
    public Envelop saveOrUpdate(WechatConfig wechatConfig) throws JsonProcessingException {
        HttpHeaders headers = new HttpHeaders();
        MediaType type = MediaType.parseMediaType("application/json; charset=UTF-8");
        headers.setContentType(type);
        headers.add("Accept", MediaType.APPLICATION_JSON.toString());
        JSONObject jsonObj = JSONObject.fromObject(wechatConfig);
        HttpEntity<String> formEntity = new HttpEntity<String>(jsonObj.toString(), headers);
        ResponseEntity<Envelop> responseEntity = template.postForEntity(url + "/wechatConfig/create", formEntity, Envelop.class);
        Envelop envelop = responseEntity.getBody();
        return envelop;
    }
    public Envelop update(WechatConfig wechatConfig) {
       /* ResponseEntity<Envelop> responseEntity = template.PUT(url + "/wechatConfig/create?jsonData={jsonData}", wechatConfig, Envelop.class);
        Envelop envelop = responseEntity.getBody();
        return envelop;*/
        Envelop envelop =null;
        if(wechatConfig.getId()==null){//说明是保存
            ResponseEntity<Envelop> responseEntity = template.postForEntity(url + "/wechatConfig/create", formEntity, Envelop.class);
            envelop = responseEntity.getBody();
            return envelop;
        }
        MultiValueMap<String, String> map = new LinkedMultiValueMap<>();
        String urlRequest = url + "/wechatConfig/update?jsonData={jsonData}";
        map.add("jsonData",jsonObj.toString());
        String urlRequest = url + "/wechatConfig/update";
        RestTemplateUtil restTemplateUtil = new RestTemplateUtil(urlRequest,map);
        Envelop envelop = restTemplateUtil.exchange(urlRequest, HttpMethod.PUT, Envelop.class);
        envelop = restTemplateUtil.exchange(urlRequest, HttpMethod.PUT, Envelop.class);
        return envelop;
    }
}

svr/svr-manage/src/main/resources/webapp/html/wechat/wechatConfig/js/wechatConfigList.js

@@ -312,19 +312,13 @@ function show(code){
}
function del(codes){
    $.ajax({
        url: "/wechatConfig/deleteByCodes?codes="+codes+"&userCode="+usercode,
        type: 'DELETE',
        success: function(data){
            if(data.successFlg==true){
                alert("删除成功");
                table.ajax.reload();
            }else{
                alert("删除失败")
            }
        },
        error:function(data){
            console.log(data);
    var url = "/wechatConfig/wechat/"+codes+"?userCode="+usercode;
    do_delete(url,{},function(data){
        if(data.successFlg==true){
            alert("删除成功");
            table.ajax.reload();
        }else{
            alert("删除失败")
        }
    })
}
@@ -336,7 +330,6 @@ $("#btnsubmit").click(function(){
    if(id==''){//说明是保存
        url = "/wechatConfig/wechat"
        do_post(url,data,function(data){
            console.log(data);
            if(data.successFlg){
                alert("保存成功");
                $('#myModal-add-info').modal('hide');
@@ -347,9 +340,8 @@ $("#btnsubmit").click(function(){
        })
    }else{//说明是修改
        url="/wechatConfig/wechat"
        url="/wechatConfig/wechat?userCode="+usercode;
        do_put(url,data,function(data){
            debugger
            console.log(data);
            if(data.successFlg){
                alert("修改成功");

svr/svr-quota/src/main/java/com/yihu/jw/quota/job/EsQuotaJob.java

@@ -6,7 +6,7 @@ import com.yihu.jw.quota.etl.extract.ExtractHelper;
import com.yihu.jw.quota.etl.save.SaveHelper;
import com.yihu.jw.quota.model.jpa.TjQuotaLog;
import com.yihu.jw.quota.util.SpringUtil;
import com.yihu.jw.quota.vo.QuotaVO;
import com.yihu.jw.quota.vo.QuotaVo;
import com.yihu.jw.quota.vo.SaveModel;
import org.joda.time.DateTime;
import org.joda.time.LocalDate;
@@ -33,7 +33,7 @@ public class EsQuotaJob implements Job {
    private Logger logger = LoggerFactory.getLogger(EsQuotaJob.class);
    private String saasid;//saasid
    private QuotaVO quotaVO;//指标对象
    private QuotaVo quotaVO;//指标对象
    private String endTime;//结束时间
    private String startTime;//开始时间
    private String timeLevel;//时间
@@ -88,7 +88,7 @@ public class EsQuotaJob implements Job {
     */
    private List<SaveModel> extract() {
        try {
            return SpringUtil.getBean(ExtractHelper.class).extractData(quotaVO, startTime, endTime,timeLevel,saasid);
            return SpringUtil.getBean(ExtractHelper.class).extractData(null, startTime, endTime,timeLevel,saasid);
        } catch (Exception e) {
            e.printStackTrace();
        }
@@ -115,7 +115,7 @@ public class EsQuotaJob implements Job {
            startTime = Contant.main_dimension_timeLevel.getStartTime(timeLevel);
        }
        this.quotaVO = (QuotaVO) map.get("quota");
        this.quotaVO = (QuotaVo) map.get("quota");
        this.timeLevel = (String) map.get("timeLevel");
        if (StringUtils.isEmpty(this.timeLevel)) {
            this.timeLevel = Contant.main_dimension_timeLevel.day;

web-gateway/src/main/java/com/yihu/jw/controller/base/wx/WechatController.java

@@ -45,14 +45,18 @@ public class WechatController{
    }
    @ApiOperation(value = "更新微信配置")
    @PutMapping(value = WechatContants.Config.api_update)
    @PutMapping(value = WechatContants.Config.api_update,consumes = MediaType.APPLICATION_JSON_UTF8_VALUE)
    @HystrixCommand(commandProperties = {
            @HystrixProperty(name = "execution.isolation.thread.timeoutInMilliseconds", value = "-1"),//超时时间
            @HystrixProperty(name = "execution.timeout.enabled", value = "false") })
    public Envelop updateWechat(
            @ApiParam(name = "json_data", value = "", defaultValue = "")
            @RequestBody String jsonData) {
        Envelop wechat =wechatFegin.updateWechat(jsonData);
        JSONObject json = new JSONObject(jsonData);
        String data = json.get("jsonData").toString();
        data = data.substring(2,data.length() - 2);
        data = data.replaceAll("\\\\\"","\"");
        Envelop wechat =wechatFegin.updateWechat(data);
        return wechat;
    }
@@ -62,9 +66,9 @@ public class WechatController{
            @HystrixProperty(name = "execution.isolation.thread.timeoutInMilliseconds", value = "-1"),//超时时间
            @HystrixProperty(name = "execution.timeout.enabled", value = "false") })
    public Envelop deleteWechat(
            @ApiParam(name = "code", value = "code")
            @RequestParam(value = "code", required = true) String code) {
        Envelop wechat =wechatFegin.deleteWechat(code);
            @ApiParam(name = "codes", value = "codes")
            @RequestParam(value = "codes", required = true) String codes) {
        Envelop wechat =wechatFegin.deleteWechat(codes);
        return wechat;
    }

web-gateway/src/main/java/com/yihu/jw/fegin/base/wx/WechatFegin.java

@@ -22,11 +22,11 @@ public interface WechatFegin {
    @RequestMapping(value = WxContants.Wechat.api_create, method = RequestMethod.POST, consumes = MediaType.APPLICATION_JSON_UTF8_VALUE)
    Envelop createWechat( @RequestBody String jsonData);
    @RequestMapping(value = WxContants.Wechat.api_update, method = RequestMethod.PUT)
    @RequestMapping(value = WxContants.Wechat.api_update, method = RequestMethod.PUT, consumes = MediaType.APPLICATION_JSON_UTF8_VALUE)
    Envelop updateWechat(String jsonData);
    @RequestMapping(value = WxContants.Wechat.api_delete,method = RequestMethod.DELETE)
    Envelop deleteWechat(@RequestParam(value = "code") String code);
    Envelop deleteWechat(@RequestParam(value = "codes") String codes);
    @RequestMapping(value = WxContants.Wechat.api_getByCode,method = RequestMethod.GET)
    Envelop findByCode(@RequestParam(value = "code") String code);