fangcheng / regional-platform

Download as
Browse Code »

Commit 318eeb033aa500867ae1eb4296d6a9800ad9969f

Authored by jiangjiazhi
2 parents 8c35195ce0 ddb5b30680
Exists in master and in 1 other branch nobuildprocess

Merge remote-tracking branch 'origin/master'

Showing 20 changed files

platform-biz-service/src/main/java/com/lyms/platform/permission/dao/master/Permissions2Mapper.java View file @ 318eeb0
  1 +package com.lyms.platform.permission.dao.master;
  2 +
  3 +import com.lyms.platform.permission.model.Permissions2;
  4 +import com.lyms.platform.permission.model.Permissions2Query;
  5 +
  6 +import java.util.List;
  7 +
  8 +public interface Permissions2Mapper {
  9 + public void addPermissions2(Permissions2 obj);
  10 +
  11 + public void updatePermissions2(Permissions2 obj);
  12 +
  13 + public void deletePermissions2(Integer id);
  14 +
  15 + public Permissions2 getPermissions2(Integer id);
  16 +
  17 + public int queryPermissions2Count(Permissions2Query query);
  18 +
  19 + public List<Permissions2> queryPermissions2(Permissions2Query query);
  20 + List<Permissions2> queryPermissionByRoleIds(List<Integer> statusList);
  21 +
  22 + List<Permissions2> queryPermissionByRoleIds1(Integer roleIds);
  23 +
  24 +}
platform-biz-service/src/main/java/com/lyms/platform/permission/dao/slave/Permissions2Mapper.java View file @ 318eeb0
  1 +package com.lyms.platform.permission.dao.slave;
  2 +
  3 +import com.lyms.platform.permission.model.Permissions2;
  4 +import com.lyms.platform.permission.model.Permissions2Query;
  5 +
  6 +import java.util.List;
  7 +
  8 +public interface Permissions2Mapper {
  9 + public void addPermissions2(Permissions2 obj);
  10 +
  11 + public void updatePermissions2(Permissions2 obj);
  12 +
  13 + public void deletePermissions2(Integer id);
  14 +
  15 + public Permissions2 getPermissions2(Integer id);
  16 +
  17 + public int queryPermissions2Count(Permissions2Query query);
  18 +
  19 + public List<Permissions2> queryPermissions2(Permissions2Query query);
  20 + List<Permissions2> queryPermissionByRoleIds(List<Integer> statusList);
  21 +
  22 + List<Permissions2> queryPermissionByRoleIds1(Integer roleIds);
  23 +}
platform-biz-service/src/main/java/com/lyms/platform/permission/model/Permissions2.java View file @ 318eeb0
  1 +package com.lyms.platform.permission.model;
  2 +
  3 +import java.sql.Timestamp;
  4 +import java.util.Date;
  5 +
  6 +public class Permissions2 {
  7 + private Integer id;
  8 + private String name;
  9 + private String uri;
  10 + private String type;
  11 + private String puri;
  12 + private String icon;
  13 + private Integer yn;
  14 + private Timestamp createDate;
  15 + private String createUser;
  16 + private Integer enable;
  17 +
  18 + public Integer getId() {
  19 + return id;
  20 + }
  21 +
  22 +
  23 + public void setId(Integer id) {
  24 + this.id = id;
  25 +
  26 + }
  27 +
  28 + public String getName() {
  29 + return name;
  30 + }
  31 +
  32 +
  33 + public void setName(String name) {
  34 + this.name = name;
  35 +
  36 + }
  37 +
  38 + public String getUri() {
  39 + return uri;
  40 + }
  41 +
  42 +
  43 + public void setUri(String uri) {
  44 + this.uri = uri;
  45 +
  46 + }
  47 +
  48 + public String getType() {
  49 + return type;
  50 + }
  51 +
  52 +
  53 + public void setType(String type) {
  54 + this.type = type;
  55 +
  56 + }
  57 +
  58 + public String getPuri() {
  59 + return puri;
  60 + }
  61 +
  62 +
  63 + public void setPuri(String puri) {
  64 + this.puri = puri;
  65 +
  66 + }
  67 +
  68 + public String getIcon() {
  69 + return icon;
  70 + }
  71 +
  72 +
  73 + public void setIcon(String icon) {
  74 + this.icon = icon;
  75 +
  76 + }
  77 +
  78 + public Integer getYn() {
  79 + return yn;
  80 + }
  81 +
  82 +
  83 + public void setYn(Integer yn) {
  84 + this.yn = yn;
  85 +
  86 + }
  87 +
  88 + public Timestamp getCreateDate() {
  89 + return createDate;
  90 + }
  91 +
  92 + public void setCreateDate(Timestamp createDate) {
  93 + this.createDate = createDate;
  94 + }
  95 +
  96 + public String getCreateUser() {
  97 + return createUser;
  98 + }
  99 +
  100 +
  101 + public void setCreateUser(String createUser) {
  102 + this.createUser = createUser;
  103 +
  104 + }
  105 +
  106 + public Integer getEnable() {
  107 + return enable;
  108 + }
  109 +
  110 +
  111 + public void setEnable(Integer enable) {
  112 + this.enable = enable;
  113 +
  114 + }
  115 +}
platform-biz-service/src/main/java/com/lyms/platform/permission/model/Permissions2Query.java View file @ 318eeb0
  1 +package com.lyms.platform.permission.model;
  2 +
  3 +
  4 +import com.lyms.platform.common.dao.BaseQuery;
  5 +
  6 +import java.sql.Timestamp;
  7 +import java.util.Date;
  8 +
  9 +
  10 +public class Permissions2Query extends BaseQuery {
  11 + private Integer id;
  12 + private String name;
  13 + private String uri;
  14 + private String type;
  15 + private String puri;
  16 + private String icon;
  17 + private Integer yn;
  18 + private Timestamp createDate;
  19 + private String createUser;
  20 + private Integer enable;
  21 +
  22 + public Integer getId() {
  23 + return id;
  24 + }
  25 +
  26 +
  27 + public void setId(Integer id) {
  28 + this.id = id;
  29 +
  30 + }
  31 +
  32 + public String getName() {
  33 + return name;
  34 + }
  35 +
  36 +
  37 + public void setName(String name) {
  38 + this.name = name;
  39 +
  40 + }
  41 +
  42 + public String getUri() {
  43 + return uri;
  44 + }
  45 +
  46 +
  47 + public void setUri(String uri) {
  48 + this.uri = uri;
  49 +
  50 + }
  51 +
  52 + public String getType() {
  53 + return type;
  54 + }
  55 +
  56 +
  57 + public void setType(String type) {
  58 + this.type = type;
  59 +
  60 + }
  61 +
  62 + public String getPuri() {
  63 + return puri;
  64 + }
  65 +
  66 +
  67 + public void setPuri(String puri) {
  68 + this.puri = puri;
  69 +
  70 + }
  71 +
  72 + public String getIcon() {
  73 + return icon;
  74 + }
  75 +
  76 +
  77 + public void setIcon(String icon) {
  78 + this.icon = icon;
  79 +
  80 + }
  81 +
  82 + public Integer getYn() {
  83 + return yn;
  84 + }
  85 +
  86 +
  87 + public void setYn(Integer yn) {
  88 + this.yn = yn;
  89 +
  90 + }
  91 +
  92 + public Timestamp getCreateDate() {
  93 + return createDate;
  94 + }
  95 +
  96 + public void setCreateDate(Timestamp createDate) {
  97 + this.createDate = createDate;
  98 + }
  99 +
  100 + public String getCreateUser() {
  101 + return createUser;
  102 + }
  103 +
  104 +
  105 + public void setCreateUser(String createUser) {
  106 + this.createUser = createUser;
  107 +
  108 + }
  109 +
  110 + public Integer getEnable() {
  111 + return enable;
  112 + }
  113 +
  114 +
  115 + public void setEnable(Integer enable) {
  116 + this.enable = enable;
  117 +
  118 + }
  119 +}
