Browse Source

合并冲突

anderx 8 years ago
parent
commit
6753ecc1eb

+ 48 - 0
src/main/java/com/goafanti/common/enums/MemberStatus.java

@@ -0,0 +1,48 @@
+package com.goafanti.common.enums;
+
+import java.util.HashMap;
+import java.util.Map;
+
+public enum MemberStatus{
+	OTHER(null,"No This Filed"),
+	NORMAL(0,"正常"),
+	LOCK(1,"锁定"),
+	OVERDUE(2,"过期");
+	private MemberStatus(Integer code, String desc) {
+		this.code = code;
+		this.desc = desc;
+	}
+	
+	private static Map<Integer, MemberStatus> status = new HashMap<Integer, MemberStatus>();
+
+	static {
+		for (MemberStatus value : MemberStatus.values()) {
+			status.put(value.getCode(), value);
+		}
+	}
+	
+	public static MemberStatus getField(String code) {
+		if (containsType(code)) {
+			return status.get(code);
+		}
+		return OTHER;
+	}
+	
+	public static String getFieldDesc(String code) {
+		return getField(code).getDesc();
+	}
+
+	public static boolean containsType(String code) {
+		return status.containsKey(code);
+	}
+	private Integer	code;
+	private String	desc;
+
+	public Integer getCode() {
+		return code;
+	}
+	public String getDesc() {
+		return desc;
+	}
+	
+}

+ 3 - 3
src/main/java/com/goafanti/common/mapper/BusinessProjectMapper.xml

@@ -539,11 +539,11 @@
     where id = #{id,jdbcType=VARCHAR}
   </update>
   
-  	<select id="findProjectListByPage" resultType="com.goafanti.admin.bo.BusinessProjectBo">
- 		select b.id, b.create_id, b.create_time, b.update_time,  b.delete_sign, b.bname,
+  		<select id="findProjectListByPage" resultType="com.goafanti.admin.bo.BusinessProjectBo">
+ 		select b.id, b.create_id as createId, b.create_time as createTime, b.update_time as updateTime,  b.delete_sign deleteSign, b.bname,
  		  b.cid,  b.price,  b.offset,  b.activity_price as activityPrice,  b.activity_flag as activityFlag,  b.member_price as memberPrice, 
  		  b.introduce,  b.status,  b.country,  b.province,  b.city,  b.district, 
-          b.principal_id,  b.Value_effect,  b.client_size,b2.cname 
+          b.principal_id as principalId,  b.Value_effect as ValueEffect,  b.client_size as  clientSize,b2.cname 
   		from business_project b
   		left join business_varieties b2 on b.cid = b2.id
   		where b.delete_sign=0 

+ 1 - 0
src/main/java/com/goafanti/common/mapper/ProjectSizeMapper.xml

@@ -422,4 +422,5 @@
     from project_size p
    where p.pname=#{pname,jdbcType=VARCHAR}
   </select>
+  
 </mapper>

+ 156 - 0
src/main/java/com/goafanti/permission/bo/PermissionBo.java

@@ -0,0 +1,156 @@
+package com.goafanti.permission.bo;
+
+import java.util.Date;
+import java.util.List;
+
+public class PermissionBo {
+	private String id;
+
+	/**
+	 * 权限对应的url path
+	 */
+	private String	url;
+
+	/**
+	 * 权限名字
+	 */
+	private String	name;
+	
+	private String createId;
+	
+	private Date createTime;
+	
+	private Date updateTime;
+	
+	private String deletedSign;
+	
+	private String autNo;
+	
+	private String hierarchies;
+	
+	private String status;
+	
+	private String showOrder;
+	
+	private String superId;	
+	
+	private List<PermissionBo> children;
+	
+	private String key;
+	
+
+	
+
+	public String getKey() {
+		return key;
+	}
+
+	public void setKey(String key) {
+		this.key = key;
+	}
+
+	public List<PermissionBo> getChildren() {
+		return children;
+	}
+
+	public void setChildren(List<PermissionBo> children) {
+		this.children = children;
+	}
+
+	public String getCreateId() {
+		return createId;
+	}
+
+	public void setCreateId(String createId) {
+		this.createId = createId;
+	}
+
+	public Date getCreateTime() {
+		return createTime;
+	}
+
+	public void setCreateTime(Date createTime) {
+		this.createTime = createTime;
+	}
+
+	public Date getUpdateTime() {
+		return updateTime;
+	}
+
+	public void setUpdateTime(Date updateTime) {
+		this.updateTime = updateTime;
+	}
+
+	public String getDeletedSign() {
+		return deletedSign;
+	}
+
+	public void setDeletedSign(String deletedSign) {
+		this.deletedSign = deletedSign;
+	}
+
+	public String getAutNo() {
+		return autNo;
+	}
+
+	public void setAutNo(String autNo) {
+		this.autNo = autNo;
+	}
+
+	public String getHierarchies() {
+		return hierarchies;
+	}
+
+	public void setHierarchies(String hierarchies) {
+		this.hierarchies = hierarchies;
+	}
+
+	public String getStatus() {
+		return status;
+	}
+
+	public void setStatus(String status) {
+		this.status = status;
+	}
+
+	public String getShowOrder() {
+		return showOrder;
+	}
+
+	public void setShowOrder(String showOrder) {
+		this.showOrder = showOrder;
+	}
+
+	public String getSuperId() {
+		return superId;
+	}
+
+	public void setSuperId(String superId) {
+		this.superId = superId;
+	}
+
+	public String getId() {
+		return id;
+	}
+
+	public void setId(String id) {
+		this.id = id;
+	}
+
+	public String getUrl() {
+		return url;
+	}
+
+	public void setUrl(String url) {
+		this.url = url;
+	}
+
+	public String getName() {
+		return name;
+	}
+
+	public void setName(String name) {
+		this.name = name;
+	}
+	
+}

