Merge branch 'master' of http://47.100.37.243:10080/ZHOU/yunsu

# Conflicts:
#	.gitignore

.gitignore

@@ -1,10 +1,3 @@
-# Created by .ignore support plugin (hsz.mobi)
-### Example user template template
-### Example user template
-
-# IntelliJ project files
-.idea
-*.iml
-out
-gen
-/.idea/workspace.xml
+.idea/misc.xml
+.idea/modules.xml
+.idea/workspace.xml

.idea/misc.xml

@@ -10,5 +10,5 @@
       </list>
     </option>
   </component>
-  <component name="ProjectRootManager" version="2" project-jdk-name="1.8" project-jdk-type="JavaSDK" />
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_9" default="false" project-jdk-name="1.8" project-jdk-type="JavaSDK" />
 </project>

.idea/modules.xml

@@ -3,6 +3,8 @@
   <component name="ProjectModuleManager">
     <modules>
       <module fileurl="file://$PROJECT_DIR$/model/cloud-model/cloud-model.iml" filepath="$PROJECT_DIR$/model/cloud-model/cloud-model.iml" />
+      <module fileurl="file://$PROJECT_DIR$/model/cloud-model/cloud-model.iml" filepath="$PROJECT_DIR$/model/cloud-model/cloud-model.iml" />
+      <module fileurl="file://$PROJECT_DIR$/model/model.iml" filepath="$PROJECT_DIR$/model/model.iml" />
       <module fileurl="file://$PROJECT_DIR$/model/model.iml" filepath="$PROJECT_DIR$/model/model.iml" />
       <module fileurl="file://$PROJECT_DIR$/.idea/yunsu.iml" filepath="$PROJECT_DIR$/.idea/yunsu.iml" />
     </modules>

model/cloud-model/src/main/java/com/hssx/cloudmodel/controller/RoleController.java

@@ -0,0 +1,71 @@
+package com.hssx.cloudmodel.controller;
+
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.hssx.cloudmodel.entity.Role;
+import com.hssx.cloudmodel.entity.SysUser;
+import com.hssx.cloudmodel.service.RoleService;
+import com.hssx.cloudmodel.util.HttpRespMsg;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import org.springframework.web.bind.annotation.ResponseBody;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+/**
+ * <p>
+ * 前端控制器
+ * </p>
+ *
+ * @author 吴涛涛
+ * @since 2019-07-26
+ */
+@Controller
+@RequestMapping("/role")
+public class RoleController {
+
+    @Autowired
+    private RoleService roleService;
+
+    /**
+     * 添加/修改角色
+     * @param role
+     * 参数：roleName 角色名 dowloadPower 下载权限 0-无，1-有
+     * uploadPower 上传权限 0-无，1-有 viewPower 浏览权限 0-无，1-有
+     * approvalPower 审批权限 0-无，1-有
+     * @param flag 0-添加，1-修改
+     * @return
+     */
+    @ApiOperation("添加角色")
+    @RequestMapping("add")
+    @ResponseBody
+    public HttpRespMsg addAndUpdateRole(Role role, HttpServletRequest request,Integer flag,
+                               HttpServletResponse response) {
+        HttpRespMsg msg = new HttpRespMsg();
+        msg = roleService.addAndUpdateRole(role,flag);
+        return msg;
+    }
+
+    /**
+     * 删除角色
+     * @param role
+     * 参数 id 角色id
+     * @return
+     */
+    @ApiOperation("删除角色")
+    @RequestMapping("delete")
+    @ResponseBody
+    public HttpRespMsg deleteRole(Role role, HttpServletRequest request,
+                               HttpServletResponse response) {
+        HttpRespMsg msg = new HttpRespMsg();
+        msg.data = roleService.removeById(role.getId());
+        return msg;
+    }
+
+}
+

model/cloud-model/src/main/java/com/hssx/cloudmodel/entity/Role.java