platform-biz-service/src/main/java/com/lyms/platform/permission/model/Roles.java View file @ 318eeb0
... ... @@ -36,13 +36,13 @@
36 36 this.orgId = orgId;
37 37 }
38 38  
39   - private List<Permissions> permissions;
  39 + private List<Permissions2> permissions;
40 40  
41   - public List<Permissions> getPermissions() {
  41 + public List<Permissions2> getPermissions() {
42 42 return permissions;
43 43 }
44 44  
45   - public void setPermissions(List<Permissions> permissions) {
  45 + public void setPermissions(List<Permissions2> permissions) {
46 46 this.permissions = permissions;
47 47 }
48 48  
platform-biz-service/src/main/java/com/lyms/platform/permission/service/Permissions2Service.java View file @ 318eeb0
  1 +package com.lyms.platform.permission.service;
  2 +
  3 +import com.lyms.platform.permission.model.Permissions;
  4 +import com.lyms.platform.permission.model.Permissions2;
  5 +import com.lyms.platform.permission.model.Permissions2Query;
  6 +
  7 +import java.util.List;
  8 +
  9 +public interface Permissions2Service {
  10 + public void addPermissions2(Permissions2 obj);
  11 +
  12 + public void updatePermissions2(Permissions2 obj);
  13 +
  14 + public void deletePermissions2(Integer id);
  15 +
  16 + public Permissions2 getPermissions2(Integer id);
  17 +
  18 + public int queryPermissions2Count(Permissions2Query query);
  19 +
  20 + public List<Permissions2> queryPermissions2(Permissions2Query query);
  21 + List<Permissions2> queryPermissionByRoleIds(List<Integer> roleIds);
  22 + List<Permissions2> queryPermissionByRoleIds1(Integer roleIds);
  23 +
  24 +}
platform-biz-service/src/main/java/com/lyms/platform/permission/service/impl/Permissions2ServiceImpl.java View file @ 318eeb0
  1 +package com.lyms.platform.permission.service.impl;
  2 +
  3 +import com.lyms.platform.permission.dao.master.Permissions2Mapper;
  4 +import com.lyms.platform.permission.model.Permissions2;
  5 +import com.lyms.platform.permission.model.Permissions2Query;
  6 +import com.lyms.platform.permission.service.Permissions2Service;
  7 +import org.apache.commons.collections.CollectionUtils;
  8 +import org.springframework.beans.factory.annotation.Autowired;
  9 +import org.springframework.stereotype.Service;
  10 +
  11 +import java.util.Collections;
  12 +import java.util.Date;
  13 +import java.util.List;
  14 +
  15 +@Service
  16 +public class Permissions2ServiceImpl implements Permissions2Service {
  17 +
  18 + @Autowired
  19 + private Permissions2Mapper permissions2Mapper;
  20 +
  21 + @Override
  22 + public void addPermissions2(Permissions2 obj) {
  23 + permissions2Mapper.addPermissions2(obj);
  24 + }
  25 +
  26 + @Override
  27 + public void updatePermissions2(Permissions2 obj) {
  28 + permissions2Mapper.updatePermissions2(obj);
  29 + }
  30 +
  31 + @Override
  32 + public void deletePermissions2(Integer id) {
  33 + permissions2Mapper.deletePermissions2(id);
  34 + }
  35 +
  36 + @Override
  37 + public Permissions2 getPermissions2(Integer id) {
  38 + return permissions2Mapper.getPermissions2(id);
  39 + }
  40 +
  41 + @Override
  42 + public int queryPermissions2Count(Permissions2Query query) {
  43 + return permissions2Mapper.queryPermissions2Count(query);
  44 + }
  45 +
  46 + @Override
  47 + public List<Permissions2> queryPermissions2(Permissions2Query query) {
  48 + if (query.getNeed() != null) {
  49 + query.mysqlBuild(permissions2Mapper.queryPermissions2Count(query));
  50 + }
  51 + return permissions2Mapper.queryPermissions2(query);
  52 + }
  53 +
  54 + public List<Permissions2> queryPermissionByRoleIds(List<Integer> roleIds) {
  55 + if (CollectionUtils.isEmpty(roleIds)) {
  56 + return Collections.emptyList();
  57 + }
  58 + return permissions2Mapper.queryPermissionByRoleIds(roleIds);
  59 + }
  60 +
  61 + public List<Permissions2> queryPermissionByRoleIds1(Integer roleIds) {
  62 + return permissions2Mapper.queryPermissionByRoleIds1(roleIds);
  63 + }
  64 +
  65 +}
platform-biz-service/src/main/resources/mainOrm/master/Permissions2.xml View file @ 318eeb0
  1 +<?xml version="1.0" encoding="UTF-8" ?>
  2 +<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
  3 +<mapper namespace="com.lyms.platform.permission.dao.master.Permissions2Mapper">
  4 +
  5 + <resultMap id="Permissions2ResultMap" type="com.lyms.platform.permission.model.Permissions2">
  6 + <id column="id" property="id" jdbcType="INTEGER" />
  7 + <result column="name" property="name" jdbcType="VARCHAR" />
  8 + <result column="uri" property="uri" jdbcType="VARCHAR" />
  9 + <result column="type" property="type" jdbcType="VARCHAR" />
  10 + <result column="puri" property="puri" jdbcType="VARCHAR" />
  11 + <result column="icon" property="icon" jdbcType="VARCHAR" />
  12 + <result column="yn" property="yn" jdbcType="INTEGER" />
  13 + <result column="create_date" property="createDate" jdbcType="TIMESTAMP" javaType="java.sql.Timestamp"/>
  14 + <result column="create_user" property="createUser" jdbcType="VARCHAR" />
  15 + <result column="enable" property="enable" jdbcType="INTEGER" />
  16 + </resultMap>
  17 +
  18 +
  19 +
  20 + <insert id="addPermissions2" parameterType="com.lyms.platform.permission.model.Permissions2">
  21 +insert into permissions2 (name,uri,type,puri,icon,yn,create_date,create_user,enable) values (#{name},#{uri},#{type},#{puri},#{icon},#{yn},#{createDate},#{createUser},#{enable})
  22 +</insert>
  23 +
  24 +
  25 +
  26 + <update id="updatePermissions2" parameterType="com.lyms.platform.permission.model.Permissions2">
  27 + update permissions2 <set><if test="name != null and name != ''">
  28 + name = #{name,jdbcType=VARCHAR},
  29 + </if>
  30 + <if test="uri != null and uri != ''">
  31 + uri = #{uri,jdbcType=VARCHAR},
  32 + </if>
  33 + <if test="type != null and type != ''">
  34 + type = #{type,jdbcType=VARCHAR},
  35 + </if>
  36 + <if test="puri != null and puri != ''">
  37 + puri = #{puri,jdbcType=VARCHAR},
  38 + </if>
  39 + <if test="icon != null and icon != ''">
  40 + icon = #{icon,jdbcType=VARCHAR},
  41 + </if>
  42 + <if test="yn != null and yn >= 0">
  43 + yn = #{yn,jdbcType=INTEGER},
  44 + </if>
  45 + <if test="createDate != null ">
  46 + create_date = #{createDate,jdbcType=TIMESTAMP}
  47 + </if>
  48 + <if test="createUser != null and createUser != ''">
  49 + create_user = #{createUser,jdbcType=VARCHAR},
  50 + </if>
  51 + <if test="enable != null and enable >= 0">
  52 + enable = #{enable,jdbcType=INTEGER},
  53 + </if>
  54 + </set>
  55 + where id = #{id,jdbcType=INTEGER}
  56 + </update>
  57 +
  58 +
  59 + <delete id="deletePermissions2" parameterType="java.lang.Integer">
  60 + delete from permissions2 where id = #{id,jdbcType=INTEGER}
  61 + </delete>
  62 +
  63 +
  64 +
  65 + <select id="getPermissions2" resultMap="Permissions2ResultMap" parameterType="java.lang.Integer">
  66 + select id,name,uri,type,puri,icon,yn,create_date,create_user,enable
  67 + from permissions2 where id = #{id,jdbcType=INTEGER}
  68 + </select>
  69 +
  70 +
  71 + <sql id="orderAndLimit">
  72 + <if test="sort != null and sort != '' ">
  73 + order by ${sort}
  74 + <if test="need != null">
  75 + limit #{offset, jdbcType=INTEGER} , #{limit, jdbcType=INTEGER}
  76 + </if>
  77 + </if>
  78 + </sql>
  79 +
  80 +
  81 +
  82 + <sql id="Permissions2Condition">
  83 + <where>
  84 + 1 = 1
  85 + <if test="id != null and id >= 0">
  86 + and id = #{id,jdbcType=INTEGER}
  87 + </if>
  88 + <if test="name != null and name != ''">
  89 + and name = #{name,jdbcType=VARCHAR}
  90 + </if>
  91 + <if test="uri != null and uri != ''">
  92 + and uri = #{uri,jdbcType=VARCHAR}
  93 + </if>
  94 + <if test="type != null and type != ''">
  95 + and type = #{type,jdbcType=VARCHAR}
  96 + </if>
  97 + <if test="puri != null and puri != ''">
  98 + and puri = #{puri,jdbcType=VARCHAR}
  99 + </if>
  100 + <if test="icon != null and icon != ''">
  101 + and icon = #{icon,jdbcType=VARCHAR}
  102 + </if>
  103 + <if test="yn != null and yn >= 0">
  104 + and yn = #{yn,jdbcType=INTEGER}
  105 + </if>
  106 + <if test="createDate != null">
  107 + and create_date = #{createDate,jdbcType=TIMESTAMP}
  108 + </if>
  109 + <if test="createUser != null and createUser != ''">
  110 + and create_user = #{createUser,jdbcType=VARCHAR}
  111 + </if>
  112 + <if test="enable != null and enable >= 0">
  113 + and enable = #{enable,jdbcType=INTEGER}
  114 + </if>
  115 + </where>
  116 + </sql>
  117 +
  118 +
  119 +
  120 + <select id="queryPermissions2" resultMap="Permissions2ResultMap" parameterType="com.lyms.platform.permission.model.Permissions2Query">
  121 + select id,name,uri,type,puri,icon,yn,create_date,create_user,enable
  122 + from permissions2
  123 + <include refid="Permissions2Condition" />
  124 + <include refid="orderAndLimit" />
  125 + </select>
  126 +
  127 +
  128 +
  129 + <select id="queryPermissions2Count" resultType="int" parameterType="com.lyms.platform.permission.model.Permissions2Query">
  130 + select count(1) from permissions2
  131 + <include refid="Permissions2Condition" />
  132 + </select>
  133 +
  134 +
  135 + <select id="queryPermissionByRoleIds" parameterType="java.util.List" resultMap="Permissions2ResultMap">
  136 + select b.* from role_permission_maps a, permissions2 b where a.yn=1 and b.yn=1 and a.role_id
  137 + in
  138 + <foreach collection="list" index="index" item="item" open="(" separator="," close=")">
  139 + #{item}
  140 + </foreach>
  141 + and a.permission_id=b.id
  142 + </select>
  143 +
  144 + <select id="queryPermissionByRoleIds1" parameterType="int" resultMap="Permissions2ResultMap">
  145 + select b.* from role_permission_maps a, permissions2 b where a.role_id=
  146 + #{weight,jdbcType=INTEGER}
  147 + and b.yn=1 and a.yn=1 and a.permission_id=b.id;
  148 + </select>
  149 +</mapper>
platform-biz-service/src/main/resources/mainOrm/slave/Permissions2.xml View file @ 318eeb0
  1 +<?xml version="1.0" encoding="UTF-8" ?>
  2 +<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
  3 +<mapper namespace="com.lyms.platform.permission.dao.Permissions2Mapper">
  4 +
  5 + <resultMap id="Permissions2ResultMap" type="com.lyms.platform.permission.model.Permissions2">
  6 + <id column="id" property="id" jdbcType="INTEGER" />
  7 + <result column="name" property="name" jdbcType="VARCHAR" />
  8 + <result column="uri" property="uri" jdbcType="VARCHAR" />
  9 + <result column="type" property="type" jdbcType="VARCHAR" />
  10 + <result column="puri" property="puri" jdbcType="VARCHAR" />
  11 + <result column="icon" property="icon" jdbcType="VARCHAR" />
  12 + <result column="yn" property="yn" jdbcType="INTEGER" />
  13 + <result column="create_date" property="createDate" jdbcType="TIMESTAMP" javaType="java.sql.Timestamp"/>
  14 + <result column="create_user" property="createUser" jdbcType="VARCHAR" />
  15 + <result column="enable" property="enable" jdbcType="INTEGER" />
  16 + </resultMap>
  17 +
  18 +
  19 +
  20 + <insert id="addPermissions2" parameterType="com.lyms.platform.permission.model.Permissions2">
  21 + insert into permissions2 (name,uri,type,puri,icon,yn,create_date,create_user,enable) values (#{name},#{uri},#{type},#{puri},#{icon},#{yn},#{createDate},#{createUser},#{enable})
  22 + </insert>
  23 +
  24 +
  25 +
  26 + <update id="updatePermissions2" parameterType="com.lyms.platform.permission.model.Permissions2">
  27 + update permissions2 <set><if test="name != null and name != ''">
  28 + name = #{name,jdbcType=VARCHAR},
  29 + </if>
  30 + <if test="uri != null and uri != ''">
  31 + uri = #{uri,jdbcType=VARCHAR},
  32 + </if>
  33 + <if test="type != null and type != ''">
  34 + type = #{type,jdbcType=VARCHAR},
  35 + </if>
  36 + <if test="puri != null and puri != ''">
  37 + puri = #{puri,jdbcType=VARCHAR},
  38 + </if>
  39 + <if test="icon != null and icon != ''">
  40 + icon = #{icon,jdbcType=VARCHAR},
  41 + </if>
  42 + <if test="yn != null and yn >= 0">
  43 + yn = #{yn,jdbcType=INTEGER},
  44 + </if>
  45 + <if test="createDate != null ">
  46 + create_date = #{createDate,jdbcType=TIMESTAMP}
  47 + </if>
  48 + <if test="createUser != null and createUser != ''">
  49 + create_user = #{createUser,jdbcType=VARCHAR},
  50 + </if>
  51 + <if test="enable != null and enable >= 0">
  52 + enable = #{enable,jdbcType=INTEGER},
  53 + </if>
  54 + </set>
  55 + where id = #{id,jdbcType=INTEGER}
  56 + </update>
  57 +
  58 +
  59 + <delete id="deletePermissions2" parameterType="java.lang.Integer">
  60 + delete from permissions2 where id = #{id,jdbcType=INTEGER}
  61 + </delete>
  62 +
  63 +
  64 +
  65 + <select id="getPermissions2" resultMap="Permissions2ResultMap" parameterType="java.lang.Integer">
  66 + select id,name,uri,type,puri,icon,yn,create_date,create_user,enable
  67 + from permissions2 where id = #{id,jdbcType=INTEGER}
  68 + </select>
  69 +
  70 +
  71 + <sql id="orderAndLimit">
  72 + <if test="sort != null and sort != '' ">
  73 + order by ${sort}
  74 + <if test="need != null">
  75 + limit #{offset, jdbcType=INTEGER} , #{limit, jdbcType=INTEGER}
  76 + </if>
  77 + </if>
  78 + </sql>
  79 +
  80 +
  81 +
  82 + <sql id="Permissions2Condition">
  83 + <where>
  84 + 1 = 1
  85 + <if test="id != null and id >= 0">
  86 + and id = #{id,jdbcType=INTEGER}
  87 + </if>
  88 + <if test="name != null and name != ''">
  89 + and name = #{name,jdbcType=VARCHAR}
  90 + </if>
  91 + <if test="uri != null and uri != ''">
  92 + and uri = #{uri,jdbcType=VARCHAR}
  93 + </if>
  94 + <if test="type != null and type != ''">
  95 + and type = #{type,jdbcType=VARCHAR}
  96 + </if>
  97 + <if test="puri != null and puri != ''">
  98 + and puri = #{puri,jdbcType=VARCHAR}
  99 + </if>
  100 + <if test="icon != null and icon != ''">
  101 + and icon = #{icon,jdbcType=VARCHAR}
  102 + </if>
  103 + <if test="yn != null and yn >= 0">
  104 + and yn = #{yn,jdbcType=INTEGER}
  105 + </if>
  106 + <if test="createDate != null">
  107 + and create_date = #{createDate,jdbcType=TIMESTAMP}
  108 + </if>
  109 + <if test="createUser != null and createUser != ''">
  110 + and create_user = #{createUser,jdbcType=VARCHAR}
  111 + </if>
  112 + <if test="enable != null and enable >= 0">
  113 + and enable = #{enable,jdbcType=INTEGER}
  114 + </if>
  115 + </where>
  116 + </sql>
  117 +
  118 +
  119 +
  120 + <select id="queryPermissions2" resultMap="Permissions2ResultMap" parameterType="com.lyms.platform.permission.model.Permissions2Query">
  121 + select id,name,uri,type,puri,icon,yn,create_date,create_user,enable
  122 + from permissions2
  123 + <include refid="Permissions2Condition" />
  124 + <include refid="orderAndLimit" />
  125 + </select>
  126 +
  127 +
  128 +
  129 + <select id="queryPermissions2Count" resultType="int" parameterType="com.lyms.platform.permission.model.Permissions2Query">
  130 + select count(1) from permissions2
  131 + <include refid="Permissions2Condition" />
  132 + </select>
  133 +
  134 +
  135 + <select id="queryPermissionByRoleIds" parameterType="java.util.List" resultMap="Permissions2ResultMap">
  136 + select b.* from role_permission_maps a, permissions2 b where a.yn=1 and b.yn=1 and a.role_id
  137 + in
  138 + <foreach collection="list" index="index" item="item" open="(" separator="," close=")">
  139 + #{item}
  140 + </foreach>
  141 + and a.permission_id=b.id ORDER BY b.weight
  142 + </select>
  143 +
  144 + <select id="queryPermissionByRoleIds1" parameterType="int" resultMap="Permissions2ResultMap">
  145 + select b.* from role_permission_maps a, permissions2 b where a.role_id=
  146 + #{weight,jdbcType=INTEGER}
  147 + and b.yn=1 and a.yn=1 and a.permission_id=b.id;
  148 + </select>
  149 +</mapper>
platform-common/src/main/java/com/lyms/platform/common/utils/DateUtil.java View file @ 318eeb0
... ... @@ -772,30 +772,33 @@
772 772 // System.out.println(s);
773 773 // Date s = addDay(parseYMD("2016-02-26"), 168);
774 774  
775   - int start = 38;
776   - int end = 38;
  775 +// int start = 38;
  776 +// int end = 38;
  777 +////
  778 +////
  779 +//// Date startDate = DateUtil.getNewDate(-end-1,"周",1+1);
  780 +//// Date endDate = DateUtil.getNewDate(-start,"周",0+1);
777 781 //
778 782 //
779   -// Date startDate = DateUtil.getNewDate(-end-1,"周",1+1);
780   -// Date endDate = DateUtil.getNewDate(-start,"周",0+1);
  783 +// Date startDate = DateUtil.getNewDate(-end-1,"周",2+1);
  784 +// Date endDate = DateUtil.getNewDate(-start,"周",2);
  785 +//
  786 +//
  787 +// String date = y_m_d_h_m_s.format(startDate.getTime());
  788 +//// Date startDate = DateUtil.getNewDate(-end-1,"月",1);
  789 +//// Date endDate = DateUtil.getNewDate(-start,"月",1);
  790 +//
  791 +// System.out.println(date + "===");
781 792  
782 793  
783   - Date startDate = DateUtil.getNewDate(-end-1,"周",2+1);
784   - Date endDate = DateUtil.getNewDate(-start,"周",2);
785   -
786   -
787   - String date = y_m_d_h_m_s.format(startDate.getTime());
788   -// Date startDate = DateUtil.getNewDate(-end-1,"月",1);
789   -// Date endDate = DateUtil.getNewDate(-start,"月",1);
790   -
791   - System.out.println(date + "===");
792   -
793   -
794 794 // Date startDate = getRangeDate(parseYMD("2016-09-07"),2,"周",-1);
795 795 // System.out.println(getyyyy_MM_dd(startDate));
796 796  
797 797 // int a = daysBetween(parseYMD("2013-09-13"),new Date())/7;
798 798 // System.out.println(a);
  799 +
  800 + Date dueDate = DateUtil.addDay(DateUtil.addMonth(parseYMD("2016-02-08"), 9), 7);
  801 + System.out.println(getyyyy_MM_dd(dueDate));
799 802 } catch (Exception e)
800 803 {
801 804  
platform-common/src/main/java/com/lyms/platform/common/utils/ExcelUtil.java View file @ 318eeb0
... ... @@ -23,15 +23,15 @@
23 23  
24 24 /**
25 25 * Excel 工具类
26   - *
  26 + *
27 27 * @author lqy
28 28 *
29 29 */
30 30 public class ExcelUtil
31 31 {
32   -
  32 +
33 33 static File from_file;
34   -
  34 +
35 35 static WritableWorkbook to_wwb; // 创建可写入workbook对象
36 36  
37 37 public static OutputStream toChanExcel(OutputStream out, List<Map<String, Object>> data, Map<String, String> columName)
... ... @@ -110,7 +110,7 @@
110 110 j++;
111 111 }
112 112 }
113   -
  113 +
114 114 wwb.write();
115 115 wwb.close();
116 116 }
117 117  
... ... @@ -192,8 +192,8 @@
192 192 }
193 193 return out;
194 194 }
195   -
196 195  
197   -
  196 +
  197 +
