--no commit message

com.zrqx.member/src/main/java/com/zrqx/member/bg/emember/controller/ExpertMemberController.java

@@ -13,6 +13,7 @@ import org.springframework.web.bind.annotation.RestController;
 import com.zrqx.core.constant.member.MemberRequestPath;
 import com.zrqx.core.exception.FailedException;
 import com.zrqx.core.exception.ParameterValidateException;
+import com.zrqx.core.form.member.bg.emember.SaveEMemberForm;
 import com.zrqx.core.model.member.ExpertMember;
 import com.zrqx.core.util.response.CallBack;
 import com.zrqx.member.bg.emember.service.ExpertMemberService;
@@ -31,6 +32,13 @@ public class ExpertMemberController {
 	/** 专家用户service */
 	@Autowired
 	private ExpertMemberService service;
+	@ApiOperation(value = "新增和修改专家用户信息", notes = "新增和修改专家用户信息")
+	@PostMapping(value = MemberRequestPath.SAVE)
+	public CallBack<Boolean> saveOrUpdate(@Validated @RequestBody SaveEMemberForm form) {
+		service.saveOrUpdate(form);
+		return CallBack.success();
+	}
+	
 	@ApiOperation(value = "新增专家用户信息", notes = "新增专家用户")
 	@PostMapping(value = MemberRequestPath.SAVE)
 	public CallBack<Integer> insert(@Validated @RequestBody ExpertMember entity) {

com.zrqx.member/src/main/java/com/zrqx/member/bg/emember/service/ExpertMemberService.java

 package com.zrqx.member.bg.emember.service;
 
+import com.zrqx.core.form.member.bg.emember.SaveEMemberForm;
 import com.zrqx.core.model.member.ExpertMember;
 import com.zrqx.core.service.BaseService;
 
 public interface ExpertMemberService extends BaseService<ExpertMember, Integer> {
-	void save();
-	void update();
+	void saveOrUpdate(SaveEMemberForm form);
 }

com.zrqx.member/src/main/java/com/zrqx/member/bg/emember/service/ExpertMemberServiceImpl.java

 package com.zrqx.member.bg.emember.service;
 
+import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import com.zrqx.core.exception.BusinessValidateException;
+import com.zrqx.core.form.member.bg.emember.SaveEMemberForm;
 import com.zrqx.core.mapper.BaseMapper;
 import com.zrqx.core.model.member.ExpertMember;
+import com.zrqx.core.model.member.Member;
 import com.zrqx.core.service.BaseServiceImpl;
 import com.zrqx.member.bg.emember.mapper.ExpertMemberMapper;
+import com.zrqx.member.bg.member.mapper.MemberMapper;
+
+import tk.mybatis.mapper.entity.Example.Criteria;
 
 @Service
 public class ExpertMemberServiceImpl extends BaseServiceImpl<ExpertMember,Integer> implements ExpertMemberService {
 	@Autowired
 	private ExpertMemberMapper mapper;
+	@Autowired
+	private MemberMapper mmapper;
 	@Override
 	public BaseMapper<ExpertMember> getMapper() {
 		return mapper;
 	}
 	@Override
-	public void save() {
-		// TODO Auto-generated method stub
-		
+	public void saveOrUpdate(SaveEMemberForm form) {
+		if(isExist(form.getId(),form.getAccount()) != null) {
+			throw new BusinessValidateException("用户已存在！");
+		}
+		Member m = new Member();
+		ExpertMember em = new ExpertMember();
+		BeanUtils.copyProperties(form, m);
+		BeanUtils.copyProperties(form, em);
+		if (form.getId() == null) {
+			//新增
+			synchronized(this) {
+				if(isExist(form.getId(),form.getAccount()) != null) {
+					throw new BusinessValidateException("用户已存在！");
+				}
+				mmapper.insert(m);
+				em.setId(m.getId());
+				mapper.insert(em);
+			}
+			
+		}else {
+			//修改
+			synchronized(this) {
+				if(isExist(form.getId(),form.getAccount()) != null) {
+					throw new BusinessValidateException("用户已存在！");
+				}
+				Member old = mmapper.selectByPrimaryKey(m.getId());
+				m.setCreateTime(old.getCreateTime());
+				mmapper.updateByPrimaryKeySelective(m);
+				mapper.updateByPrimaryKeySelective(em);
+			}
+		}
 	}
-	@Override
-	public void update() {
-		// TODO Auto-generated method stub
-		
+	/**
+	 * 判断 账号是否已存在
+	 * @param id
+	 * @param account
+	 * @return
+	 */
+	public Member isExist(Integer id, String account) {
+		Criteria cr = createCriteria(Member.class);
+		cr.andEqualTo("account", account);
+		if (id != null) {
+			cr.andNotEqualTo("id", id);
+		}
+		return mmapper.selectOneByExample(cr);
 	}
-
 }

com.zrqx.member/src/main/java/com/zrqx/member/bg/member/controller/MemberController.java

@@ -58,8 +58,8 @@ public class MemberController {
 		return CallBack.success(isExist(id,account) != null);
 	}
 
-	@ApiOperation(value = "新增会员", notes = "新增一个会员，返回id-普通用户和专家用户 共用此接口")
-	@PostMapping(value = MemberRequestPath.SAVE)
+	//@ApiOperation(value = "新增会员", notes = "新增一个会员，返回id-普通用户和专家用户 共用此接口")
+	//@PostMapping(value = MemberRequestPath.SAVE)
 	public CallBack<Integer> insert(@Validated @RequestBody Member entity) {
 		if(isExist(null,entity.getAccount()) != null) {
 			throw new BusinessValidateException("用户已存在！");
@@ -70,7 +70,7 @@ public class MemberController {
 		};
 		return CallBack.success(entity.getId());
 	}
-	@ApiOperation(value = "删除", notes = "删除")
+	@ApiOperation(value = "批量删除会员", notes = "批量删除会员")
 	@PostMapping(value = MemberRequestPath.BATCH_DELETE)
 	public CallBack<Boolean> deleteByIds(@RequestBody List<Integer> ids) {
 		service.createCriteria().andIn("id", ids);
@@ -81,8 +81,8 @@ public class MemberController {
 		}
 		return CallBack.success(true);
 	}
-	@ApiOperation(value = "修改会员", notes = "修改一个会员-普通用户和专家用户 共用此接口")
-	@PostMapping(value = MemberRequestPath.UPDATE)
+	//@ApiOperation(value = "修改会员", notes = "修改一个会员-普通用户和专家用户 共用此接口")
+	//@PostMapping(value = MemberRequestPath.UPDATE)
 	public CallBack<Boolean> update(@RequestBody Member entity) {
 		if(isExist(entity.getId(),entity.getAccount()) != null) {
 			throw new BusinessValidateException("用户已存在！");
@@ -97,8 +97,8 @@ public class MemberController {
 		}
 		return CallBack.success();
 	}
-	@ApiOperation(value = "查询", notes = "根据ID查询-普通用户和专家用户 共用此接口")
-	@GetMapping(value = MemberRequestPath.OID)
+	//@ApiOperation(value = "查询", notes = "根据ID查询-普通用户和专家用户 共用此接口")
+	//@GetMapping(value = MemberRequestPath.OID)
 	public CallBack<Member> getById(@PathVariable Integer oid) {
 		Member member = service.selectByPrimaryKey(oid);
 		if(member == null) {

com.zrqx.member/src/main/java/com/zrqx/member/bg/omember/controller/OrganMemberController.java

 package com.zrqx.member.bg.omember.controller;
 
-public class OrganMemberController {
+import java.util.List;
+
+import org.apache.commons.lang3.StringUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 
+import com.zrqx.core.constant.member.MemberRequestPath;
+import com.zrqx.core.enums.ResponseCodeEnum;
+import com.zrqx.core.exception.BaseException;
+import com.zrqx.core.exception.ParameterValidateException;
+import com.zrqx.core.form.member.bg.omember.QueryOrganMemberForm;
+import com.zrqx.core.model.member.Member;
+import com.zrqx.core.util.page.PageInfo;
+import com.zrqx.core.util.page.PageParam;
+import com.zrqx.core.util.response.CallBack;
+import com.zrqx.core.vo.member.bg.member.OrganMemberListVO;
+import com.zrqx.core.vo.member.bg.member.OrganMemberVO;
+import com.zrqx.member.bg.member.service.MemberService;
+import com.zrqx.member.bg.omember.service.OrganMemberService;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+/**
+ * 机构用户信息 Controller
+ */
+@RestController
+@RequestMapping(MemberRequestPath.BG+MemberRequestPath.O_MEMBER)
+@Api(description = "会员管理-机构用户信息")
+public class OrganMemberController {
+	private final static Logger logger = LoggerFactory.getLogger(OrganMemberController.class);
+	/** 用户基础信息service */
+	@Autowired
+	private OrganMemberService service;
+	/** 用户基础信息service */
+	@Autowired
+	private MemberService mservice;
+	@ApiOperation(value = "批量重置密码", notes = "批量重置密码")
+	@GetMapping(value = MemberRequestPath.BATCH_UPDATE)
+	public CallBack<Boolean> getById(@RequestBody List<Integer> ids) {
+		mservice.createCriteria().andIn("id", ids);
+		Member entity = new Member();
+		entity.setPassword("");
+		if (!mservice.updateByCriteriaSelective(entity)) {
+			throw new BaseException(ResponseCodeEnum.FAIL);
+		}
+		return CallBack.success(true);
+	}
+	@ApiOperation(value = "查询", notes = "根据ID查询")
+	@GetMapping(value = MemberRequestPath.OID)
+	public CallBack<OrganMemberVO> getById(@PathVariable Integer oid) {
+		OrganMemberVO member = service.getById(oid);
+		if(member == null) {
+			throw new ParameterValidateException("用户id错误！");
+		}
+		return CallBack.success(member);
+	}
+	@ApiOperation(value = "分页查询", notes = "分页查询-普通用户和专家用户 共用此接口")
+	@GetMapping(value = MemberRequestPath.PAGE)
+	public CallBack<PageInfo<OrganMemberListVO>> getMemberPage(QueryOrganMemberForm form,PageParam pageParam) {
+		if(StringUtils.isBlank(pageParam.getOrderBy())){
+			pageParam.setOrderBy("createTime desc");
+		}
+		return CallBack.success(service.page(form, pageParam));
+	}
 }

com.zrqx.member/src/main/java/com/zrqx/member/bg/omember/mapper/OrganMemberMapper.java

 package com.zrqx.member.bg.omember.mapper;
 
+import java.util.List;
+
+import org.apache.ibatis.annotations.Select;
+
+import com.zrqx.core.form.member.bg.omember.QueryOrganMemberForm;
 import com.zrqx.core.mapper.BaseMapper;
 import com.zrqx.core.model.member.OrganMember;
+import com.zrqx.core.vo.member.bg.member.OrganMemberListVO;
+import com.zrqx.core.vo.member.bg.member.OrganMemberVO;
 
 public interface OrganMemberMapper extends BaseMapper<OrganMember>{
-
+	@Select("select m.id,account,status,name,type,createTime,endTime,relatedResourceTypes from m_Member m "
+			+ "left join m_Organ_Member om "
+			+ "on m.id = om.id "
+			+ "left join m_Organ o "
+			+ "on om.oid = o.id "
+			+ "where m.id = #{id}")
+	public OrganMemberVO getById(Integer id);
+	@Select("<script> select m.id,account,status,name,type,createTime,endTime m_member m"
+			+ "left join m_Organ_Member om "
+			+ "on m.id = om.id "
+			+ "left join m_Organ o "
+			+ "on om.oid = o.id "
+			+ " where  status != 2"
+			+ "<if test = '"+NOTBLANK+"(account)' >"
+			+ " and m.account like concat(#{account},'%') "
+			+ "</if>"
+			+ "<if test = '"+NOTBLANK+"(name)' >"
+			+ " and o.name like concat(#{name},'%') "
+			+ "</if>"
+			+ "<if test = 'status != null' >"
+			+ " and m.status = #{status} "
+			+ "</if>"
+			+ "<if test = 'type != null' >"
+			+ " and o.type = #{type} "
+			+ "</if>"
+			+ "<if test = '"+NOTBLANK+"(beginTime)' >"
+			+ "<![CDATA["
+			+ " and m.createTime >= #{beginTime} "
+			+ "]]>"
+			+ "</if>"
+			+ "<if test = '"+NOTBLANK+"(endTime)' >"
+			+ "<![CDATA["
+			+ " and m.createTime <= #{endTime} "
+			+ "]]>"
+			+ "</if>"
+			+ "</script>")
+	public List<OrganMemberListVO> page(QueryOrganMemberForm form);
 }

com.zrqx.member/src/main/java/com/zrqx/member/bg/omember/service/OrganMemberService.java

 package com.zrqx.member.bg.omember.service;
 
-public interface OrganMemberService {
+import com.zrqx.core.form.member.bg.omember.QueryOrganMemberForm;
+import com.zrqx.core.model.member.OrganMember;
+import com.zrqx.core.service.BaseService;
+import com.zrqx.core.util.page.PageInfo;
+import com.zrqx.core.util.page.PageParam;
+import com.zrqx.core.vo.member.bg.member.OrganMemberListVO;
+import com.zrqx.core.vo.member.bg.member.OrganMemberVO;
 
+public interface OrganMemberService extends BaseService<OrganMember, Integer> {
+	OrganMemberVO getById(Integer id);
+	PageInfo<OrganMemberListVO> page(QueryOrganMemberForm form,PageParam pageParam);
 }

com.zrqx.member/src/main/java/com/zrqx/member/bg/omember/service/OrganMemberServiceImpl.java

 package com.zrqx.member.bg.omember.service;
 
-public class OrganMemberServiceImpl {
+import java.util.List;
+
+import org.springframework.beans.factory.annotation.Autowired;
+
+import com.zrqx.core.form.member.bg.omember.QueryOrganMemberForm;
+import com.zrqx.core.mapper.BaseMapper;
+import com.zrqx.core.model.member.OrganMember;
+import com.zrqx.core.service.BaseServiceImpl;
+import com.zrqx.core.util.page.PageInfo;
+import com.zrqx.core.util.page.PageParam;
+import com.zrqx.core.vo.member.bg.member.OrganMemberListVO;
+import com.zrqx.core.vo.member.bg.member.OrganMemberVO;
+import com.zrqx.member.bg.omember.mapper.OrganMemberMapper;
+
+public class OrganMemberServiceImpl extends BaseServiceImpl<OrganMember,Integer> implements OrganMemberService {
+	@Autowired
+	private OrganMemberMapper mapper;
+	@Override
+	public BaseMapper<OrganMember> getMapper() {
+		return mapper;
+	}
+	@Override
+	public OrganMemberVO getById(Integer id) {
+		return mapper.getById(id);
+	}
+	@Override
+	public PageInfo<OrganMemberListVO> page(QueryOrganMemberForm form, PageParam pageParam) {
+		startPage(pageParam);
+		List<OrganMemberListVO> list = mapper.page(form);
+		return new PageInfo<OrganMemberListVO>(list);
+	}
 
 }

com.zrqx.member/src/main/java/com/zrqx/member/bg/pmember/controller/PersonalMemberController.java

@@ -13,6 +13,7 @@ import org.springframework.web.bind.annotation.RestController;
 import com.zrqx.core.constant.member.MemberRequestPath;
 import com.zrqx.core.exception.FailedException;
 import com.zrqx.core.exception.ParameterValidateException;
+import com.zrqx.core.form.member.bg.pmember.SavePMemberForm;
 import com.zrqx.core.model.member.PersonalMember;
 import com.zrqx.core.util.response.CallBack;
 import com.zrqx.member.bg.pmember.service.PersonalMemberService;
@@ -31,7 +32,13 @@ public class PersonalMemberController {
 	/** 个人用户service */
 	@Autowired
 	private PersonalMemberService service;
-	@ApiOperation(value = "新增专家用户信息", notes = "新增专家用户")
+	@ApiOperation(value = "新增和修改普通用户信息", notes = "新增和修改普通用户信息")
+	@PostMapping(value = MemberRequestPath.SAVE)
+	public CallBack<Boolean> save(@Validated @RequestBody SavePMemberForm form) {
+		service.saveOrUpdate(form);
+		return CallBack.success();
+	}
+	@ApiOperation(value = "新增普通用户信息", notes = "新增普通用户")
 	@PostMapping(value = MemberRequestPath.SAVE)
 	public CallBack<Integer> insert(@Validated @RequestBody PersonalMember entity) {
 		if(service.insert(entity)) {
@@ -39,7 +46,7 @@ public class PersonalMemberController {
 		};
 		return CallBack.success(entity.getId());
 	}
-	@ApiOperation(value = "修改专家用户信息", notes = "修改专家用户信息")
+	@ApiOperation(value = "修改普通用户信息", notes = "修改普通用户信息")
 	@PostMapping(value = MemberRequestPath.UPDATE)
 	public CallBack<Boolean> update(@Validated @RequestBody PersonalMember entity) {
 		PersonalMember member = service.selectByPrimaryKey(entity.getId());

com.zrqx.member/src/main/java/com/zrqx/member/bg/pmember/service/PersonalMemberService.java

 package com.zrqx.member.bg.pmember.service;
 
+import com.zrqx.core.form.member.bg.pmember.SavePMemberForm;
 import com.zrqx.core.model.member.PersonalMember;
 import com.zrqx.core.service.BaseService;
 
 public interface PersonalMemberService extends BaseService<PersonalMember, Integer> {
-
+	void saveOrUpdate(SavePMemberForm form);
 }

com.zrqx.member/src/main/java/com/zrqx/member/bg/pmember/service/PersonalMemberServiceImpl.java

 package com.zrqx.member.bg.pmember.service;
 
+import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
 
+import com.zrqx.core.exception.BusinessValidateException;
+import com.zrqx.core.form.member.bg.pmember.SavePMemberForm;
 import com.zrqx.core.mapper.BaseMapper;
+import com.zrqx.core.model.member.Member;
 import com.zrqx.core.model.member.PersonalMember;
 import com.zrqx.core.service.BaseServiceImpl;
+import com.zrqx.member.bg.member.mapper.MemberMapper;
 import com.zrqx.member.bg.pmember.mapper.PersonalMemberMapper;
 
-public class PersonalMemberServiceImpl extends BaseServiceImpl<PersonalMember,Integer> implements PersonalMemberService {
+import tk.mybatis.mapper.entity.Example.Criteria;
+
+@Service
+public class PersonalMemberServiceImpl extends BaseServiceImpl<PersonalMember, Integer>
+		implements PersonalMemberService {
 	@Autowired
 	private PersonalMemberMapper mapper;
+	@Autowired
+	private MemberMapper mmapper;
+
 	@Override
 	public BaseMapper<PersonalMember> getMapper() {
 		return mapper;
 	}
 
+	@Override
+	public void saveOrUpdate(SavePMemberForm form) {
+		if (isExist(form.getId(), form.getAccount()) != null) {
+			throw new BusinessValidateException("用户已存在！");
+		}
+		Member m = new Member();
+		PersonalMember pm = new PersonalMember();
+		BeanUtils.copyProperties(form, m);
+		BeanUtils.copyProperties(form, pm);
+		if (form.getId() == null) {
+			// 新增
+			synchronized (this) {
+				if (isExist(form.getId(), form.getAccount()) != null) {
+					throw new BusinessValidateException("用户已存在！");
+				}
+				mmapper.insert(m);
+				pm.setId(m.getId());
+				mapper.insert(pm);
+			}
+		} else {
+			// 修改
+			synchronized (this) {
+				if (isExist(form.getId(), form.getAccount()) != null) {
+					throw new BusinessValidateException("用户已存在！");
+				}
+				Member old = mmapper.selectByPrimaryKey(m.getId());
+				m.setCreateTime(old.getCreateTime());
+				mmapper.updateByPrimaryKeySelective(m);
+				mapper.updateByPrimaryKeySelective(pm);
+			}
+		}
+	}
+
+	/**
+	 * 判断 账号是否已存在
+	 * 
+	 * @param id
+	 * @param account
+	 * @return
+	 */
+	public Member isExist(Integer id, String account) {
+		Criteria cr = createCriteria(Member.class);
+		cr.andEqualTo("account", account);
+		if (id != null) {
+			cr.andNotEqualTo("id", id);
+		}
+		return mmapper.selectOneByExample(cr);
+	}
 }