@@ -0,0 +1,140 @@
+package com.hssx.cloudmodel.entity;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+import com.baomidou.mybatisplus.annotation.TableId;
+import java.time.LocalDateTime;
+import com.baomidou.mybatisplus.annotation.TableField;
+import java.io.Serializable;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author 吴涛涛
+ * @since 2019-07-26
+ */
+@TableName("tb_role")
+public class Role extends Model<Role> {
+
+    private static final long serialVersionUID=1L;
+
+    /**
+     * 角色表主键
+     */
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+    /**
+     * 角色名称
+     */
+    @TableField("role_name")
+    private String roleName;
+
+    /**
+     * 下载权限
+     */
+    @TableField("dowload_power")
+    private Integer dowloadPower;
+
+    /**
+     * 上传权限
+     */
+    @TableField("upload_power")
+    private Integer uploadPower;
+
+    /**
+     * 浏览权限
+     */
+    @TableField("view_power")
+    private Integer viewPower;
+
+    /**
+     * 审批权限
+     */
+    @TableField("approval_power")
+    private Integer approvalPower;
+
+    /**
+     * 创建时间
+     */
+    @TableField("indate")
+    private LocalDateTime indate;
+
+
+    public Integer getId() {
+        return id;
+    }
+
+    public void setId(Integer id) {
+        this.id = id;
+    }
+
+    public String getRoleName() {
+        return roleName;
+    }
+
+    public void setRoleName(String roleName) {
+        this.roleName = roleName;
+    }
+
+    public Integer getDowloadPower() {
+        return dowloadPower;
+    }
+
+    public void setDowloadPower(Integer dowloadPower) {
+        this.dowloadPower = dowloadPower;
+    }
+
+    public Integer getUploadPower() {
+        return uploadPower;
+    }
+
+    public void setUploadPower(Integer uploadPower) {
+        this.uploadPower = uploadPower;
+    }
+
+    public Integer getViewPower() {
+        return viewPower;
+    }
+
+    public void setViewPower(Integer viewPower) {
+        this.viewPower = viewPower;
+    }
+
+    public Integer getApprovalPower() {
+        return approvalPower;
+    }
+
+    public void setApprovalPower(Integer approvalPower) {
+        this.approvalPower = approvalPower;
+    }
+
+    public LocalDateTime getIndate() {
+        return indate;
+    }
+
+    public void setIndate(LocalDateTime indate) {
+        this.indate = indate;
+    }
+
+    @Override
+    protected Serializable pkVal() {
+        return this.id;
+    }
+
+    @Override
+    public String toString() {
+        return "Role{" +
+        "id=" + id +
+        ", roleName=" + roleName +
+        ", dowloadPower=" + dowloadPower +
+        ", uploadPower=" + uploadPower +
+        ", viewPower=" + viewPower +
+        ", approvalPower=" + approvalPower +
+        ", indate=" + indate +
+        "}";
+    }
+}

model/cloud-model/src/main/java/com/hssx/cloudmodel/mapper/RoleMapper.java

@@ -0,0 +1,16 @@
+package com.hssx.cloudmodel.mapper;
+
+import com.hssx.cloudmodel.entity.Role;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author 吴涛涛
+ * @since 2019-07-26
+ */
+public interface RoleMapper extends BaseMapper<Role> {
+
+}

model/cloud-model/src/main/java/com/hssx/cloudmodel/service/RoleService.java

@@ -0,0 +1,18 @@
+package com.hssx.cloudmodel.service;
+
+import com.hssx.cloudmodel.entity.Role;
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.hssx.cloudmodel.util.HttpRespMsg;
+
+/**
+ * <p>
+ *  服务类
+ * </p>
+ *
+ * @author 吴涛涛
+ * @since 2019-07-26
+ */
+public interface RoleService extends IService<Role> {
+
+    HttpRespMsg addAndUpdateRole(Role role, Integer flag);
+}

model/cloud-model/src/main/java/com/hssx/cloudmodel/service/impl/RoleServiceImpl.java

@@ -0,0 +1,45 @@
+package com.hssx.cloudmodel.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.hssx.cloudmodel.entity.Role;
+import com.hssx.cloudmodel.mapper.RoleMapper;
+import com.hssx.cloudmodel.service.RoleService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.hssx.cloudmodel.util.HttpRespMsg;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 服务实现类
+ * </p>
+ *
+ * @author 吴涛涛
+ * @since 2019-07-26
+ */
+@Service
+public class RoleServiceImpl extends ServiceImpl<RoleMapper, Role> implements RoleService {
+    @Autowired
+    RoleMapper roleMapper;
+
+    @Override
+    public HttpRespMsg addAndUpdateRole(Role role, Integer flag) {
+        HttpRespMsg msg = new HttpRespMsg();
+        if (flag == 0) {
+            //添加角色
+            QueryWrapper<Role> qw = new QueryWrapper<>();
+            qw.eq("role_name", role.getRoleName());
+            int count = roleMapper.selectCount(qw);
+            if (count > 0) {
+                msg.setError("角色已存在，请勿重复添加");
+            } else {
+                roleMapper.insert(role);
+            }
+        } else if (flag == 1) {
+            //更新角色信息
+            roleMapper.updateById(role);
+        }
+        return msg;
+
+    }
+}

model/cloud-model/src/main/resources/mapper/RoleMapper.xml

@@ -0,0 +1,21 @@
+<?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.hssx.cloudmodel.mapper.RoleMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.hssx.cloudmodel.entity.Role">
+        <id column="id" property="id" />
+        <result column="role_name" property="roleName" />
+        <result column="dowload_power" property="dowloadPower" />
+        <result column="upload_power" property="uploadPower" />
+        <result column="view_power" property="viewPower" />
+        <result column="approval_power" property="approvalPower" />
+        <result column="indate" property="indate" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, role_name, dowload_power, upload_power, view_power, approval_power, indate
+    </sql>
+
+</mapper>

ys_vue/.gitignore

@@ -3,3 +3,6 @@ node_modules/
 npm-debug.log
 .editorconfig
 dist/
+.idea/misc.xml
+.idea/modules.xml
+.idea/workspace.xml