198 198 }
platform-common/src/main/java/com/lyms/platform/common/utils/HttpRequest.java View file @ 318eeb0
... ... @@ -68,6 +68,64 @@
68 68 }
69 69 return result;
70 70 }
  71 +
  72 +
  73 + /**
  74 + * 删除
  75 + * @param url
  76 + * @param param
  77 + * @param auth
  78 + * @return
  79 + */
  80 + public static String sendDelete(String url, String param,String auth) {
  81 + String result = "";
  82 + BufferedReader in = null;
  83 + try {
  84 + String urlNameString = url + "?" + param;
  85 + URL realUrl = new URL(urlNameString);
  86 + // 打开和URL之间的连接
  87 + HttpURLConnection connection = (HttpURLConnection)realUrl.openConnection();
  88 + // 设置通用的请求属性
  89 + connection.setRequestMethod("DELETE");
  90 +
  91 + connection.setRequestProperty("accept", "*/*");
  92 + connection.setRequestProperty("Method","DELETE");
  93 + connection.setRequestProperty("connection", "Keep-Alive");
  94 + connection.setRequestProperty("user-agent",
  95 + "Mozilla/4.0 (compatible; MSIE 6.0; Windows NT 5.1;SV1)");
  96 + connection.setRequestProperty("Authorization",auth);
  97 + // 建立实际的连接
  98 + connection.connect();
  99 + // 获取所有响应头字段
  100 + Map<String, List<String>> map = connection.getHeaderFields();
  101 + // 遍历所有的响应头字段
  102 + for (String key : map.keySet()) {
  103 + System.out.println(key + "--->" + map.get(key));
  104 + }
  105 + // 定义 BufferedReader输入流来读取URL的响应
  106 + in = new BufferedReader(new InputStreamReader(
  107 + connection.getInputStream(),"utf-8"));
  108 + String line;
  109 + while ((line = in.readLine()) != null) {
  110 + result += line;
  111 + }
  112 + } catch (Exception e) {
  113 + System.out.println("发送DELETE请求出现异常！" + e);
  114 + e.printStackTrace();
  115 + }
  116 + // 使用finally块来关闭输入流
  117 + finally {
  118 + try {
  119 + if (in != null) {
  120 + in.close();
  121 + }
  122 + } catch (Exception e2) {
  123 + e2.printStackTrace();
  124 + }
  125 + }
  126 + return result;
  127 + }
  128 +
