重构

tamguo-oms/src/main/java/com/tamguo/config/dao/SuperEntity.java

@@ -11,19 +11,20 @@ public class SuperEntity<T extends Model<?>> extends Model<T> {
 
 	private static final long serialVersionUID = 1L;
 
-    @TableId("uid")
+    @TableId("id")
-    private String uid;
+    private String id;
 
     @Override
     protected Serializable pkVal() {
-        return this.getUid();
+        return this.getId();
     }
 
-	public String getUid() {
+	public String getId() {
-		return uid;
+		return id;
 	}
 
-	public void setUid(String uid) {
+	public void setId(String id) {
-		this.uid = uid;
+		this.id = id;
 	}
+    
 }

tamguo-oms/src/main/java/com/tamguo/config/shiro/UserRealm.java

@@ -43,7 +43,7 @@ public class UserRealm extends AuthorizingRealm {
 	@Override
 	protected AuthorizationInfo doGetAuthorizationInfo(PrincipalCollection principals) {
 		SysUserEntity user = (SysUserEntity)principals.getPrimaryPrincipal();
-		String userId = user.getUid();
+		String userId = user.getId();
 		
 		List<String> permsList = null;
 		

tamguo-oms/src/main/java/com/tamguo/modules/sys/dao/SysCompanyMapper.java

@@ -1,8 +1,13 @@
 package com.tamguo.modules.sys.dao;
 
+import java.util.List;
+
 import com.tamguo.config.dao.SuperMapper;
 import com.tamguo.modules.sys.model.SysCompanyEntity;
+import com.tamguo.modules.sys.model.condition.SysCompanyCondition;
 
 public interface SysCompanyMapper extends SuperMapper<SysCompanyEntity>{
 
+	List<SysCompanyEntity> listData(SysCompanyCondition condition);
+
 }

tamguo-oms/src/main/java/com/tamguo/modules/sys/model/SysCompanyEntity.java

@@ -1,6 +1,8 @@
 package com.tamguo.modules.sys.model;
 
 import java.io.Serializable;
+import java.util.Date;
+
 import com.baomidou.mybatisplus.annotations.TableName;
 import com.tamguo.config.dao.SuperEntity;
 
@@ -20,9 +22,11 @@ public class SysCompanyEntity extends SuperEntity<SysCompanyEntity> implements S
 	private String address;
 	private String zipCode;
 	private String email;
-	private String comments;
+	private String remarks;
 	private String parentId;
-	private String treeId;
+	private Boolean isLeaf;
+	private Integer treeLevel;
+	private Date updateDate;
 	
 	public String getName() {
 		return name;
@@ -72,12 +76,6 @@ public class SysCompanyEntity extends SuperEntity<SysCompanyEntity> implements S
 	public void setEmail(String email) {
 		this.email = email;
 	}
-	public String getComments() {
-		return comments;
-	}
-	public void setComments(String comments) {
-		this.comments = comments;
-	}
 	public static long getSerialversionuid() {
 		return serialVersionUID;
 	}
@@ -87,11 +85,29 @@ public class SysCompanyEntity extends SuperEntity<SysCompanyEntity> implements S
 	public void setParentId(String parentId) {
 		this.parentId = parentId;
 	}
-	public String getTreeId() {
+	public String getRemarks() {
-		return treeId;
+		return remarks;
+	}
+	public void setRemarks(String remarks) {
+		this.remarks = remarks;
+	}
+	public Integer getTreeLevel() {
+		return treeLevel;
+	}
+	public void setTreeLevel(Integer treeLevel) {
+		this.treeLevel = treeLevel;
+	}
+	public Boolean getIsLeaf() {
+		return isLeaf;
+	}
+	public void setIsLeaf(Boolean isLeaf) {
+		this.isLeaf = isLeaf;
+	}
+	public Date getUpdateDate() {
+		return updateDate;
 	}
-	public void setTreeId(String treeId) {
+	public void setUpdateDate(Date updateDate) {
-		this.treeId = treeId;
+		this.updateDate = updateDate;
 	}
 
 }

tamguo-oms/src/main/java/com/tamguo/modules/sys/model/condition/SysCompanyCondition.java

@@ -0,0 +1,28 @@
+package com.tamguo.modules.sys.model.condition;
+
+public class SysCompanyCondition {
+
+	private String parentCode;
+	private String companyName;
+	private String fullName;
+	
+	public String getCompanyName() {
+		return companyName;
+	}
+	public void setCompanyName(String companyName) {
+		this.companyName = companyName;
+	}
+	public String getFullName() {
+		return fullName;
+	}
+	public void setFullName(String fullName) {
+		this.fullName = fullName;
+	}
+	public String getParentCode() {
+		return parentCode;
+	}
+	public void setParentCode(String parentCode) {
+		this.parentCode = parentCode;
+	}
+	
+}

tamguo-oms/src/main/java/com/tamguo/modules/sys/service/ISysCompanyService.java

@@ -3,10 +3,14 @@ package com.tamguo.modules.sys.service;
 import java.util.List;
 
 import com.tamguo.modules.sys.model.SysCompanyEntity;
+import com.tamguo.modules.sys.model.condition.SysCompanyCondition;
 
 public interface ISysCompanyService {
 	
-	/** 公司属性结构*/
+	/** 公司树形结构*/
 	List<SysCompanyEntity> treeData();
 
+	/** 查询公司列表*/
+	List<SysCompanyEntity> listData(SysCompanyCondition condition);
+	
 }

tamguo-oms/src/main/java/com/tamguo/modules/sys/service/impl/SysCompanyServiceImpl.java

@@ -9,6 +9,7 @@ import com.baomidou.mybatisplus.mapper.Condition;
 import com.baomidou.mybatisplus.service.impl.ServiceImpl;
 import com.tamguo.modules.sys.dao.SysCompanyMapper;
 import com.tamguo.modules.sys.model.SysCompanyEntity;
+import com.tamguo.modules.sys.model.condition.SysCompanyCondition;
 import com.tamguo.modules.sys.service.ISysCompanyService;
 
 @Service
@@ -25,4 +26,9 @@ public class SysCompanyServiceImpl extends ServiceImpl<SysCompanyMapper, SysComp
 		return companyList;
 	}
 
+	@Override
+	public List<SysCompanyEntity> listData(SysCompanyCondition condition) {
+		return sysCompanyMapper.listData(condition);
+	}
+	
 }

tamguo-oms/src/main/java/com/tamguo/modules/sys/service/impl/SysMenuServiceImpl.java

@@ -68,7 +68,7 @@ public class SysMenuServiceImpl extends ServiceImpl<SysMenuMapper, SysMenuEntity
 			List<SysMenuEntity> childMenus = new ArrayList<>();
 			for(int k=0 ; k<menus.size() ; k++) {
 				SysMenuEntity cMenu = menus.get(k);
-				if(cMenu.getParentId().toString().equals(pMenu.getUid())) {
+				if(cMenu.getParentId().toString().equals(pMenu.getId())) {
 					childMenus.add(cMenu);
 				}
 			}

tamguo-oms/src/main/java/com/tamguo/modules/sys/utils/ShiroUtils.java

@@ -20,8 +20,8 @@ public class ShiroUtils {
 		return (SysUserEntity)SecurityUtils.getSubject().getPrincipal();
 	}
 
-	public static String getUid() {
+	public static String getId() {
-		return getUser().getUid();
+		return getUser().getId();
 	}
 	
 	public static void setSessionAttribute(Object key, Object value) {

tamguo-oms/src/main/java/com/tamguo/modules/sys/web/CompanyController.java

@@ -9,6 +9,7 @@ import org.springframework.web.bind.annotation.ResponseBody;
 import org.springframework.web.servlet.ModelAndView;
 
 import com.tamguo.modules.sys.model.SysCompanyEntity;
+import com.tamguo.modules.sys.model.condition.SysCompanyCondition;
 import com.tamguo.modules.sys.service.ISysCompanyService;
 
 @Controller
@@ -25,6 +26,12 @@ public class CompanyController {
 		return COMPANY_INDEX_PAGE;
 	}
 	
+	@RequestMapping(path="listData")
+	@ResponseBody
+	public List<SysCompanyEntity> listData(SysCompanyCondition condition) {
+		return iSysCompanyService.listData(condition);
+	}
+
 	@RequestMapping(path="treeData")
 	@ResponseBody
 	public List<SysCompanyEntity> treeData() {

tamguo-oms/src/main/resources/mappers/SysCompanyMapper.xml

@@ -2,4 +2,34 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.tamguo.modules.sys.dao.SysCompanyMapper">
 	
+	<select id="listData" resultType="SysCompanyEntity">
+		SELECT
+			c.id,
+			c.parent_id,
+			c.is_leaf,
+			c.tree_level,
+			c.name,
+			c.full_name,
+			c.type,
+			c.duty_man,
+			c.tel,
+			c.address,
+			c.zip_code,
+			c.email,
+			c.remarks,
+			c.update_date
+		FROM
+			sys_company c		
+		<where>
+			1 = 1
+			<choose>
+		        <when test="parentCode != null and parentCode != ''">
+		          	and c.parent_id = #{parentCode}
+		        </when>
+		        <otherwise>
+		            and c.tree_level = 0
+		        </otherwise>
+		    </choose>
+		</where>
+	</select>
 </mapper>

tamguo-oms/src/main/resources/mappers/SysMenuMapper.xml

@@ -3,7 +3,7 @@
 <mapper namespace="com.tamguo.modules.sys.dao.SysMenuMapper">
 
   <resultMap id="BaseResultMap" type="com.tamguo.modules.sys.model.SysMenuEntity" >
-    <id column="uid" property="uid" jdbcType="VARCHAR" />
+    <id column="id" property="id" jdbcType="VARCHAR" />
     <result column="parent_id" property="parentId" jdbcType="BIGINT" />
     <result column="name" property="name" jdbcType="VARCHAR" />
     <result column="url" property="url" jdbcType="VARCHAR" />
@@ -14,7 +14,7 @@
   </resultMap>
   
   <sql id="Base_Column_List" >
-    uid, parent_id, name, url, type, perms ,  order_num
+    id, parent_id, name, url, type, perms ,  order_num
   </sql>
 
 

tamguo-oms/src/main/resources/mappers/SysRoleMapper.xml

@@ -4,7 +4,7 @@
 
 	<select id="selectPageByName" resultType="SysRoleEntity">
 		SELECT
-			r.uid , r.name , r.perms
+			r.id , r.name , r.perms
 		FROM
 			sys_role r
 		<where>

tamguo-oms/src/main/resources/mappers/SysUserMapper.xml

@@ -4,7 +4,7 @@
 	
 	<select id="queryByUserName" resultType="SysUserEntity">
 		SELECT
-			u.uid,
+			u.id,
 			u.user_name,
 			u.role_ids,
 			u.password,
@@ -20,7 +20,7 @@
   	
   	<select id="listData" resultType="SysUserEntity">
   		SELECT
-			u.uid,
+			u.id,
 			u.user_name,
 			u.name,
 			u.role_ids,
@@ -35,7 +35,7 @@
 			u.create_date
 		FROM
 			sys_user u
-		LEFT JOIN sys_company c ON u.company_id = c.uid
+		LEFT JOIN sys_company c ON u.company_id = c.id
 		<where>
 			1 = 1
 			<if test="userName != null and userName != ''">

tamguo-oms/src/main/resources/templates/modules/sys/company/index.html

@@ -36,7 +36,7 @@ content="width=device-width, initial-scale=1, user-scalable=1" name="viewport"/>
 			</div>
 		</div>
 		<div class="box-body">
-<form id="searchForm" action="/js/a/sys/office/listData" method="post" class="form-inline hide" data-page-no="" data-page-size="" data-order-by="">
+<form id="searchForm" th:action="${setting.domain + 'sys/company/listData'}" method="post" class="form-inline hide" data-page-no="" data-page-size="" data-order-by="">
 				<div class="form-group">
 					<label class="control-label">机构代码：</label>
 					<div class="control-inline">
@@ -97,19 +97,15 @@ content="width=device-width, initial-scale=1, user-scalable=1" name="viewport"/>
 $('#dataGrid').dataGrid({
 	searchForm: $("#searchForm"),
 	columnModel: [
-		{header:'机构名称', name:'officeName', index:'a.office_name', width:250, align:"left", frozen:true, formatter: function(val, obj, row, act){
+		{header:'机构名称', name:'name', index:'a.office_name', width:250, align:"left", frozen:true, formatter: function(val, obj, row, act){
-			return '( '+row.viewCode+' ) '+'<a href="/js/a/sys/office/form?officeCode='+row.officeCode+'" class="btnList" data-title="编辑机构">'+(val||row.id)+'</a>';
+			return '( '+row.id+' ) '+'<a href="/js/a/sys/office/form?officeCode='+row.id+'" class="btnList" data-title="编辑机构">'+(val||row.id)+'</a>';
 		}},
 		{header:'机构全称', name:'fullName', index:'a.full_name', width:200, align:"left"},
-		{header:'排序号', name:'treeSort', index:'a.tree_sort', width:80, align:"center"},
+		{header:'机构类型', name:'type', index:'a.office_type', width:100, align:"center", formatter: function(val, obj, row, act){
-		{header:'机构类型', name:'officeType', index:'a.office_type', width:100, align:"center", formatter: function(val, obj, row, act){
+			return "股份公司";
-			return js.getDictLabel([{"id":"1019065443704786944","status":"0","createBy":"system","createDate":"2018-07-17 11:45","updateDate":"2018-07-17 11:45","updateBy":"system","treeLevel":0,"parentCodes":"0,","treeSort":30,"treeSorts":"0000000030,","treeNames":"省级公司","treeLeaf":"1","isSys":"1","cssClass":"","dictCode":"1019065443704786944","dictLabelOrig":"省级公司","dictType":"sys_office_type","cssStyle":"","description":"","dictValue":"1","dictLabel":"省级公司","parentCode":"0","isRoot":true,"isTreeLeaf":true},{"id":"1019065443864170496","status":"0","createBy":"system","createDate":"2018-07-17 11:45","updateDate":"2018-07-17 11:45","updateBy":"system","treeLevel":0,"parentCodes":"0,","treeSort":40,"treeSorts":"0000000040,","treeNames":"市级公司","treeLeaf":"1","isSys":"1","cssClass":"","dictCode":"1019065443864170496","dictLabelOrig":"市级公司","dictType":"sys_office_type","cssStyle":"","description":"","dictValue":"2","dictLabel":"市级公司","parentCode":"0","isRoot":true,"isTreeLeaf":true},{"id":"1019065444036136960","status":"0","createBy":"system","createDate":"2018-07-17 11:45","updateDate":"2018-07-17 11:45","updateBy":"system","treeLevel":0,"parentCodes":"0,","treeSort":50,"treeSorts":"0000000050,","treeNames":"部门","treeLeaf":"1","isSys":"1","cssClass":"","dictCode":"1019065444036136960","dictLabelOrig":"部门","dictType":"sys_office_type","cssStyle":"","description":"","dictValue":"3","dictLabel":"部门","parentCode":"0","isRoot":true,"isTreeLeaf":true}], val, '未知', true);
 		}},
 		{header:'更新时间', name:'updateDate', index:'a.update_date', width:150, align:"center"},
 		{header:'备注信息', name:'remarks', index:'a.remarks', width:200, align:"left"},
-		{header:'状态', name:'status', index:'a.status', width:80, align:"center", formatter: function(val, obj, row, act){
-			return js.getDictLabel([{"id":"1019065439174938624","status":"0","createBy":"system","createDate":"2018-07-17 11:45","updateDate":"2018-07-17 11:45","updateBy":"system","treeLevel":0,"parentCodes":"0,","treeSort":20,"treeSorts":"0000000020,","treeNames":"正常","treeLeaf":"1","isSys":"1","cssClass":"","dictCode":"1019065439174938624","dictLabelOrig":"正常","dictType":"sys_status","cssStyle":"","description":"","dictValue":"0","dictLabel":"正常","parentCode":"0","isRoot":true,"isTreeLeaf":true},{"id":"1019065439330127872","status":"0","createBy":"system","createDate":"2018-07-17 11:45","updateDate":"2018-07-17 11:45","updateBy":"system","treeLevel":0,"parentCodes":"0,","treeSort":30,"treeSorts":"0000000030,","treeNames":"删除","treeLeaf":"1","isSys":"1","cssClass":"","dictCode":"1019065439330127872","dictLabelOrig":"删除","dictType":"sys_status","cssStyle":"color:#f00;","description":"","dictValue":"1","dictLabel":"删除","parentCode":"0","isRoot":true,"isTreeLeaf":true},{"id":"1019065439481122816","status":"0","createBy":"system","createDate":"2018-07-17 11:45","updateDate":"2018-07-17 11:45","updateBy":"system","treeLevel":0,"parentCodes":"0,","treeSort":40,"treeSorts":"0000000040,","treeNames":"停用","treeLeaf":"1","isSys":"1","cssClass":"","dictCode":"1019065439481122816","dictLabelOrig":"停用","dictType":"sys_status","cssStyle":"color:#f00;","description":"","dictValue":"2","dictLabel":"停用","parentCode":"0","isRoot":true,"isTreeLeaf":true},{"id":"1019065439699226624","status":"0","createBy":"system","createDate":"2018-07-17 11:45","updateDate":"2018-07-17 11:45","updateBy":"system","treeLevel":0,"parentCodes":"0,","treeSort":50,"treeSorts":"0000000050,","treeNames":"冻结","treeLeaf":"1","isSys":"1","cssClass":"","dictCode":"1019065439699226624","dictLabelOrig":"冻结","dictType":"sys_status","cssStyle":"color:#fa0;","description":"","dictValue":"3","dictLabel":"冻结","parentCode":"0","isRoot":true,"isTreeLeaf":true},{"id":"1019065439875387392","status":"0","createBy":"system","createDate":"2018-07-17 11:45","updateDate":"2018-07-17 11:45","updateBy":"system","treeLevel":0,"parentCodes":"0,","treeSort":60,"treeSorts":"0000000060,","treeNames":"待审","treeLeaf":"1","isSys":"1","cssClass":"","dictCode":"1019065439875387392","dictLabelOrig":"待审","dictType":"sys_status","cssStyle":"","description":"","dictValue":"4","dictLabel":"待审","parentCode":"0","isRoot":true,"isTreeLeaf":true},{"id":"1019065440022188032","status":"0","createBy":"system","createDate":"2018-07-17 11:45","updateDate":"2018-07-17 11:45","updateBy":"system","treeLevel":0,"parentCodes":"0,","treeSort":70,"treeSorts":"0000000070,","treeNames":"驳回","treeLeaf":"1","isSys":"1","cssClass":"","dictCode":"1019065440022188032","dictLabelOrig":"驳回","dictType":"sys_status","cssStyle":"","description":"","dictValue":"5","dictLabel":"驳回","parentCode":"0","isRoot":true,"isTreeLeaf":true},{"id":"1019065440210931712","status":"0","createBy":"system","createDate":"2018-07-17 11:45","updateDate":"2018-07-17 11:45","updateBy":"system","treeLevel":0,"parentCodes":"0,","treeSort":80,"treeSorts":"0000000080,","treeNames":"草稿","treeLeaf":"1","isSys":"1","cssClass":"","dictCode":"1019065440210931712","dictLabelOrig":"草稿","dictType":"sys_status","cssStyle":"color:#aaa;","description":"","dictValue":"9","dictLabel":"草稿","parentCode":"0","isRoot":true,"isTreeLeaf":true}], val, '未知', true);
-		}},
 		{header:'操作', name:'actions', width:150, sortable:false, title:false, formatter: function(val, obj, row, act){
 			var actions = [];
 				actions.push('<a href="/js/a/sys/office/form?officeCode='+row.officeCode+'" class="btnList" title="编辑机构"><i class="fa fa-pencil"></i></a>&nbsp;');