温红权 9 лет назад
Родитель
Сommit
2dab7014ad

+ 2 - 0
VisualInspection_server/src/main/java/com/xintong/visualinspection/bean/Organ.java

@@ -24,5 +24,7 @@ public class Organ {
     private String isshow;
     //单位类型 10 公司 20 养护 30 交警 40 路政 50 外协
     private String deptype;
+    //0 正常 -1删除
+    private Integer status;
 
 }

+ 14 - 15
VisualInspection_server/src/main/java/com/xintong/visualinspection/bean/Permission.java

@@ -3,23 +3,22 @@ package com.xintong.visualinspection.bean;
 import lombok.Data;
 
 /**
- * 文件名:Permission
- * 版本信息:日期:2017/3/31 Copyright 江苏省交通规划设计院 Corporation 2017 版权所有.
+ * 文件名:Permission 版本信息:日期:2017/3/31 Copyright 江苏省交通规划设计院 Corporation 2017 版权所有.
  */
 @Data
 public class Permission {
-    private int id;
-    //权限名称
-    private String name;
+	private int id;
+	// 权限名称
+	private String name;
+	// 权限描述
+	private String descritpion;
+	// 父节点id
+	private int pid;
+	// 资源id
+	private int resourceid;
+	// 类型 1-菜单
+	private int type;
+	// 0 正常 -1 删除
+	private int status;
 
-    //权限描述
-    private String descritpion;
-
-    //授权链接
-    private String url;
-
-    //父节点id
-    private int pid;
-
-    private String method;
 }

+ 7 - 2
VisualInspection_server/src/main/java/com/xintong/visualinspection/dao/master/PermissionDao.java

@@ -1,9 +1,10 @@
 package com.xintong.visualinspection.dao.master;
 
-import com.xintong.visualinspection.bean.Permission;
+import java.util.List;
+
 import org.apache.ibatis.annotations.Mapper;
 
-import java.util.List;
+import com.xintong.visualinspection.bean.Permission;
 
 /**
  * 文件名:PermissionDao
@@ -12,5 +13,9 @@ import java.util.List;
 @Mapper
 public interface PermissionDao {
     public List<Permission> findAll();
+    public List<Permission> getPermission(Permission permission);
+    public void insert(Permission permission);
+    public void update(Permission permission);
+    public void delete(Integer id);
     public List<Permission> findByAdminUserId(int userId);
 }

+ 58 - 1
VisualInspection_server/src/main/java/com/xintong/visualinspection/mapper/master/PermissionDaoMapper.xml

@@ -1,10 +1,67 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.xintong.visualinspection.dao.master.PermissionDao">
-    <select id="findAll"  resultType="com.xintong.visualinspection.bean.Permission">
+
+  <resultMap id="BaseResultMap" type="com.xintong.visualinspection.bean.Permission" >
+        <id column="id" property="id" jdbcType="INTEGER" />
+        <result column="name" property="name" jdbcType="VARCHAR" />
+        <result column="descritpion" property="descritpion" jdbcType="VARCHAR" />
+        <result column="pid" property="pid" jdbcType="INTEGER" />
+        <result column="type" property="type" jdbcType="INTEGER" />     
+        <result column="resourceid" property="resourceid" jdbcType="INTEGER" />  
+        <result column="status" property="status" jdbcType="INTEGER" />        
+    </resultMap>
+
+
+    <select id="findAll"  resultMap="BaseResultMap">
 
         SELECT * from sys_permission ;
     </select>
+    
+    
+     <select id="getPermission" parameterType="com.xintong.visualinspection.dao.master.PermissionDao" resultMap="BaseResultMap">
+        SELECT 
+        id,name,descritpion,pid,type,resourceid,status 
+         FROM sys_permission
+         where 1=1
+         <if test="id != null and id != 0">and id = #{id}</if>
+         <if test="name != null">and name = #{name}</if>
+         <if test="descritpion != null">and descritpion = #{descritpion}</if>
+         <if test="pid != null and pid != 0">and pid = #{pid}</if>
+         <if test="type != null and type != 0">and type = #{type}</if>
+         <if test="resourceid != null and resourceid != 0">and resourceid = #{resourceid}</if>
+         <if test="status != null">and status = #{status}</if>
+    </select>
+    
+     <insert id="insert" parameterType="com.xintong.visualinspection.dao.master.PermissionDao" >
+        INSERT INTO
+        sys_permission
+        (name,descritpion,pid,type,resourceid,status)
+        VALUES
+        (#{name},#{descritpion},#{pid},#{type},#{resourceid},#{status})
+    </insert>
+    
+    
+     <update id="update" parameterType="com.xintong.visualinspection.dao.master.PermissionDao" >
+        UPDATE
+        sys_permission
+        SET
+         id = #{id}
+         <if test="name != null">and name = #{name}</if>
+         <if test="descritpion != null">and descritpion = #{descritpion}</if>
+         <if test="pid != null and pid != 0">and pid = #{pid}</if>
+         <if test="type != null and type != 0">and type = #{type}</if>
+         <if test="resourceid != null and resourceid != 0">and resourceid = #{resourceid}</if>
+        WHERE
+        id = #{id}
+    </update>
+    
+     <delete id="delete" parameterType="java.lang.Integer" >
+        update sys_permission
+         set status=-1
+        WHERE
+        id =#{id}
+    </delete>
 
     <select id="findByAdminUserId" parameterType="int" resultType="com.xintong.visualinspection.bean.Permission">
         select p.*