71 129 /**
72 130 * 向指定URL发送GET方法的请求
73 131 * @param url
platform-data-api/src/main/java/com/lyms/platform/data/controller/SmsController.java View file @ 318eeb0
1 1 package com.lyms.platform.data.controller;
2 2  
  3 +import com.lyms.platform.common.constants.ErrorCodeConstants;
  4 +import com.lyms.platform.common.result.BaseListResponse;
  5 +import com.lyms.platform.common.result.BaseResponse;
3 6 import com.lyms.platform.common.utils.ResultUtils;
4 7 import com.lyms.platform.data.service.SmsService;
5 8 import org.springframework.beans.factory.annotation.Autowired;
6 9 import org.springframework.stereotype.Controller;
7 10 import org.springframework.web.bind.annotation.RequestMapping;
8 11 import org.springframework.web.bind.annotation.RequestParam;
  12 +import org.springframework.web.bind.annotation.ResponseBody;
9 13  
10 14 import javax.servlet.http.HttpServletResponse;
11 15  
... ... @@ -81,5 +85,29 @@
81 85 smsService.productChildAmsSms();
82 86 writeString(response, "child ams success");
83 87 }
  88 +
  89 +
  90 + @RequestMapping(value = "/getDueSms")
  91 + @ResponseBody
  92 + public BaseResponse getDueSms(HttpServletResponse response,@RequestParam("token")String token){
  93 + if (!"lyms@2016!000".equals(token))
  94 + {
  95 + return new BaseResponse().setErrorcode(ErrorCodeConstants.SYSTEM_ERROR).setErrormsg("没有token");
  96 + }
  97 + return smsService.getDueSms();
  98 + }
  99 +
  100 +
  101 + @RequestMapping(value = "/deleteDueSms")
  102 + public void deleteDueSms(HttpServletResponse response,@RequestParam("token")String token){
  103 + if (!"lyms@2016!000".equals(token))
  104 + {
  105 + ResultUtils.buildParameterErrorResultAndWrite(response, "没有token");
  106 + return;
  107 + }
  108 + smsService.deleteDueSms();
  109 + writeString(response, "delete due sms success");
  110 + }
  111 +
84 112 }
platform-data-api/src/main/java/com/lyms/platform/data/service/SmsService.java View file @ 318eeb0
1 1 package com.lyms.platform.data.service;
2 2  
3 3  
  4 +import com.lyms.platform.common.result.BaseListResponse;
  5 +import com.lyms.platform.common.result.BaseResponse;
  6 +
4 7 /**
5 8 * Created by Administrator on 2016/7/5.
6 9 */
... ... @@ -13,6 +16,9 @@
13 16 void productChildAmsSms();
14 17  
15 18 void productChanAmsSms();
  19 +
  20 + BaseResponse deleteDueSms();
  21 + BaseListResponse getDueSms();
