Merge branch 'dev' of chenweida/jw2.0 into dev

common/common-rest-model/src/main/java/com/yihu/jw/restmodel/base/base/MFunction.java

@@ -5,9 +5,8 @@ import java.util.*;
/**
 * Created by chenweida on 2017/5/19.
 */
public class MFunction {
    private Long id;
    private String code;//业务code
public class FunctionVO {
    private String id;
    private String name; //功能名称
    private String saasId; // saasid
    private String parentCode; //父功能code
@@ -20,25 +19,17 @@ public class MFunction {
    private String updateUserName;
    private Date updateTime;
    private String remark; //备注
    private List<MFunction> children = new ArrayList<>();
    private List<FunctionVO> children = new ArrayList<>();
    private String text;
    public Long getId() {
    public String getId() {
        return id;
    }
    public void setId(Long id) {
    public void setId(String id) {
        this.id = id;
    }
    public String getCode() {
        return code;
    }
    public void setCode(String code) {
        this.code = code;
    }
    public String getName() {
        return name;
    }
@@ -127,11 +118,11 @@ public class MFunction {
        this.remark = remark;
    }
    public List<MFunction> getChildren() {
    public List<FunctionVO> getChildren() {
        return children;
    }
    public void setChildren(List<MFunction> children) {
    public void setChildren(List<FunctionVO> children) {
        this.children = children;
    }

common/common-rest-model/src/main/java/com/yihu/jw/restmodel/base/base/MModule.java

@@ -7,9 +7,8 @@ import java.util.List;
/**
 * Created by chenweida on 2017/5/19.
 */
public class MModule {
    private Long id;
    private String code; //业务code
public class ModuleVO{
    private String id;
    private String name; //模块名称
    private String saasId; //关联 Saas code
    private String parentCode;//父id
@@ -22,24 +21,16 @@ public class MModule {
    private Date updateTime;
    private String remark;
    private String state ;   //closed:表示有子节点   open:表示没有子节点
    private List<MModule> children = new ArrayList<>();
    private List<ModuleVO> children = new ArrayList<>();
    public Long getId() {
    public String getId() {
        return id;
    }
    public void setId(Long id) {
    public void setId(String id) {
        this.id = id;
    }
    public String getCode() {
        return code;
    }
    public void setCode(String code) {
        this.code = code;
    }
    public String getName() {
        return name;
    }
@@ -136,11 +127,11 @@ public class MModule {
        this.state = state;
    }
    public List<MModule> getChildren() {
    public List<ModuleVO> getChildren() {
        return children;
    }
    public void setChildren(List<MModule> children) {
    public void setChildren(List<ModuleVO> children) {
        this.children = children;
    }
}

common/common-rest-model/src/main/java/com/yihu/jw/restmodel/base/base/MSaas.java

@@ -5,9 +5,8 @@ import java.util.Date;
/**
 * Created by chenweida on 2017/5/19.
 */
public class MSaas {
    private Long id;
    private String code;//业务code、
public class SaasVO {
    private String id;
    private String name;//名称
    private Integer status;//状态 -1 已删除 0待审核 1审核通过 2 审核不通过
    private String createUser; //创建人code
@@ -18,22 +17,14 @@ public class MSaas {
    private Date modifyTime;//修改时间
    private String remark;//备注
    public Long getId() {
    public String getId() {
        return id;
    }
    public void setId(Long id) {
    public void setId(String id) {
        this.id = id;
    }
    public String getCode() {
        return code;
    }
    public void setCode(String code) {
        this.code = code;
    }
    public String getName() {
        return name;
    }

common/common-rest-model/src/main/java/com/yihu/jw/restmodel/base/sms/MSmsGateway.java

@@ -3,9 +3,8 @@ package com.yihu.jw.restmodel.base.sms;
/**
 * Created by chenweida on 2017/5/22.
 */
public class MSmsGateway {
    private Long id;
    private String code; //业务code
public class SmsGatewayVO {
    private String id;
    private String name;//名称
    private String saasId; //关联 base_saas code
    private String orgCode; //机构code
@@ -14,12 +13,12 @@ public class MSmsGateway {
    private String password;	//短信接口的密码
    private String url;	//短信接口的url
    public String getCode() {
        return code;
    public String getId() {
        return id;
    }
    public void setCode(String code) {
        this.code = code;
    public void setId(String id) {
        this.id = id;
    }
    public String getSaasId() {
@@ -70,13 +69,6 @@ public class MSmsGateway {
        this.url = url;
    }
    public Long getId() {
        return id;
    }
    public void setId(Long id) {
        this.id = id;
    }
    public String getName() {
        return name;

common/common-rest-model/src/main/java/com/yihu/jw/restmodel/base/sms/MSms.java

@@ -5,9 +5,8 @@ import java.util.Date;
/**
 * Created by chenweida on 2017/5/22.
 */
public class MSms {
    private Long id;
public class SmsVO {
    private String id;
    private String saasId;	//saasid 关联base_saas code
    private String mobile;	//电话号码
    private String ip;	//发送短信的ip地址
@@ -18,11 +17,11 @@ public class MSms {
    private Integer status;	//短信状态 状态，0未发送，1已发送
    private Date czrq; //操作时间
    public Long getId() {
    public String getId() {
        return id;
    }
    public void setId(Long id) {
    public void setId(String id) {
        this.id = id;
    }

common/common-rest-model/src/main/java/com/yihu/jw/restmodel/base/version/MBaseServerUrlVersion.java

@@ -5,8 +5,8 @@ import java.util.Date;
/**
 * Created by chenweida on 2017/6/16.
 */
public class MBaseServerUrlVersion {
    private String code;
public class BaseServerUrlVersionVO {
    private String id;
    private String saasId;
    private String functionCode;//关联功能表 base_function code
    private String functionName;//功能名字
@@ -23,12 +23,12 @@ public class MBaseServerUrlVersion {
    private Integer status;//1: 正常 0：不可用  -1删除
    private String remark;
    public String getCode() {
        return code;
    public String getId() {
        return id;
    }
    public void setCode(String code) {
        this.code = code;
    public void setId(String id) {
        this.id = id;
    }
    public String getSaasId() {

common/common-rest-model/src/main/java/com/yihu/jw/restmodel/base/version/MBaseServerVersionLog.java

@@ -5,9 +5,9 @@ import java.util.Date;
/**
 * Created by chenweida on 2017/6/16.
 */
public class MBaseServerVersionLog {
public class BaseServerVersionLogVO {
    private Long id;
    private String id;
    private String saasId; //关联saas code
    private String userCodes;//此次更新的用户 多个逗号分割
    private String name;//此次更新的版本名称
@@ -21,14 +21,12 @@ public class MBaseServerVersionLog {
        return saasId;
    }
    public Long getId() {
        return id;
    }
    public void setId(Long id) {
    public void setId(String id) {
        this.id = id;
    }
    public void setSaasId(String saasId) {
        this.saasId = saasId;
    }

common/common-rest-model/src/main/java/com/yihu/jw/restmodel/base/version/MBaseServerVersion.java

@@ -7,8 +7,8 @@ import java.util.List;
/**
 * Created by chenweida on 2017/6/16.
 */
public class MBaseServerVersion {
    private String code; //业务code
public class BaseServerVersionVO {
    private String id;
    private String saasId;//关联base_saas code
    private String userCode;//用户表code 医生
    private String name; //版本名称
@@ -22,18 +22,18 @@ public class MBaseServerVersion {
    private Integer status;////-1 删除 0 禁用 可用
    private String remark;
    private List<MBaseServerUrlVersion> children = new ArrayList<>();
    private List<BaseServerVersionVO> children = new ArrayList<>();
    //children长度为0时    state  “open”表示是子节点，“closed”表示为父节点；
    // children长度>0时,  state   “open,closed”表示是节点的打开关闭
    private String state;
    public String getCode() {
        return code;
    public String getId() {
        return id;
    }
    public void setCode(String code) {
        this.code = code;
    public void setId(String id) {
        this.id = id;
    }
    public String getSaasId() {
@@ -132,11 +132,11 @@ public class MBaseServerVersion {
        this.remark = remark;
    }
    public List<MBaseServerUrlVersion> getChildren() {
    public List<BaseServerVersionVO> getChildren() {
        return children;
    }
    public void setChildren(List<MBaseServerUrlVersion> children) {
    public void setChildren(List<BaseServerVersionVO> children) {
        this.children = children;
    }

common/common-rest-model/src/main/java/com/yihu/jw/restmodel/base/version/MWlyyVersion.java

@@ -5,8 +5,8 @@ import java.util.Date;
/**
 * Created by chenweida on 2017/6/16.
 */
public class MWlyyVersion {
    private Long id;
public class WlyyVersionVO {
    private String id;
    private String saasId; //saas code
    private String code;
    private String name;
@@ -23,11 +23,11 @@ public class MWlyyVersion {
    private String updateUserName;
    private Integer status;////-1 删除 0 禁用 可用
    public Long getId() {
    public String getId() {
        return id;
    }
    public void setId(Long id) {
    public void setId(String id) {
        this.id = id;
    }

common/common-rest-model/src/main/java/com/yihu/jw/restmodel/base/wx/MWxGraphicMessage.java

@@ -5,9 +5,8 @@ import java.util.Date;
/**
 * Created by Administrator on 2017/5/21 0021.
 */
public class MWxGraphicMessage {
    private Long id;
    private String code;//业务code
public class WxGraphicMessageVO {
    private String id;
    private String saasId;
    private String title;//标题
    private String description;//描述
@@ -22,22 +21,14 @@ public class MWxGraphicMessage {
    private String remark;//备注
    private Integer status;  //状态 -1删除 0 冻结 1可用
    public Long getId() {
    public String getId() {
        return id;
    }
    public void setId(Long id) {
    public void setId(String id) {
        this.id = id;
    }
    public String getCode() {
        return code;
    }
    public void setCode(String code) {
        this.code = code;
    }
    public String getTitle() {
        return title;
    }

common/common-rest-model/src/main/java/com/yihu/jw/restmodel/base/wx/MWxMenu.java

@@ -7,10 +7,9 @@ import java.util.List;
/**
 * Created by Administrator on 2017/5/20 0020.
 */
public class MWxMenu {
    private Long id;//主键id
public class WxMenuVO {
    private String id;//主键id
    private String code;//业务code
    private String wechatCode;//关联的微信code 关联表 Wx_Wechat
    private String wechatName;//关联的微信名 关联表 Wx_Wechat
    private String supMenucode;//父菜单id 如果是一级菜单 此字段为空
@@ -30,33 +29,25 @@ public class MWxMenu {
    private String createUserName;//创建人
    private String remark;//备注
    private Integer status; //状态 -1删除 0 冻结 1可用
    private List<MWxMenu> children = new ArrayList<>();
    private List<WxMenuVO> children = new ArrayList<>();
    private String state;
    public List<MWxMenu> getChildren() {
    public List<WxMenuVO> getChildren() {
        return children;
    }
    public void setChildren(List<MWxMenu> children) {
    public void setChildren(List<WxMenuVO> children) {
        this.children = children;
    }
    public Long getId() {
    public String getId() {
        return id;
    }
    public void setId(Long id) {
    public void setId(String id) {
        this.id = id;
    }
    public String getCode() {
        return code;
    }
    public void setCode(String code) {
        this.code = code;
    }
    public String getWechatCode() {
        return wechatCode;
    }

common/common-rest-model/src/main/java/com/yihu/jw/restmodel/base/wx/MWxTemplate.java

@@ -8,9 +8,8 @@ import java.util.Map;
/**
 * Created by Administrator on 2017/5/20 0020.
 */
public class MWxTemplate {
    private Long id;
    private String code;//模板code
public class WxTemplateVO {
    private String id;
    private String title;//模板标题
    private String name;//用于模板列表渲染
    private String wechatCode;//关联的微信code 关联表 Wx_Wechat
@@ -28,6 +27,14 @@ public class MWxTemplate {
    private String state;
    private Integer status;  //状态 -1删除 0 冻结 1可用
    public String getId() {
        return id;
    }
    public void setId(String id) {
        this.id = id;
    }
    public String getRemark() {
        return remark;
    }
@@ -44,21 +51,6 @@ public class MWxTemplate {
        this.status = status;
    }
    public Long getId() {
        return id;
    }
    public void setId(Long id) {
        this.id = id;
    }
    public String getCode() {
        return code;
    }
    public void setCode(String code) {
        this.code = code;
    }
    public String getTitle() {
        return title;

common/common-rest-model/src/main/java/com/yihu/jw/restmodel/base/wx/MWxWechat.java

@@ -8,10 +8,9 @@ import java.util.Map;
/**
 * Created by Administrator on 2017/5/20 0020.
 */
public class MWxWechat {
public class WxWechatVO {
    private Long id;
    private String code;//业务code
    private String id;
    private String saasId;//'saas配置id'
    private String name;//名称
    private String token;//token
@@ -32,23 +31,14 @@ public class MWxWechat {
    private List<Map<String,Object>> children = new ArrayList<>();
    private String state;
    public Long getId() {
    public String getId() {
        return id;
    }
    public void setId(Long id) {
    public void setId(String id) {
        this.id = id;
    }
    public String getCode() {
        return code;
    }
    public void setCode(String code) {
        this.code = code;
    }
    public String getSaasId() {
        return saasId;
    }

common/common-rest-model/src/main/java/com/yihu/jw/restmodel/manage/system/ManageUserVO.java

@@ -6,8 +6,7 @@ import java.util.Date;
 * Created by chenweida on 2017/6/9.
 */
public class ManageUserVO {
    private Integer id;
    private String code;
    private String id;
    private String name;
    private String password;//密码  密码是 密码+salt MD5加密
    private String salt;//盐值
@@ -22,22 +21,14 @@ public class ManageUserVO {
    private String updateUserName;
    private String remark;
    public Integer getId() {
    public String getId() {
        return id;
    }
    public void setId(Integer id) {
    public void setId(String id) {
        this.id = id;
    }
    public String getCode() {
        return code;
    }
    public void setCode(String code) {
        this.code = code;
    }
    public String getName() {
        return name;
    }

svr/svr-base/src/main/java/com/yihu/jw/business/base/controller/FunctionController.java

@@ -4,7 +4,7 @@ import com.yihu.jw.base.base.FunctionDO;
import com.yihu.jw.business.base.service.FunctionService;
import com.yihu.jw.business.base.service.ModuleFunService;
import com.yihu.jw.exception.ApiException;
import com.yihu.jw.restmodel.base.base.MFunction;
import com.yihu.jw.restmodel.base.base.FunctionVO;
import com.yihu.jw.restmodel.common.Envelop;
import com.yihu.jw.restmodel.common.EnvelopRestController;
import com.yihu.jw.rm.base.BaseRequestMapping;
@@ -125,7 +125,7 @@ public class FunctionController extends EnvelopRestController {
        //封装头信息
        pagedResponse(request, response, count, page, size);
        //封装返回格式
        List<MFunction> mFunctions = convertToModels(list, new ArrayList<>(list.size()), MFunction.class, fields);
        List<FunctionVO> mFunctions = convertToModels(list, new ArrayList<>(list.size()), FunctionVO.class, fields);
        return Envelop.getSuccessListWithPage(BaseRequestMapping.Function.message_success_find_functions,mFunctions, page, size,count);
    }
@@ -151,7 +151,7 @@ public class FunctionController extends EnvelopRestController {
            }
        }
        //封装返回格式
        List<MFunction> mFunctions = convertToModels(functions, new ArrayList<>(functions.size()), MFunction.class, fields);
        List<FunctionVO> mFunctions = convertToModels(functions, new ArrayList<>(functions.size()), FunctionVO.class, fields);
        return Envelop.getSuccessList(BaseRequestMapping.Function.message_success_find_functions,mFunctions);
    }

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

@@ -7,7 +7,7 @@ import com.yihu.jw.base.base.FunctionDO;
import com.yihu.jw.exception.ApiException;
import com.yihu.jw.exception.code.ExceptionCode;
import com.yihu.base.mysql.query.BaseJpaService;
import com.yihu.jw.restmodel.base.base.MFunction;
import com.yihu.jw.restmodel.base.base.FunctionVO;
import com.yihu.jw.rm.base.BaseRequestMapping;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.jdbc.core.JdbcTemplate;
@@ -97,9 +97,9 @@ public class FunctionService extends BaseJpaService<FunctionDO, FunctionDao> {
        moduleFunctionDao.save(saasModuleList);
    }
    public List<MFunction> getModuleFunctions(String saasId) {
    public List<FunctionVO> getModuleFunctions(String saasId) {
        String sql=" select m.code,m.parent_code,m.name from base_function f,base_module_function mf where f.code=mf.function_id and f.status=1 and mf.module_id=?";
        return jdbcTemplate.queryForList(sql,MFunction.class,saasId);
        return jdbcTemplate.queryForList(sql,FunctionVO.class,saasId);
    }
    /**

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

@@ -2,7 +2,7 @@ package com.yihu.jw.manage.controller.base;
import com.fasterxml.jackson.core.JsonProcessingException;
import com.yihu.jw.manage.service.base.FunctionService;
import com.yihu.jw.restmodel.base.base.MFunction;
import com.yihu.jw.restmodel.base.base.FunctionVO;
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 FunctionController {
    @PostMapping(BaseRequestMapping.Function.api_create)
    @ApiOperation(value = "保存/更新", notes = "保存/更新")
    public Envelop saveOrUpdate(@ModelAttribute @Valid MFunction func,String userCode) throws JsonProcessingException {
    public Envelop saveOrUpdate(@ModelAttribute @Valid FunctionVO func, String userCode) throws JsonProcessingException {
        return functionService.saveOrUpdate(func,userCode);
    }

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

@@ -3,7 +3,7 @@ package com.yihu.jw.manage.service.base;
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.MFunction;
import com.yihu.jw.restmodel.base.base.FunctionVO;
import com.yihu.jw.restmodel.common.Envelop;
import com.yihu.jw.rm.base.BaseRequestMapping;
import net.sf.json.JSONObject;
@@ -112,7 +112,7 @@ public class FunctionService {
        return template.getForObject(url +"/function/children/"+code, Envelop.class);
    }
    public Envelop saveOrUpdate(MFunction func,String userCode) {
    public Envelop saveOrUpdate(FunctionVO func, String userCode) {
        ManageUser user = userService.findByCode(userCode);
        String userName = user.getName();