svr-manage实体类变更同步bug修复

base/common-swagger/pom.xml

@@ -16,10 +16,6 @@
    <dependencies>
        <dependency>
            <groupId>com.yihu.jw</groupId>
            <artifactId>common-rest-model</artifactId>
        </dependency>
        <dependency>
            <groupId>io.springfox</groupId>
            <artifactId>springfox-swagger2</artifactId>

svr/svr-manage/pom.xml

@@ -125,6 +125,10 @@
            <artifactId>spring-boot-starter-tomcat</artifactId>
            <scope>provided</scope>
        </dependency>
        <dependency>
            <groupId>com.yihu.jw</groupId>
            <artifactId>common-entity</artifactId>
        </dependency>
    </dependencies>
    <!--<build>
        <finalName>svr-manage</finalName>

svr/svr-manage/src/main/java/com/yihu/jw/manage/controller/base/ModuleController.java

@@ -1,8 +1,8 @@
package com.yihu.jw.manage.controller.base;
import com.fasterxml.jackson.core.JsonProcessingException;
import com.yihu.jw.base.base.ModuleDO;
import com.yihu.jw.manage.service.base.ModuleService;
import com.yihu.jw.restmodel.base.base.MModule;
import com.yihu.jw.restmodel.common.Envelop;
import com.yihu.jw.rm.base.BaseRequestMapping;
import io.swagger.annotations.Api;
@@ -90,7 +90,7 @@ public class ModuleController {
    @PostMapping(BaseRequestMapping.Module.api_create)
    @ApiOperation(value = "保存/更新", notes = "保存/更新")
    public Envelop saveOrUpdate(@ModelAttribute @Valid MModule module,String userCode) throws JsonProcessingException {
    public Envelop saveOrUpdate(@ModelAttribute @Valid ModuleDO module, String userCode) throws JsonProcessingException {
        return moduleService.saveOrUpdate(module,userCode);
    }

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

@@ -1,9 +1,9 @@
package com.yihu.jw.manage.controller.wechat;
import com.fasterxml.jackson.core.JsonProcessingException;
import com.yihu.jw.base.wx.WxTemplateDO;
import com.yihu.jw.manage.service.wechat.TemplateService;
import com.yihu.jw.restmodel.common.Envelop;
import com.yihu.jw.restmodel.base.wx.MWxTemplate;
import com.yihu.jw.rm.base.WechatRequestMapping;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
@@ -73,7 +73,7 @@ public class TemplateController {
    @PostMapping(value = WechatRequestMapping.WxTemplate.api_create)
    @ApiOperation(value = "保存或者修改微信模板消息", notes = "保存或者修改微信模板消息")
    public Envelop saveOrUpdate(@ModelAttribute @Valid MWxTemplate template,@RequestParam String userCode) throws JsonProcessingException {
    public Envelop saveOrUpdate(@ModelAttribute @Valid WxTemplateDO template, @RequestParam String userCode) throws JsonProcessingException {
        Envelop envelop = templateService.saveOrUpdate(template,userCode);
        return envelop;
    }

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

@@ -1,9 +1,9 @@
package com.yihu.jw.manage.controller.wechat;
import com.fasterxml.jackson.core.JsonProcessingException;
import com.yihu.jw.base.wx.WxWechatDO;
import com.yihu.jw.manage.service.wechat.WechatConfigService;
import com.yihu.jw.restmodel.common.Envelop;
import com.yihu.jw.restmodel.base.wx.MWxWechat;
import com.yihu.jw.rm.base.WechatRequestMapping;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
@@ -74,7 +74,7 @@ public class WechatConfigController {
    @PostMapping(value = WechatRequestMapping.WxConfig.api_create)
    @ApiOperation(value = "保存微信配置", notes = "保存微信配置")
    public Envelop save(@ModelAttribute @Valid MWxWechat wechatConfig,@RequestParam String userCode) throws JsonProcessingException {
    public Envelop save(@ModelAttribute @Valid WxWechatDO wechatConfig, @RequestParam String userCode) throws JsonProcessingException {
        return wechatConfigService.saveOrUpdate(wechatConfig, userCode);
    }

svr/svr-manage/src/main/java/com/yihu/jw/manage/service/base/FunctionService.java

@@ -121,7 +121,7 @@ public class FunctionService {
            func.setCreateUser(userCode);
            func.setStatus(1);
            func.setCreateUserName(userName);
            func.setCode(UUID.randomUUID().toString().replaceAll("-",""));
//            func.setCode(UUID.randomUUID().toString().replaceAll("-",""));
        }
        func.setUpdateUserName(userName);
        func.setUpdateUser(userCode);

svr/svr-manage/src/main/java/com/yihu/jw/manage/service/base/ModuleService.java

@@ -1,9 +1,9 @@
package com.yihu.jw.manage.service.base;
import com.yihu.jw.base.base.ModuleDO;
import com.yihu.jw.manage.model.system.ManageUser;
import com.yihu.jw.manage.service.system.UserService;
import com.yihu.jw.manage.util.RestTemplateUtil;
import com.yihu.jw.restmodel.base.base.MModule;
import com.yihu.jw.restmodel.common.Envelop;
import com.yihu.jw.rm.base.BaseRequestMapping;
import net.sf.json.JSONObject;
@@ -89,7 +89,7 @@ public class ModuleService {
        return template.getForObject(url +"/module/children/"+code, Envelop.class);
    }
    public Envelop saveOrUpdate(MModule module,String userCode) {
    public Envelop saveOrUpdate(ModuleDO module, String userCode) {
        ManageUser user = userService.findByCode(userCode);
        String userName = user.getName();
@@ -98,7 +98,7 @@ public class ModuleService {
            module.setCreateUser(userCode);
            module.setStatus(1);
            module.setCreateUserName(userName);
            module.setCode(UUID.randomUUID().toString().replaceAll("-",""));
//            module.setCode(UUID.randomUUID().toString().replaceAll("-",""));
        }
        module.setUpdateUserName(userName);
        module.setUpdateUser(userCode);

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

@@ -1,11 +1,11 @@
package com.yihu.jw.manage.service.wechat;
import com.fasterxml.jackson.core.JsonProcessingException;
import com.yihu.jw.base.wx.WxGraphicMessageDO;
import com.yihu.jw.manage.model.system.ManageUser;
import com.yihu.jw.manage.service.system.UserService;
import com.yihu.jw.manage.util.RestTemplateUtil;
import com.yihu.jw.restmodel.common.Envelop;
import com.yihu.jw.restmodel.base.wx.MWxGraphicMessage;
import com.yihu.jw.rm.base.WechatRequestMapping;
import net.sf.json.JSONObject;
import org.apache.commons.lang3.StringUtils;
@@ -77,7 +77,7 @@ public class GraphicMessageService {
        return envelop;
    }
    public Envelop saveOrUpdate(MWxGraphicMessage graphicMessage, String userCode) throws JsonProcessingException {
    public Envelop saveOrUpdate(WxGraphicMessageDO graphicMessage, String userCode) throws JsonProcessingException {
        ManageUser user = userService.findByCode(userCode);
        String userName = user.getName();

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

@@ -5,7 +5,7 @@ import com.yihu.jw.manage.model.system.ManageUser;
import com.yihu.jw.manage.service.system.UserService;
import com.yihu.jw.manage.util.RestTemplateUtil;
import com.yihu.jw.restmodel.common.Envelop;
import com.yihu.jw.restmodel.base.wx.MWxTemplate;
import com.yihu.jw.base.wx.WxTemplateDO;
import com.yihu.jw.rm.base.WechatRequestMapping;
import net.sf.json.JSONObject;
import org.apache.commons.lang3.StringUtils;
@@ -79,7 +79,7 @@ public class TemplateService {
        return envelop;
    }
    public Envelop saveOrUpdate(MWxTemplate temp, String userCode) throws JsonProcessingException {
    public Envelop saveOrUpdate(WxTemplateDO temp, String userCode) throws JsonProcessingException {
        ManageUser user = userService.findByCode(userCode);
        String userName = user.getName();

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

@@ -1,11 +1,11 @@
package com.yihu.jw.manage.service.wechat;
import com.fasterxml.jackson.core.JsonProcessingException;
import com.yihu.jw.base.wx.WxWechatDO;
import com.yihu.jw.manage.model.system.ManageUser;
import com.yihu.jw.manage.service.system.UserService;
import com.yihu.jw.manage.util.RestTemplateUtil;
import com.yihu.jw.restmodel.common.Envelop;
import com.yihu.jw.restmodel.base.wx.MWxWechat;
import com.yihu.jw.rm.base.WechatRequestMapping;
import net.sf.json.JSONObject;
import org.apache.commons.lang3.StringUtils;
@@ -75,7 +75,7 @@ public class WechatConfigService {
        return envelop;
    }
    public Envelop saveOrUpdate(MWxWechat wechatConfig,String userCode) throws JsonProcessingException {
    public Envelop saveOrUpdate(WxWechatDO wechatConfig, String userCode) throws JsonProcessingException {
        ManageUser user = userService.findByCode(userCode);
        String userName = user.getName();

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

@@ -1,11 +1,11 @@
package com.yihu.jw.manage.service.wechat;
import com.fasterxml.jackson.core.JsonProcessingException;
import com.yihu.jw.base.wx.WxMenuDO;
import com.yihu.jw.manage.model.system.ManageUser;
import com.yihu.jw.manage.service.system.UserService;
import com.yihu.jw.manage.util.RestTemplateUtil;
import com.yihu.jw.restmodel.common.Envelop;
import com.yihu.jw.restmodel.base.wx.MWxMenu;
import com.yihu.jw.rm.base.WechatRequestMapping;
import net.sf.json.JSONObject;
import org.apache.commons.lang3.StringUtils;
@@ -74,7 +74,7 @@ public class WechatMenuService {
        return envelop;
    }
    public Envelop saveOrUpdate(MWxMenu menu,String userCode) throws JsonProcessingException {
    public Envelop saveOrUpdate(WxMenuDO menu, String userCode) throws JsonProcessingException {
        ManageUser user = userService.findByCode(userCode);
        String userName = user.getName();