16 22  
17 23 void serviceEnd();
18 24  
platform-data-api/src/main/java/com/lyms/platform/data/service/impl/SmsServiceImpl.java View file @ 318eeb0
1 1 package com.lyms.platform.data.service.impl;
2 2  
3 3 import com.lyms.platform.biz.service.*;
  4 +import com.lyms.platform.common.constants.ErrorCodeConstants;
4 5 import com.lyms.platform.common.enums.*;
  6 +import com.lyms.platform.common.result.BaseListResponse;
  7 +import com.lyms.platform.common.result.BaseResponse;
5 8 import com.lyms.platform.common.utils.*;
6 9 import com.lyms.platform.data.pojo.HighScoreResult;
7 10 import com.lyms.platform.data.pojo.MessageContent;
... ... @@ -2852,6 +2855,87 @@
2852 2855 String dateStr = DateUtil.formatSimpleDate(new Date());
2853 2856 yunBookbuildingService.getBirthPatients(dateStr);
2854 2857 }
  2858 +
  2859 +
  2860 + @Override
  2861 + public BaseResponse deleteDueSms() {
  2862 +
  2863 + try {
  2864 + PatientsQuery patientsQuery = new PatientsQuery();
  2865 + patientsQuery.setType(3);
  2866 + patientsQuery.setYn(YnEnums.YES.getId());
  2867 + String startStr = DateUtil.getyyyy_MM_dd(new Date());
  2868 + Date startDate = DateUtil.parseYMD(startStr);
  2869 + Date endDate = new Date(startDate.getTime()+86400000-1);
  2870 + patientsQuery.setFmDateStart(startDate);
  2871 + patientsQuery.setFmDateEnd(endDate);
  2872 +
  2873 + List<Patients> results = yunBookbuildingService.queryPregnantWithQuery(patientsQuery);
  2874 + StringBuffer sb = null;
  2875 + if (CollectionUtils.isNotEmpty(results))
  2876 + {
  2877 + sb = new StringBuffer();
  2878 + for (Patients pat : results)
  2879 + {
  2880 + sb.append(pat.getPhone());
  2881 + sb.append(",");
  2882 + }
  2883 + System.out.println(sb);
  2884 + }
  2885 + if (sb != null)
  2886 + {
  2887 + SaveMessageService.deleteDueSms(sb.toString());
  2888 + }
  2889 +
  2890 + } catch (Exception e)
  2891 + {
  2892 + ExceptionUtils.catchException(e,"删除分娩孕妇异常");
  2893 + return new BaseResponse().setErrorcode(ErrorCodeConstants.SYSTEM_ERROR).setErrormsg("失败");
  2894 + }
  2895 +
  2896 + return new BaseResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功");
  2897 + }
  2898 +
  2899 + @Override
  2900 + public BaseListResponse getDueSms() {
  2901 +
  2902 + PatientsQuery patientsQuery = new PatientsQuery();
  2903 + patientsQuery.setType(3);
  2904 + patientsQuery.setYn(YnEnums.YES.getId());
  2905 + String startStr = DateUtil.getyyyy_MM_dd(new Date());
  2906 + Date startDate = DateUtil.parseYMD(startStr);
  2907 + Date endDate = new Date(startDate.getTime()+86400000-1);
  2908 +
  2909 + System.out.println("start = " + startStr);
  2910 + System.out.println("end = " + DateUtil.getyyyy_MM_dd_hms(endDate));
  2911 +
  2912 +
  2913 + patientsQuery.setFmDateStart(startDate);
  2914 + patientsQuery.setFmDateEnd(endDate);
  2915 + List<Map<String,String>> list = new ArrayList<>();
  2916 +
  2917 + List<Patients> results = yunBookbuildingService.queryPregnantWithQuery(patientsQuery);
  2918 + if (CollectionUtils.isNotEmpty(results))
  2919 + {
  2920 + for (Patients pat : results)
  2921 + {
  2922 + Map<String,String> map = new HashMap<>();
  2923 + map.put("name",pat.getUsername());
  2924 + map.put("phone",pat.getPhone());
  2925 + map.put("fmDate",pat.getFmDate() == null ? "" : DateUtil.getYmd(pat.getFmDate()));
  2926 + list.add(map);
  2927 + }
  2928 + }
  2929 +
  2930 + BaseListResponse objectResponse = new BaseListResponse();
  2931 + objectResponse.setErrorcode(ErrorCodeConstants.SUCCESS);
  2932 + objectResponse.setData(list);
  2933 + objectResponse.setErrormsg("成功");
  2934 + return objectResponse;
  2935 + }
  2936 +
  2937 +
  2938 +