+ 136 - 0
src/main/java/com/goafanti/permission/controller/NewPermissionApiController.java

@@ -0,0 +1,136 @@
+package com.goafanti.permission.controller;
+
+import javax.annotation.Resource;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RestController;
+
+import com.goafanti.common.bo.Result;
+import com.goafanti.common.constant.ErrorConstants;
+import com.goafanti.common.controller.BaseApiController;
+import com.goafanti.common.dao.PermissionMapper;
+import com.goafanti.common.model.Permission;
+import com.goafanti.common.utils.StringUtils;
+import com.goafanti.permission.bo.PermissionBo;
+import com.goafanti.permission.service.PermissionService;
+
+@RestController
+@RequestMapping("api/admin")
+public class NewPermissionApiController extends BaseApiController {
+	@Resource
+	private PermissionService permissionService;
+	@Autowired
+	PermissionMapper		permissionMapper;
+	/**权限管理列表 **/
+	@RequestMapping(value = "/permissions", method = RequestMethod.POST)
+	public Result permissions() {
+		Result res = new Result();
+		res.setData(permissionService.findPermissionsAll());
+		return res;
+	}
+	
+	/**权限管理最上级新增 **/
+	@RequestMapping(value = "/addSupPermission" , method = RequestMethod.POST)
+	public Result addSupPermission(Permission record ){
+		Result res = new Result();
+		if(StringUtils.isBlank(record.getName())){
+			res.getError().add(buildError("","权限名不能为空"));
+			return res;
+		}
+		String aut=permissionMapper.selectAutNoByName(record.getName());
+		if(aut!=null){
+			res.getError().add(buildError("","权限已存在"));
+			return res;
+		}
+		res.setData(permissionService.insertn(record));
+		return res;
+	}
+	/**新增上级名称自动生成 **/
+	@RequestMapping(value = "/selectSuperIdById" , method = RequestMethod.POST)
+	public Permission selectSuperIdById(String id ){
+		return permissionService.selectSuperIdById(id);
+	}
+	
+	/**权限管理新增 **/
+	@RequestMapping(value = "/addPermission" , method = RequestMethod.POST)
+	public Result addPermission(Permission record ){
+		Result res = new Result();
+		if(StringUtils.isBlank(record.getName())|| StringUtils.isBlank(record.getUrl())
+				|| StringUtils.isBlank(record.getSuperId())){
+			res.getError().add(buildError("","名称、路径、上级不能为空"));
+			return res;
+		}
+		String aut=permissionMapper.selectAutNoByName(record.getName());
+		if(aut!=null){
+			res.getError().add(buildError("","权限已存在"));
+			return res;
+		}
+		String supaut=permissionMapper.selectAutNoByName(record.getSuperId());
+		if(supaut.length()>=7){
+			res.getError().add(buildError("","权限层级超限"));
+			return res;
+		}
+		res.setData(permissionService.insertSubordinate(record));
+		return res;
+	}
+	
+	/**删除列表信息**/
+	@RequestMapping(value = "/deleteById" , method = RequestMethod.POST)
+	public Result deleteById(String id){
+		Result res = new Result();
+		if(StringUtils.isBlank(id)){
+			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR, "id"));
+			return res;
+		}
+		Permission permission=permissionMapper.selectAllById(id);
+		String superId=permission.getName();
+		int subordinate=permissionMapper.selectCountBySuperId(superId);
+		if(subordinate>0){
+			res.getError().add(buildError("","存在下级权限不能删除"));
+			return res;
+		}
+		res.setData(permissionService.deleteById(id));
+		return res;
+	}
+	
+	/**编辑页面数据读取**/
+	@RequestMapping(value = "/selectAllById" , method = RequestMethod.POST)
+	public Result selectAllById(String id){
+		Result res = new Result();
+		res.setData(permissionService.selectAllById(id));
+		return res;
+	}
+	
+	/**上级权限自动补全查询**/
+	@RequestMapping(value = "/selectName" , method = RequestMethod.POST)
+	public Result selectName(String name){
+		Result res = new Result();
+		res.setData(permissionService.selectName(name));
+		return res;
+	}
+	
+	/**修改信息**/
+	@RequestMapping(value = "/updateById" , method = RequestMethod.POST)
+	public Result updateById(Permission record ){
+		Result res = new Result();
+		if(StringUtils.isBlank(record.getName())|| StringUtils.isBlank(record.getUrl())
+				|| StringUtils.isBlank(record.getSuperId())){
+			res.getError().add(buildError("","名称、路径、上级不能为空"));
+			return res;
+		}
+		String pname=permissionMapper.selectAutNoByName(record.getSuperId());
+		if(StringUtils.isBlank(pname)){
+			res.getError().add(buildError("","上级权限不匹配"));
+			return res;
+		}
+		String supaut=permissionMapper.selectAutNoByName(record.getSuperId());
+		if(supaut.length()>=7){
+			res.getError().add(buildError("","权限层级超限"));
+			return res;
+		}
+		res.setData(permissionService.updateById(record));
+		return res;
+	}
+}