2855 2939  
2856 2940  
2857 2941 public void productSms()
platform-data-api/src/main/java/com/lyms/platform/data/util/SaveMessageService.java View file @ 318eeb0
... ... @@ -41,7 +41,6 @@
41 41 public static boolean isExistSms(String patientId,String tempId)
42 42 {
43 43  
44   -
45 44 String param = "typeId="+ ProjectTypeEnums.YNXT.getId()+"&ext2="+StringUtils.emptyStr(tempId)+"&ext3="+StringUtils.emptyStr(patientId)+"&page=1&limit=10";
46 45 String result = HttpRequest.sendGet(CENTER_BASE_URL + "messages", param, CENTER_TOKEN);
47 46  
48 47  
49 48  
... ... @@ -58,42 +57,61 @@
58 57 return false;
59 58 }
60 59  
  60 +
  61 + public static boolean deleteDueSms(String phones)
  62 + {
  63 + String param = "typeId="+ ProjectTypeEnums.YNXT.getId()+"&phones="+StringUtils.emptyStr(phones);
  64 + String result = HttpRequest.sendDelete(CENTER_BASE_URL + "deleteDueSms", param, CENTER_TOKEN);
  65 + if (StringUtils.isNotEmpty(result))
  66 + {
  67 + Map<String,String> map = JsonUtil.str2Obj(result, Map.class);
  68 + if ("0".equals(map.get("errorcode")))
  69 + {
  70 + return true;
  71 + }
  72 + }
  73 + return false;
  74 + }
  75 +
61 76 public static void main(String[] areg)
62 77 {
63   - MessageListRequest list = new MessageListRequest();
64   - List<MessageRequest> messages = new ArrayList<>();
65   - MessageRequest request = new MessageRequest();
66   - request.setTypeId(1);
67   - request.setStatus(0);
68   - request.setContent("cccccccccccccccccc");
69   - request.setObjType(1);
70   - request.setPhone("18382670000");
71   - request.setPlanTime("2015-01-06 15:22:12");
72   - request.setServiceType(1);
73   - request.setExt1("196");
74   - request.setExt2("10");
75   - request.setExt3("10");
76   - request.setSubTypeId(6);
77   - messages.add(request);
  78 +// MessageListRequest list = new MessageListRequest();
  79 +// List<MessageRequest> messages = new ArrayList<>();
  80 +// MessageRequest request = new MessageRequest();
  81 +// request.setTypeId(1);
  82 +// request.setStatus(0);
  83 +// request.setContent("cccccccccccccccccc");
  84 +// request.setObjType(1);
  85 +// request.setPhone("18382670000");
  86 +// request.setPlanTime("2015-01-06 15:22:12");
  87 +// request.setServiceType(1);
  88 +// request.setExt1("196");
  89 +// request.setExt2("10");
  90 +// request.setExt3("10");
  91 +// request.setSubTypeId(6);
  92 +// messages.add(request);
  93 +//
  94 +//
  95 +// MessageRequest request1 = new MessageRequest();
  96 +// request1.setTypeId(1);
  97 +// request1.setStatus(0);
  98 +// request1.setContent("bbbbbbbbbbbbbb");
  99 +// request1.setObjType(1);
  100 +// request1.setPhone("18382670001");
  101 +// request1.setPlanTime("2015-01-06 15:22:12");
  102 +// request1.setServiceType(1);
  103 +// request.setSubTypeId(7);
  104 +// request1.setExt1("196");
  105 +// request1.setExt2("10");
  106 +// request1.setExt3("10");
  107 +// messages.add(request1);
  108 +//
  109 +// list.setTypeId(1);
  110 +// list.setMessages(messages);
  111 +// saveSmsCenter(list);
78 112  
79 113  
80   - MessageRequest request1 = new MessageRequest();
81   - request1.setTypeId(1);
82   - request1.setStatus(0);
83   - request1.setContent("bbbbbbbbbbbbbb");
84   - request1.setObjType(1);
85   - request1.setPhone("18382670001");
86   - request1.setPlanTime("2015-01-06 15:22:12");
87   - request1.setServiceType(1);
88   - request.setSubTypeId(7);
89   - request1.setExt1("196");
90   - request1.setExt2("10");
91   - request1.setExt3("10");
92   - messages.add(request1);
93   -
94   - list.setTypeId(1);
95   - list.setMessages(messages);
96   - saveSmsCenter(list);
  114 + deleteDueSms("15265444440,");
97 115 }
98 116 }
platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/DepartmentsController.java View file @ 318eeb0
... ... @@ -32,8 +32,6 @@
32 32 @Autowired
33 33 private DepartmentsService departmentsService;
34 34 @Autowired
35   - private PermissionsService permissionsService;
36   - @Autowired
37 35 private UsersService usersService;
38 36 @Autowired
39 37 private TokenService tokenService;
platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/PermissionsController.java View file @ 318eeb0
... ... @@ -35,7 +35,7 @@
35 35 public class PermissionsController extends BaseController {
36 36  
37 37 @Autowired
38   - private PermissionsService permissionsService;
  38 + private Permissions2Service permissions2Service;
39 39 @Autowired
40 40 private UsersService usersService;
41 41  
... ... @@ -65,7 +65,7 @@
65 65 @RequestParam(value = "id", required = false) Integer id,
66 66 @RequestParam(value = "page",required = false) Integer page,
67 67 @RequestParam(value = "limit",required = false) Integer limit) {
68   - PermissionsQuery permissionsQuery = new PermissionsQuery();
  68 + Permissions2Query permissionsQuery = new Permissions2Query();
69 69 page = null == page ? 1 : page;
70 70 limit = null == limit ? 10 : limit;
71 71 permissionsQuery.setNeed("true");
... ... @@ -74,7 +74,7 @@
74 74 permissionsQuery.setLimit(limit);
75 75  
76 76 permissionsQuery.setYn(YnEnums.YES.getId());
77   - List<Permissions> permissionses = permissionsService.queryPermissions(permissionsQuery);
  77 + List<Permissions2> permissionses = permissions2Service.queryPermissions2(permissionsQuery);
78 78 ResultUtils.buildSuccessResultAndWrite(response, permissionses);
79 79 }
80 80  
81 81  
... ... @@ -106,18 +106,17 @@
106 106  
107 107 /**
108 108 * 新增权限
  109 + * name;
109 110 */
110 111 @RequestMapping(value = "/permissions", method = RequestMethod.POST)
111 112 @TokenRequired
112 113 public void addPermissions(HttpServletResponse response, HttpServletRequest request,
113   - @RequestParam(value = "url") String url,
114   - @RequestParam(value = "moduleName") String moduleName,
115   - @RequestParam(value = "functionName") String functionName,
116   - @RequestParam(value = "permissionName") String permissionName,
117   - @RequestParam(value = "action") String action,
118   - @RequestParam(value = "ext", required = false) String ext,
119   - @RequestParam(value = "weight") Integer weight) {
120   - if (StringUtils.isEmpty(moduleName) || StringUtils.isEmpty(functionName) || StringUtils.isEmpty(permissionName) || StringUtils.isEmpty(action)) {
  114 + @RequestParam(value = "uri") String uri,
  115 + @RequestParam(value = "puri") String puri,
  116 + @RequestParam(value = "name") String name,
  117 + @RequestParam(value = "type") String type,
  118 + @RequestParam(value = "icon") String icon) {
  119 + if (StringUtils.isEmpty(uri) || StringUtils.isEmpty(name) || StringUtils.isEmpty(type)) {
121 120 ResultUtils.buildParameterErrorResultAndWrite(response);
122 121 return;
123 122 }
124 123  
125 124  
... ... @@ -126,22 +125,15 @@
126 125 LoginContext loginState = (LoginContext) request.getAttribute("loginContext");
127 126 Users users = usersService.getUsers(loginState.getId());
128 127  
129   - Permissions permissions = new Permissions();
  128 + Permissions2 permissions = new Permissions2();
  129 + permissions.setUri(uri);
  130 + permissions.setPuri(puri);
  131 + permissions.setName(name);
  132 + permissions.setType(type);
  133 + permissions.setIcon(icon);
130 134  
131   - permissions.setType(TYPE);
132   - permissions.setModuleName(moduleName);
133   - permissions.setFunctionName(functionName);
134   - permissions.setPermissionName(permissionName);
135   - permissions.setAction(action);
136   - permissions.setExt(ext);
137   - permissions.setUrl(url);
138   - permissions.setPublishId(users.getId());
139   - permissions.setPublishName(users.getName());
140   - permissions.setWeight(weight);
141 135 permissions.setYn(YnEnums.YES.getId());
142   - permissions.setModified(new Date());
143   - permissions.setCreated(new Date());
144   - permissionsService.addPermissions(permissions);
  136 + permissions2Service.addPermissions2(permissions);
145 137 ResultUtils.buildSuccessResultAndWrite(response);
146 138 }
147 139  
148 140  
149 141  
150 142  
151 143  
152 144  
... ... @@ -152,34 +144,31 @@
152 144 @TokenRequired
153 145 public void updatePermissions(HttpServletResponse response,
154 146 @PathVariable Integer id,
155   - @RequestParam(value = "moduleName") String moduleName,
156   - @RequestParam(value = "functionName") String functionName,
157   - @RequestParam(value = "permissionName") String permissionName,
158   - @RequestParam(value = "action") String action,
159   - @RequestParam(value = "ext", required = false) String ext,
160   - @RequestParam(value = "weight") Integer weight) {
  147 + @RequestParam(value = "uri") String uri,
  148 + @RequestParam(value = "puri") String puri,
  149 + @RequestParam(value = "name") String name,
  150 + @RequestParam(value = "type") String type,
  151 + @RequestParam(value = "icon") String icon) {
161 152  
162   - Permissions permissions = permissionsService.getPermissions(id);
  153 + Permissions2 permissions = permissions2Service.getPermissions2(id);
163 154  
164 155 if (permissions == null) {
165 156 new BusinessException("", "根据id获取信息不存在");
166 157 return;
167 158 }
168 159  
169   - if (id == null || StringUtils.isEmpty(moduleName) || StringUtils.isEmpty(functionName) || StringUtils.isEmpty(permissionName) || StringUtils.isEmpty(action)) {
  160 + if (StringUtils.isEmpty(uri) || StringUtils.isEmpty(name) || StringUtils.isEmpty(type)) {
170 161 ResultUtils.buildParameterErrorResultAndWrite(response);
171 162 return;
172 163 }
173   - permissions.setModuleName(moduleName);
174   - permissions.setFunctionName(functionName);
175   - permissions.setPermissionName(permissionName);
176   - permissions.setAction(action);
177   - permissions.setExt(ext);
178   - permissions.setWeight(weight);
  164 + permissions.setUri(uri);
  165 + permissions.setPuri(puri);
  166 + permissions.setName(name);
  167 + permissions.setType(type);
  168 + permissions.setIcon(icon);
179 169 permissions.setYn(YnEnums.YES.getId());
180   - permissions.setModified(new Date());
181 170  
182   - permissionsService.updatePermissions(permissions);
  171 + permissions2Service.updatePermissions2(permissions);
183 172 ResultUtils.buildSuccessResultAndWrite(response);
184 173 }
185 174  
186 175  
... ... @@ -193,14 +182,13 @@
193 182 ResultUtils.buildIdIsNull(response);
194 183 return;
195 184 }
196   - Permissions permissions = permissionsService.getPermissions(Integer.valueOf(id));
  185 + Permissions2 permissions = permissions2Service.getPermissions2(Integer.valueOf(id));
197 186 if (permissions == null) {
198 187 ResultUtils.buildIdResultData(response);
199 188 return;
200 189 }
201 190 permissions.setYn(YnEnums.NO.getId());
202   - permissions.setModified(new Date());
203   - permissionsService.updatePermissions(permissions);
  191 + permissions2Service.updatePermissions2(permissions);
204 192  
205 193 ResultUtils.buildSuccessResultAndWrite(response);
206 194 }
platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/RolesController.java View file @ 318eeb0
... ... @@ -44,7 +44,7 @@
44 44 @Autowired
45 45 private RolePermissionMapsService rolePermissionMapsService;
46 46 @Autowired
47   - private PermissionsService permissionsService;
  47 + private Permissions2Service permissions2Service;
48 48 @Autowired
49 49 private UserRoleMapsService userRoleMapsService;
50 50 @Autowired
... ... @@ -88,7 +88,7 @@
88 88 for (String tmp : roleArrayIds) {
89 89  
90 90  
91   - Permissions permissions = permissionsService.getPermissions(Integer.valueOf(tmp));
  91 + Permissions2 permissions = permissions2Service.getPermissions2(Integer.valueOf(tmp));
92 92 //权限是否存在
93 93 if (permissions == null || permissions.getYn() == YnEnums.NO.getId()) {
94 94 continue;
95 95  
... ... @@ -421,9 +421,9 @@
421 421 }
422 422 }
423 423  
424   - List<Permissions> permissionses;
  424 + List<Permissions2> permissionses;
425 425 for (Roles roles1 : rolesList) {
426   - permissionses = permissionsService.queryPermissionByRoleIds1(roles1.getId());
  426 + permissionses = permissions2Service.queryPermissionByRoleIds1(roles1.getId());
427 427  
428 428 /* RolePermissionMapsQuery rolePermissionMapsQuery = new RolePermissionMapsQuery();
429 429 rolePermissionMapsQuery.setYn(YnEnums.YES.getId());
... ... @@ -487,7 +487,7 @@
487 487  
488 488 List<Roles> roles = rolesService.queryRoles(rolesQuery);
489 489  
490   - List<Permissions> permissionses = null;
  490 + List<Permissions2> permissionses = null;
491 491 for (Roles roles1 : roles) {
492 492 /*permissionses = new ArrayList<>();
493 493 RolePermissionMapsQuery rolePermissionMapsQuery = new RolePermissionMapsQuery();
... ... @@ -500,7 +500,7 @@
500 500 if (permissions.getYn().equals(YnEnums.NO.getId())) continue;
501 501 permissionses.add(permissions);
502 502 }*/
503   - permissionses = permissionsService.queryPermissionByRoleIds1(roles1.getId());
  503 + permissionses = permissions2Service.queryPermissionByRoleIds1(roles1.getId());
504 504  
505 505 roles1.setPermissions(permissionses);
506 506 }
platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/UsersController.java View file @ 318eeb0
... ... @@ -63,7 +63,7 @@
63 63 @Autowired
64 64 private RolePermissionMapsService rolePermissionMapsService;
65 65 @Autowired
66   - private PermissionsService permissionsService;
  66 + private Permissions2Service permissions2Service;
67 67 @Autowired
68 68 private AccessPermissionFacade accessPermissionFacade;
69 69 @Autowired
... ... @@ -361,7 +361,7 @@
361 361 users = usersService.getUsers(loginContext.getId());
362 362 }
363 363  
364   - List<Permissions> permissions = null;
  364 + List<Permissions2> permissions = null;
365 365 List<Roles> roles = new ArrayList<>();
366 366 //超级管理员拥有所有角色和权限
367 367 if(users.getType().equals(UserTypeEnum.SUPPER_ADMIN.getId())) {
368 368  
... ... @@ -369,9 +369,9 @@
369 369 rolesQuery.setYn(YnEnums.YES.getId());
370 370 roles = rolesService.queryRoles(rolesQuery);
371 371  
372   - PermissionsQuery permissionsQuery = new PermissionsQuery();
  372 + Permissions2Query permissionsQuery = new Permissions2Query();
373 373 permissionsQuery.setYn(YnEnums.YES.getId());
374   - permissions = permissionsService.queryPermissions(permissionsQuery);
  374 + permissions = permissions2Service.queryPermissions2(permissionsQuery);
375 375  
376 376  
377 377 }
378 378  
... ... @@ -407,9 +407,9 @@
407 407 }
408 408 }*/
409 409 }
410   - List<Permissions> local = permissionsService.queryPermissionByRoleIds(userRoleMapses);
  410 + List<Permissions2> local = permissions2Service.queryPermissionByRoleIds(userRoleMapses);
411 411 if(CollectionUtils.isNotEmpty(local)){
412   - for(Permissions permissions1:local){
  412 + for(Permissions2 permissions1:local){
413 413 if(!permissionIds.contains(permissions1.getId())) {
414 414 permissionIds.add(permissions1.getId());
415 415 permissions.add(permissions1);