feats

db/.back_文明创办/文明创办-backup-20221216202942.pdma.json → db/.back_文明创办/文明创办-backup-20221225170314.pdma.json

   "name": "文明创办",
   "describe": "文明创办",
   "avatar": "",
-  "version": "4.1.4",
+  "version": "4.2.0",
   "createdTime": "2022-12-12 09:36:12",
-  "updatedTime": "2022-12-16 20:29:13",
+  "updatedTime": "2022-12-25 17:03:12",
   "dbConns": [],
   "profile": {
     "default": {
           "id": "692C2381-564C-4BEB-A9C7-DFEEB53A6C4E"
         },
         {
-          "defKey": "attach_type",
-          "defName": "附件类型",
+          "defKey": "file_type",
+          "defName": "文件类型",
           "comment": "",
           "type": "",
           "len": "",
         },
         {
           "defKey": "name",
-          "defName": "附件名称",
+          "defName": "文件名称",
           "comment": "",
           "type": "",
           "len": "",
         },
         {
           "defKey": "url",
-          "defName": "附件地址",
+          "defName": "文件地址",
           "comment": "",
           "type": "",
           "len": "",

db/.back_文明创办/文明创办-backup-20221218172610.pdma.json → db/.back_文明创办/文明创办-backup-20221226214926.pdma.json

   "name": "文明创办",
   "describe": "文明创办",
   "avatar": "",
-  "version": "4.1.4",
+  "version": "4.2.0",
   "createdTime": "2022-12-12 09:36:12",
-  "updatedTime": "2022-12-16 20:29:42",
+  "updatedTime": "2022-12-25 17:03:14",
   "dbConns": [],
   "profile": {
     "default": {
           "id": "692C2381-564C-4BEB-A9C7-DFEEB53A6C4E"
         },
         {
-          "defKey": "attach_type",
-          "defName": "附件类型",
+          "defKey": "file_type",
+          "defName": "文件类型",
           "comment": "",
           "type": "",
           "len": "",
         },
         {
           "defKey": "name",
-          "defName": "附件名称",
+          "defName": "文件名称",
           "comment": "",
           "type": "",
           "len": "",
         },
         {
           "defKey": "url",
-          "defName": "附件地址",
+          "defName": "文件地址",
           "comment": "",
           "type": "",
           "len": "",

db/.back_文明创办/文明创办-backup-20221216202913.pdma.json → db/.back_文明创办/文明创办-backup-20221226221940.pdma.json

   "name": "文明创办",
   "describe": "文明创办",
   "avatar": "",
-  "version": "4.1.4",
+  "version": "4.2.0",
   "createdTime": "2022-12-12 09:36:12",
-  "updatedTime": "2022-12-16 15:59:16",
+  "updatedTime": "2022-12-26 21:49:26",
   "dbConns": [],
   "profile": {
     "default": {
           "domain": "6BC8F04B-6CFA-4995-98D3-318F5CDD774E",
           "id": "0C4AEF3B-E3BB-4C7F-9943-F579E6A3CEEE"
         },
+        {
+          "defKey": "expire_date",
+          "defName": "截止时间",
+          "comment": "YYYY-MM-DD",
+          "type": "",
+          "len": "",
+          "scale": "",
+          "primaryKey": false,
+          "notNull": false,
+          "autoIncrement": false,
+          "defaultValue": "",
+          "hideInGraph": false,
+          "domain": "73FD2BAD-2358-4336-B96D-45DC897BD792",
+          "refDict": "",
+          "extProps": {},
+          "notes": {},
+          "id": "67B51317-2D33-4118-81AA-50D179CDF9E8"
+        },
         {
           "defKey": "org_id",
           "defName": "当前处理单位",
           "id": "692C2381-564C-4BEB-A9C7-DFEEB53A6C4E"
         },
         {
-          "defKey": "attach_type",
-          "defName": "附件类型",
+          "defKey": "file_type",
+          "defName": "文件类型",
           "comment": "",
           "type": "",
           "len": "",
         },
         {
           "defKey": "name",
-          "defName": "附件名称",
+          "defName": "文件名称",
           "comment": "",
           "type": "",
           "len": "",
         },
         {
           "defKey": "url",
-          "defName": "附件地址",
+          "defName": "文件地址",
           "comment": "",
           "type": "",
           "len": "",
       "id": "507794C4-11E9-4924-AEC5-368BC6E03FD7",
       "env": {
         "base": {
-          "nameSpace": "",
-          "codeRoot": ""
-        }
+          "nameSpace": "com.example.civilizedcity",
+          "codeRoot": "TaCheckItemAn"
+        },
+        "template": {
+          "JavaMybatisPlus": {
+            "Controller": {
+              "suffix": "controller/{{=it.codeRoot}}Controller.java"
+            },
+            "Service": {
+              "suffix": "service/{{=it.codeRoot}}Service.java"
+            },
+            "ServiceImpl": {
+              "suffix": "service/impl/{{=it. codeRoot}}ServiceImpl.java"
+            },
+            "Mapper": {
+              "suffix": "mapper/{{=it.codeRoot}}Mapper.java"
+            },
+            "Mapper.xml": {
+              "suffix": "mapper/{{=it.codeRoot}}Mapper.xml"
+            },
+            "Entity": {
+              "suffix": "entity/{{=it.codeRoot}}.java"
+            }
+          }
+        },
+        "custom": {}
       },
       "defKey": "ta_check_item_an",
       "defName": "项目问题答案",
           "scale": "",
           "primaryKey": true,
           "notNull": true,
-          "autoIncrement": true,
+          "autoIncrement": false,
           "defaultValue": "",
           "hideInGraph": true,
           "domain": "16120F75-6AA7-4483-868D-F07F511BB081",

db/文明创办.pdma.json

   "avatar": "",
   "version": "4.2.0",
   "createdTime": "2022-12-12 09:36:12",
-  "updatedTime": "2022-12-18 17:26:10",
+  "updatedTime": "2022-12-26 22:19:40",
   "dbConns": [],
   "profile": {
     "default": {
         "refKey": "extProps",
         "hideInGraph": true
       }
-    ],
-    "modelType": "modalGroup"
+    ]
   },
   "entities": [
     {
           "domain": "6BC8F04B-6CFA-4995-98D3-318F5CDD774E",
           "id": "0C4AEF3B-E3BB-4C7F-9943-F579E6A3CEEE"
         },
+        {
+          "defKey": "expire_date",
+          "defName": "截止时间",
+          "comment": "YYYY-MM-DD",
+          "type": "",
+          "len": "",
+          "scale": "",
+          "primaryKey": false,
+          "notNull": false,
+          "autoIncrement": false,
+          "defaultValue": "",
+          "hideInGraph": false,
+          "domain": "73FD2BAD-2358-4336-B96D-45DC897BD792",
+          "refDict": "",
+          "extProps": {},
+          "notes": {},
+          "id": "67B51317-2D33-4118-81AA-50D179CDF9E8"
+        },
         {
           "defKey": "org_id",
           "defName": "当前处理单位",
           "id": "692C2381-564C-4BEB-A9C7-DFEEB53A6C4E"
         },
         {
-          "defKey": "attach_type",
-          "defName": "附件类型",
+          "defKey": "file_type",
+          "defName": "文件类型",
           "comment": "",
           "type": "",
           "len": "",
         },
         {
           "defKey": "name",
-          "defName": "附件名称",
+          "defName": "文件名称",
           "comment": "",
           "type": "",
           "len": "",
         },
         {
           "defKey": "url",
-          "defName": "附件地址",
+          "defName": "文件地址",
           "comment": "",
           "type": "",
           "len": "",
           "domain": "6BC8F04B-6CFA-4995-98D3-318F5CDD774E",
           "id": "AFC8B3AA-0A3C-483A-9CDA-556CDC9D2ABE"
         },
+        {
+          "defKey": "prev_process",
+          "defName": "上个流程ID",
+          "comment": "",
+          "type": "",
+          "len": "",
+          "scale": "",
+          "primaryKey": false,
+          "notNull": false,
+          "autoIncrement": false,
+          "defaultValue": "",
+          "hideInGraph": false,
+          "refDict": "",
+          "extProps": {},
+          "domain": "9092C4E0-1A54-4859-ABBB-5B62DBC27573",
+          "id": "C7F06F89-4FA3-48D2-A861-B008B8C81251"
+        },
         {
           "defKey": "org_id",
           "defName": "处理机构",
           "defaultValue": "",
           "hideInGraph": false,
           "refDict": "",
-          "domain": "16120F75-6AA7-4483-868D-F07F511BB081",
+          "domain": "6BC8F04B-6CFA-4995-98D3-318F5CDD774E",
           "id": "DACC10C6-21E8-4483-9C65-DFC7EB3B960A",
           "uiHint": ""
         },

pom.xml

         </dependency>
 
 
+        <!--oss start-->
+        <dependency>
+            <groupId>com.aliyun.oss</groupId>
+            <artifactId>aliyun-sdk-oss</artifactId>
+            <version>2.8.3</version>
+        </dependency>
+        <!--oss end-->
+
+        <dependency>
+            <groupId>com.aliyun</groupId>
+            <artifactId>aliyun-java-sdk-core</artifactId>
+            <version>[4.4.9,5.0.0)</version>
+        </dependency>
+
+
         <!-- Sa-Token 权限认证, 在线文档：http://sa-token.dev33.cn/ -->
         <dependency>
             <groupId>cn.dev33</groupId>

src/main/java/com/example/civilizedcity/common/Constants.java

 
 public class Constants {
     public final static String ROOT_ID = "1";    // 超级管理员ID
+    public final static String ROOT_ORG = "1";  // 平台机构
 
     public final static int STATUS_DELETE = -1;
     public final static int STATUS_READY = 0;
 
     public final static String CHECK_ITEM_LOC = "loc";  // 实例调研
     public final static String CHECK_ITEM_SURVEY = "survey";  // 问卷调研
+
+    // 问题单
+    public final static String ATTACH_SOURCE_ISSUE = "issue";
+
+    // 督察员上报
+    public final static String ISSUE_SOURCE_INSPECTOR = "inspector";
+    // 市民上报
+    public final static String ISSUE_SOURCE_FEEDBACK = "feedback";
+    // 模拟测评
+    public final static String ISSUE_SOURCE_CHECK = "check";
+
+
+    // 待处理
+    public final static String PROCESS_STATUS_READY = "ready";
+    // 通过
+    public final static String PROCESS_STATUS_PASS = "pass";
+    // 未通过
+    public final static String PROCESS_STATUS_REJECT = "reject";
+    // 逾期
+    public final static String PROCESS_STATUS_EXPIRED = "expired";
+
+
+    // 流程起始: 待交办
+    public final static String PROCESS_START = "start";
+    public final static String PROCESS_RESTART = "restart";
+
+    // 审核
+    public final static String PROCESS_VERIFY = "verify";
+    // 交办
+    public final static String PROCESS_ASSIGNED = "assigned";
+    // 延期申请
+    public final static String PROCESS_ORG_DELAY_APPLY = "org_delay-apply";
+    // 延期审核
+    public final static String PROCESS_DELAY_VERIFY = "delay-verify";
+    // 单位交办
+    public final static String PROCESS_ORG_ASSIGNED = "org_assigned";
+    // 单位审核
+    public final static String PROCESS_ORG_VERIFY = "org_verify";
+    // 办结申请
+    public final static String PROCESS_ORG_FINISH_APPLY = "org_finish-apply";
+    // 办结审核
+    public final static String PROCESS_FINISH_VERIFY = "finish-verify";
+
+
+    // 流程结束: 已办结
+    public final static String PROCESS_END = "end";
 }

src/main/java/com/example/civilizedcity/common/OSSUtils.java

+package com.example.civilizedcity.common;
+
+import com.aliyun.oss.OSSClient;
+import com.aliyuncs.DefaultAcsClient;
+import com.aliyuncs.auth.sts.AssumeRoleRequest;
+import com.aliyuncs.auth.sts.AssumeRoleResponse;
+import com.aliyuncs.exceptions.ClientException;
+import com.aliyuncs.http.MethodType;
+import com.aliyuncs.profile.DefaultProfile;
+import com.aliyuncs.profile.IClientProfile;
+import com.example.civilizedcity.config.AliyunConfig;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+import org.springframework.web.multipart.MultipartFile;
+
+import java.io.*;
+import java.time.LocalDateTime;
+import java.time.format.DateTimeFormatter;
+import java.util.Base64;
+import java.util.HashMap;
+import java.util.Map;
+
+@Slf4j
+@Component
+public class OSSUtils {
+
+    private final static String STS_ENDPOINT = "sts.aliyuncs.com";
+
+    @Autowired
+    AliyunConfig aliyunConfig;
+
+    private String getMonth() {
+        return DateTimeFormatter.ofPattern("yyyyMM").format(LocalDateTime.now());
+    }
+
+    private String getUploadPath(String[] toDirs) {
+        String path = toDirs.length > 0 ? toDirs[0] : "/";
+        if (!path.endsWith("/")) {
+            path += "/";
+        }
+
+        return path + getMonth() + "/";
+    }
+
+    /**
+     * 上传 base64
+     * @param base64Str
+     * @param toDirs
+     * @return
+     * @throws IOException
+     */
+    public String putObject(String base64Str, String ...toDirs) throws IOException {
+        int index = base64Str.indexOf("base64,");
+
+        if (index > -1) {
+            index += 7;
+        } else {
+            index = 0;
+        }
+
+        String dataStr = base64Str.substring(index);
+        byte[] data = Base64.getDecoder().decode(dataStr);
+        ByteArrayInputStream inputStream = new ByteArrayInputStream(data);
+        String toDir = getUploadPath(toDirs);
+        String nwFName = toDir + System.currentTimeMillis() + ".png";
+        nwFName = StringUtils.trim(nwFName,"/");
+        return putFile(nwFName, inputStream);
+    }
+
+    /**
+     * 上传文件
+     * @param mf 上传的文件
+     * @param toDirs 上传到的目录
+     * @return
+     */
+    public String putObject(MultipartFile mf, String ... toDirs) throws IOException {
+        String fName = formatFileName(mf.getOriginalFilename());
+        String preFix = String.valueOf(System.currentTimeMillis());
+        String toDir = getUploadPath(toDirs);
+        String nwFName = toDir + preFix + "-" + fName;
+        nwFName = StringUtils.trim(nwFName,"/");
+
+        return putFile(nwFName, new ByteArrayInputStream(mf.getBytes()));
+    }
+
+    public String putObject(File f, String ... toDirs) throws FileNotFoundException {
+        String fName = formatFileName(f.getName());
+        String preFix = String.valueOf(System.currentTimeMillis());
+        String toDir = getUploadPath(toDirs);
+        String nwFName = toDir + preFix + "-" + fName;
+        nwFName = StringUtils.trim(nwFName,"/");
+
+        InputStream inputStream = new FileInputStream(f);
+        return putFile(nwFName, inputStream);
+    }
+
+    public String putObject(InputStream inputStream, String fName, String ... toDirs) {
+        String toDir = getUploadPath(toDirs);
+        String nwFName = toDir + fName;
+        nwFName = StringUtils.trim(nwFName,"/");
+        return putFile(nwFName, inputStream);
+    }
+
+    private String formatFileName(String fName) {
+        return StringUtils.ifNull(fName, StringUtils.random(16) + ".png");
+    }
+
+    private String putFile(String fname, InputStream input) {
+        OSSClient ossClient = new OSSClient(aliyunConfig.getOss().getEndpoint(), aliyunConfig.getAccessKeyId(), aliyunConfig.getAccessKeySecret());
+        ossClient.putObject(aliyunConfig.getOss().getBucketName(), fname, input);
+        ossClient.shutdown();
+
+        // String url = ossClient.generatePresignedUrl(AliOSSUtils.oss.getBucketName(), fname, expiration).toString();
+
+        String preURL = aliyunConfig.getOss().getBucketURL();
+        if (!preURL.endsWith("/")) {
+            preURL += "/";
+        }
+
+        return preURL + fname.replaceAll("\\ ", "%20").replaceAll("\\'", "%27");
+    }
+
+    /**
+     * 获取上传凭证
+     * @return
+     * @throws Exception
+     */
+    public Map<String, Object> getSTSAKToken() throws Exception {
+        AliyunConfig.Oss oss = aliyunConfig.getOss();
+
+        try {
+            // 添加endpoint（直接使用STS endpoint，无需添加region ID）
+            DefaultProfile.addEndpoint("", "Sts", STS_ENDPOINT);
+            // 构造default profile（参数留空，无需添加region ID）
+            IClientProfile profile = DefaultProfile.getProfile("", oss.getAccessKeyId(), oss.getAccessKeySecret());
+
+            // 用profile构造client
+            DefaultAcsClient client = new DefaultAcsClient(profile);
+            final AssumeRoleRequest request = new AssumeRoleRequest();
+            request.setSysMethod(MethodType.POST);
+            request.setRoleArn(oss.getArn());
+            request.setRoleSessionName(oss.getRoleSessionName());
+            request.setPolicy(null); // 若policy为空，则用户将获得该角色下所有权限
+            request.setDurationSeconds(30 * 60L); // 设置凭证有效时间 1800 秒 = 30 分钟
+            final AssumeRoleResponse response = client.getAcsResponse(request);
+
+            AssumeRoleResponse.Credentials credentials = response.getCredentials();
+
+            Map<String, Object> res = new HashMap<>();
+            res.put("stsToken", credentials.getSecurityToken());
+            res.put("accessKeySecret", credentials.getAccessKeySecret());
+            res.put("accessKeyId", credentials.getAccessKeyId());
+            res.put("expiration", credentials.getExpiration());
+
+            return res;
+        } catch (ClientException e) {
+            e.printStackTrace();
+            log.error("Error code: " + e.getErrCode());
+            log.error("Error message: " + e.getErrMsg());
+            log.error("RequestId: " + e.getRequestId());
+            throw new Exception(e.getMessage());
+        }
+    }
+
+}

src/main/java/com/example/civilizedcity/config/AliyunConfig.java

+package com.example.civilizedcity.config;
+
+import lombok.Data;
+import org.springframework.boot.context.properties.ConfigurationProperties;
+import org.springframework.stereotype.Component;
+
+@Data
+@Component
+@ConfigurationProperties(prefix = "aliyun")
+public class AliyunConfig {
+    private String accessKeyId;
+    private String accessKeySecret;
+
+    private Oss oss;
+
+//    private Sms sms;
+
+    @Data
+    public  static class Oss {
+        private String roleSessionName;
+        private String accessKeyId;
+        private String accessKeySecret;
+        private String arn;
+        private String region;
+        private String endpoint;
+        private String bucketName;
+        private String bucketURL;
+    }
+
+//    @Data
+//    public static class Sms {
+//        private Captcha captcha;
+//    }
+//
+//    @Data
+//    public static class Captcha {
+//        private String code;
+//        private String sign;
+//    }
+}

src/main/java/com/example/civilizedcity/controller/CommController.java

 
 
 import com.example.civilizedcity.common.BaseController;
+import com.example.civilizedcity.common.OSSUtils;
 import com.example.civilizedcity.common.ResponseBean;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
+
+import java.io.IOException;
+import java.util.HashMap;
+import java.util.Map;
 
 @Api(tags ="通用")
 @RestController
 @RequestMapping("/")
 public class CommController extends BaseController {
 
+    @Autowired
+    OSSUtils ossUtils;
+
     @GetMapping("/ma/captcha")
     @ApiOperation(value="获取验证码", notes = "获取验证码", httpMethod = "GET", response = ResponseBean.class)
     public ResponseBean getCaptcha(@ApiParam("手机号码") @RequestParam("phone") String phone) throws Exception {
 
         return ResponseBean.success("success");
     }
+
+    /**
+     * 文件
+     * @param multipartFile
+     * @return
+     */
+    @ApiOperation(value = "文件上传", notes = "文件上传")
+    @PostMapping("/{client}/file")
+    public ResponseBean uploadImage(@ApiParam("客户端") @PathVariable String client,
+                                    @ApiParam("文件") @RequestParam("file") MultipartFile multipartFile,
+                                    @ApiParam("文件类型") @RequestParam(value = "fileType", defaultValue = "image") String fileType) {
+        try {
+            String url = ossUtils.putObject(multipartFile);
+
+            Map<String, Object> resp = new HashMap<>();
+            resp.put("url", url);
+            resp.put("fileType", fileType);
+            return ResponseBean.success(resp);
+        } catch (IOException e) {
+            return ResponseBean.error("上传图片失败: " + e.getMessage(), ResponseBean.ERROR_UNAVAILABLE);
+        }
+    }
 }

src/main/java/com/example/civilizedcity/controller/SysUserController.java

     @ApiOperation("新增数据")
     @PostMapping("/sysUser")
     public ResponseBean add(@ApiParam("对象实体") @RequestBody SysUser sysUser) throws Exception {
+        if (null == sysUser.getOrgId()) {
+            sysUser.setOrgId(currentUser().getOrgId());
+        }
+
         sysUserService.mergeData(sysUser);
         return ResponseBean.success(sysUser);
     }

src/main/java/com/example/civilizedcity/controller/TaIssueController.java

 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.example.civilizedcity.common.BaseController;
+import com.example.civilizedcity.common.Constants;
 import com.example.civilizedcity.common.ResponseBean;
+
+import java.time.LocalDateTime;
 import java.util.List;
+
+import com.example.civilizedcity.entity.SysUser;
+import com.example.civilizedcity.entity.TaAttach;
+import com.example.civilizedcity.entity.TaIssueProcess;
+import com.example.civilizedcity.service.TaAttachService;
+import com.example.civilizedcity.service.TaIssueProcessService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
     
     @Autowired
     private TaIssueService taIssueService;
+
+    @Autowired
+    private TaAttachService taAttachService;
+
+    @Autowired
+    private TaIssueProcessService taIssueProcessService;
     
     /** 
      * 通过ID查询单条数据 
     @ApiOperation("新增数据")
     @PostMapping("/taIssue")
     public ResponseBean add(@ApiParam("对象实体") @RequestBody TaIssue taIssue) throws Exception {
+        SysUser user = currentUser();
+
+        taIssue.setIssueId(null);
+        taIssue.setProcessNode(Constants.PROCESS_START);
+        taIssue.setProcessStatus(Constants.PROCESS_STATUS_READY);
+        taIssue.setProcessNum(1);
+        taIssue.setOrgId(user.getOrgId());
+        taIssue.setSourceType(Constants.ISSUE_SOURCE_INSPECTOR);
+        taIssue.setStatus(Constants.STATUS_NORMAL);
+        taIssue.setCreatePerson(user.getUserId());
+        taIssue.setPersonName(user.getName());
+        taIssue.setCreateDate(LocalDateTime.now());
         taIssueService.save(taIssue);
+
+        // 保存文件
+        List<TaAttach> attachList = taIssue.getAttachList();
+        if (null != attachList && attachList.size() > 0) {
+            for (TaAttach item : attachList) {
+                item.setAttachId(null);
+                item.setOwnerType(Constants.ATTACH_SOURCE_ISSUE);
+                item.setOwnerId(taIssue.getIssueId().toString());
+                item.setStatus(Constants.STATUS_NORMAL);
+                item.setCreateDate(LocalDateTime.now());
+            }
+        }
+
+        taAttachService.saveBatch(attachList);
+
+        // 保存处理节点
+        TaIssueProcess process = new TaIssueProcess();
+        process.setIssueId(taIssue.getIssueId());
+        process.setOrgId(user.getOrgId());
+        process.setProcessNode(Constants.PROCESS_START);
+        process.setProcessStatus(Constants.PROCESS_STATUS_READY);
+        process.setStatus(Constants.STATUS_NORMAL);
+        process.setCreateUser(user.getUserId());
+        process.setUserName(user.getName());
+        process.setCreateDate(LocalDateTime.now());
+        taIssueProcessService.save(process);
+
         return ResponseBean.success(taIssue);
     }
     

src/main/java/com/example/civilizedcity/controller/TaIssueProcessController.java

 package com.example.civilizedcity.controller;
 
+import cn.dev33.satoken.annotation.SaCheckPermission;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.example.civilizedcity.common.BaseController;
-import com.example.civilizedcity.common.ResponseBean;
+import com.example.civilizedcity.common.*;
+
+import java.time.LocalDateTime;
 import java.util.List;
+
+import com.example.civilizedcity.entity.SysUser;
+import com.example.civilizedcity.entity.TaIssue;
+import com.example.civilizedcity.service.TaIssueService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
     
     @Autowired
     private TaIssueProcessService taIssueProcessService;
+
+    @Autowired
+    private TaIssueService taIssueService;
     
     /** 
      * 通过ID查询单条数据 
         
         return ResponseBean.success(result);
     }
-    
-    /** 
-     * 新增数据
-     *
-     * @param taIssueProcess 实例对象
-     * @return 实例对象
-     */
-    @ApiOperation("新增数据")
-    @PostMapping("/taIssueProcess")
-    public ResponseBean add(@ApiParam("对象实体") @RequestBody TaIssueProcess taIssueProcess) throws Exception {
-        taIssueProcessService.save(taIssueProcess);
-        return ResponseBean.success(taIssueProcess);
+
+    private TaIssue checkIssue(TaIssueProcess taIssueProcess) throws Exception {
+        if (null == taIssueProcess.getIssueId()) {
+            throw new Exception("找不到对应问题");
+        }
+
+        TaIssue taIssue = taIssueService.getById(taIssueProcess.getIssueId());
+        if (null == taIssue || taIssue.getStatus() == Constants.STATUS_DELETE) {
+            throw new Exception("找不到对应问题");
+        }
+
+        if (null == taIssueProcess.getPrevProcess()) {
+            throw new Exception("未找到上级流程");
+        }
+
+        if (Constants.PROCESS_END.equals(taIssue.getProcessNode())) {
+            throw new Exception("当前问题已办结");
+        }
+
+        if (Constants.ISSUE_SOURCE_CHECK.equals(taIssue.getSourceType())) {
+            throw new Exception("模拟测评问题不需要审核");
+        }
+
+        return taIssue;
+    }
+
+    private void updateUser(TaIssueProcess taIssueProcess, SysUser sysUser) {
+        taIssueProcess.setOrgId(sysUser.getOrgId());
+        taIssueProcess.setCreateUser(sysUser.getUserId());
+        taIssueProcess.setUserName(sysUser.getName());
+        taIssueProcess.setStatus(Constants.STATUS_NORMAL);
+        taIssueProcess.setCreateDate(LocalDateTime.now());
+    }
+
+    private void updateIssue(TaIssue taIssue, TaIssueProcess taIssueProcess) {
+        taIssue.setProcessNode(taIssueProcess.getProcessNode());
+        taIssue.setProcessStatus(taIssueProcess.getProcessNode());
+        taIssue.setOrgId(taIssueProcess.getOrgId());
+        taIssueService.updateById(taIssue);
     }
     
-    /** 
-     * 更新数据
+    /**
+     * 审核
      *
      * @param taIssueProcess 实例对象
      * @return 实例对象
      */
-    @ApiOperation("更新数据")
-    @PutMapping("/taIssueProcess/{id}")
-    public ResponseBean edit(@ApiParam("对象实体") @RequestBody TaIssueProcess taIssueProcess,
-                            @ApiParam("对象ID") @PathVariable Integer id ) throws Exception {
-        taIssueProcessService.updateById(taIssueProcess);
+    @SaCheckPermission("manager")
+    @ApiOperation("审核")
+    @PostMapping("/taIssueProcess/verify")
+    public ResponseBean verify(@ApiParam("对象实体") @RequestBody TaIssueProcess taIssueProcess) throws Exception {
+        TaIssue taIssue = checkIssue(taIssueProcess);
+
+        if (StringUtils.isEmpty(taIssueProcess.getProcessStatus())) {
+            return ResponseBean.error("请设置审批是否通过");
+        }
+
+        if (Constants.PROCESS_STATUS_REJECT.equals(taIssueProcess.getProcessStatus())) {
+            // 审核未通过
+            if (StringUtils.isEmpty(taIssueProcess.getProcessResult())) {
+                return ResponseBean.error("请填写未通过原因");
+            }
+        }
+
+        updateUser(taIssueProcess, currentUser());
+        taIssueProcess.setProcessNode(Constants.PROCESS_VERIFY);
+        taIssueProcessService.save(taIssueProcess);
+
+        updateIssue(taIssue, taIssueProcess);
+
         return ResponseBean.success(taIssueProcess);
     }
+
+     /**
+      * 交办
+      *
+      * @param taIssueProcess 实例对象
+      * @return 实例对象
+      */
+     @SaCheckPermission("manager")
+     @ApiOperation("交办")
+     @PostMapping("/taIssueProcess/assigned")
+     public ResponseBean assigned(@ApiParam("对象实体") @RequestBody TaIssueProcess taIssueProcess) throws Exception {
+         TaIssue taIssue = checkIssue(taIssueProcess);
+
+         if (StringUtils.isEmpty(taIssueProcess.getNextOrg())) {
+             return ResponseBean.error("请指定责任单位");
+         }
+         if (StringUtils.isEmpty(taIssueProcess.getExpireDate())) {
+             return ResponseBean.error("请设置截止日期");
+         } else {
+             if (DateUtils.isAfter(taIssueProcess.getExpireDate() + " 23:59:59")) {
+                 return ResponseBean.error("请设置有效的截止日期");
+             }
+
+             taIssue.setExpireDate(taIssueProcess.getExpireDate());
+         }
+
+         updateUser(taIssueProcess, currentUser());
+         taIssueProcess.setProcessNode(Constants.PROCESS_ASSIGNED);
+         taIssueProcess.setProcessStatus(Constants.PROCESS_STATUS_READY);
+         taIssueProcessService.save(taIssueProcess);
+
+         updateIssue(taIssue, taIssueProcess);
+
+         return ResponseBean.success(taIssueProcess);
+     }
+
+     /**
+      * 单位驳回
+      *
+      * @param taIssueProcess 实例对象
+      * @return 实例对象
+      */
+     @SaCheckPermission("org_user")
+     @ApiOperation("单位驳回")
+     @PostMapping("/taIssueProcess/org/reject")
+     public ResponseBean reject(@ApiParam("对象实体") @RequestBody TaIssueProcess taIssueProcess) throws Exception {
+         TaIssue taIssue = checkIssue(taIssueProcess);
+
+         TaIssueProcess prevProcess = taIssueProcessService.getById(taIssueProcess.getPrevProcess());
+         if (null == prevProcess) {
+             return ResponseBean.error("未找到上级流程");
+         }
+
+         if (StringUtils.isEmpty(taIssueProcess.getProcessResult())) {
+             return ResponseBean.error("请填写未驳回原因");
+         }
+
+         updateUser(taIssueProcess, currentUser());
+         taIssueProcess.setNextOrg(prevProcess.getOrgId());
+         taIssueProcess.setProcessNode(Constants.PROCESS_ASSIGNED);
+         taIssueProcess.setProcessStatus(Constants.PROCESS_STATUS_REJECT);
+         taIssueProcessService.save(taIssueProcess);
+
+         updateIssue(taIssue, taIssueProcess);
+
+         return ResponseBean.success(taIssueProcess);
+     }
+
+     /**
+      * 延期申请
+      *
+      * @param taIssueProcess 实例对象
+      * @return 实例对象
+      */
+     @SaCheckPermission("org_user")
+     @ApiOperation("延期申请")
+     @PostMapping("/taIssueProcess/org/delay/apply")
+     public ResponseBean delayApply(@ApiParam("对象实体") @RequestBody TaIssueProcess taIssueProcess) throws Exception {
+         TaIssue taIssue = checkIssue(taIssueProcess);
+
+         if (StringUtils.isEmpty(taIssueProcess.getExpireDate())) {
+             return ResponseBean.error("请设置延期日期");
+         } else {
+             if (DateUtils.isAfter(taIssueProcess.getExpireDate() + " 23:59:59")) {
+                 return ResponseBean.error("请设置有效的延期日期");
+             }
+         }
+
+         TaIssueProcess prevProcess = taIssueProcessService.getById(taIssueProcess.getPrevProcess());
+         if (null == prevProcess) {
+             return ResponseBean.error("未找到上级流程");
+         }
+
+         updateUser(taIssueProcess, currentUser());
+         taIssueProcess.setNextOrg(prevProcess.getOrgId());
+         taIssueProcess.setProcessNode(Constants.PROCESS_ORG_DELAY_APPLY);
+         taIssueProcess.setProcessStatus(Constants.PROCESS_STATUS_READY);
+         taIssueProcessService.save(taIssueProcess);
+
+         updateIssue(taIssue, taIssueProcess);
+
+         return ResponseBean.success(taIssueProcess);
+     }
+
+     /**
+      * 延期审核
+      *
+      * @param taIssueProcess 实例对象
+      * @return 实例对象
+      */
+     @SaCheckPermission("manager")
+     @ApiOperation("延期审核")
+     @PostMapping("/taIssueProcess/delay/verify")
+     public ResponseBean delayVerify(@ApiParam("对象实体") @RequestBody TaIssueProcess taIssueProcess) throws Exception {
+         TaIssue taIssue = checkIssue(taIssueProcess);
+
+         TaIssueProcess prevProcess = taIssueProcessService.getById(taIssueProcess.getPrevProcess());
+         if (null == prevProcess) {
+             return ResponseBean.error("未找到上级流程");
+         }
+
+         if (!Constants.PROCESS_ORG_DELAY_APPLY.equals(prevProcess.getProcessNode())) {
+             return ResponseBean.error("上级流程验证不正确");
+         }
+
+         if (Constants.PROCESS_STATUS_REJECT.equals(taIssueProcess.getProcessStatus())) {
+             // 审核未通过
+             if (StringUtils.isEmpty(taIssueProcess.getProcessResult())) {
+                 return ResponseBean.error("请填写未通过原因");
+             }
+         } else {
+             taIssue.setExpireDate(prevProcess.getExpireDate());
+         }
+
+         updateUser(taIssueProcess, currentUser());
+         taIssueProcess.setNextOrg(prevProcess.getOrgId());
+         taIssueProcess.setProcessNode(Constants.PROCESS_DELAY_VERIFY);
+         taIssueProcessService.save(taIssueProcess);
+
+         updateIssue(taIssue, taIssueProcess);
+
+         return ResponseBean.success(taIssueProcess);
+     }
+
+     /**
+      * 单位交办
+      *
+      * @param taIssueProcess 实例对象
+      * @return 实例对象
+      */
+     @SaCheckPermission("org_user")
+     @ApiOperation("单位交办")
+     @PostMapping("/taIssueProcess/org/assigned")
+     public ResponseBean orgAssigned(@ApiParam("对象实体") @RequestBody TaIssueProcess taIssueProcess) throws Exception {
+         TaIssue taIssue = checkIssue(taIssueProcess);
+
+         updateUser(taIssueProcess, currentUser());
+         taIssueProcess.setProcessNode(Constants.PROCESS_ORG_ASSIGNED);
+         taIssueProcess.setProcessStatus(Constants.PROCESS_STATUS_READY);
+         taIssueProcessService.save(taIssueProcess);
+
+         updateIssue(taIssue, taIssueProcess);
+
+         return ResponseBean.success(taIssueProcess);
+     }
+
+     /**
+      * 单位审核
+      *
+      * @param taIssueProcess 实例对象
+      * @return 实例对象
+      */
+     @SaCheckPermission("org_manager")
+     @ApiOperation("单位审核")
+     @PostMapping("/taIssueProcess/org/verify")
+     public ResponseBean orgVerify(@ApiParam("对象实体") @RequestBody TaIssueProcess taIssueProcess) throws Exception {
+         TaIssue taIssue = checkIssue(taIssueProcess);
+
+         if (StringUtils.isEmpty(taIssueProcess.getProcessStatus())) {
+             return ResponseBean.error("请设置审批是否通过");
+         }
+
+         if (Constants.PROCESS_STATUS_REJECT.equals(taIssueProcess.getProcessStatus())) {
+             // 审核未通过
+             if (StringUtils.isEmpty(taIssueProcess.getProcessResult())) {
+                 return ResponseBean.error("请填写未通过原因");
+             }
+         }
+
+         updateUser(taIssueProcess, currentUser());
+         taIssueProcess.setProcessNode(Constants.PROCESS_ORG_VERIFY);
+         taIssueProcessService.save(taIssueProcess);
+
+         updateIssue(taIssue, taIssueProcess);
+
+         return ResponseBean.success(taIssueProcess);
+     }
+
+     /**
+      * 办结申请
+      *
+      * @param taIssueProcess 实例对象
+      * @return 实例对象
+      */
+     @SaCheckPermission("org_user")
+     @ApiOperation("办结申请")
+     @PostMapping("/taIssueProcess/org/finish/apply")
+     public ResponseBean finishApply(@ApiParam("对象实体") @RequestBody TaIssueProcess taIssueProcess) throws Exception {
+         TaIssue taIssue = checkIssue(taIssueProcess);
+
+         updateUser(taIssueProcess, currentUser());
+         taIssueProcess.setNextOrg(Constants.ROOT_ORG);
+         taIssueProcess.setProcessNode(Constants.PROCESS_ORG_FINISH_APPLY);
+         taIssueProcess.setProcessStatus(Constants.PROCESS_STATUS_READY);
+         taIssueProcessService.save(taIssueProcess);
+
+         updateIssue(taIssue, taIssueProcess);
+
+         return ResponseBean.success(taIssueProcess);
+     }
+
+
+     /**
+      * 办结审核
+      *
+      * @param taIssueProcess 实例对象
+      * @return 实例对象
+      */
+     @SaCheckPermission("manager")
+     @ApiOperation("办结审核")
+     @PostMapping("/taIssueProcess/finish/verify")
+     public ResponseBean finishVerify(@ApiParam("对象实体") @RequestBody TaIssueProcess taIssueProcess) throws Exception {
+         TaIssue taIssue = checkIssue(taIssueProcess);
+
+         TaIssueProcess prevProcess = taIssueProcessService.getById(taIssueProcess.getPrevProcess());
+         if (null == prevProcess) {
+             return ResponseBean.error("未找到上级流程");
+         }
+
+         if (!Constants.PROCESS_ORG_FINISH_APPLY.equals(prevProcess.getProcessNode())) {
+             return ResponseBean.error("上级流程验证不正确");
+         }
+
+         if (StringUtils.isEmpty(taIssueProcess.getProcessStatus())) {
+             return ResponseBean.error("请设置审批是否通过");
+         }
+
+         if (Constants.PROCESS_STATUS_REJECT.equals(taIssueProcess.getProcessStatus())) {
+             // 审核未通过
+             if (StringUtils.isEmpty(taIssueProcess.getProcessResult())) {
+                 return ResponseBean.error("请填写未通过原因");
+             }
+             taIssueProcess.setNextOrg(prevProcess.getOrgId());
+             taIssueProcess.setProcessNode(Constants.PROCESS_FINISH_VERIFY);
+         } else {
+             // 审核通过, 说明整个流程结束
+             taIssue.setProcessNode(Constants.PROCESS_END);
+             taIssue.setProcessStatus(Constants.PROCESS_STATUS_PASS);
+         }
+
+         updateUser(taIssueProcess, currentUser());
+         taIssueProcessService.save(taIssueProcess);
+
+         taIssue.setOrgId(taIssueProcess.getOrgId());
+         taIssueService.updateById(taIssue);
+
+         return ResponseBean.success(taIssueProcess);
+     }
     
     /** 
      * 通过主键删除数据

src/main/java/com/example/civilizedcity/entity/TaAttach.java

 public class TaAttach implements Serializable,Cloneable{
     /** 附件ID */
     @ApiModelProperty(name = "附件ID",notes = "")
-    @TableId(value = "attach_id", type = IdType.INPUT)
+    @TableId(value = "attach_id", type = IdType.AUTO)
     private Integer attachId ;
-    /** 附件类型 */
-    @ApiModelProperty(name = "附件类型",notes = "")
-    private String attachType ;
+    /** 文件类型 */
+    @ApiModelProperty(name = "文件类型",notes = "")
+    private String fileType ;
     /** 附件名称 */
     @ApiModelProperty(name = "附件名称",notes = "")
     private String name ;

src/main/java/com/example/civilizedcity/entity/TaIssue.java

 package com.example.civilizedcity.entity;
 
+import com.baomidou.mybatisplus.annotation.TableField;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import com.baomidou.mybatisplus.annotation.IdType;
 import java.io.Serializable;
 import java.time.LocalDateTime;
 import java.util.Date;
+import java.util.List;
+
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
 public class TaIssue implements Serializable,Cloneable{
       /** 问题ID */
       @ApiModelProperty(name = "问题ID",notes = "")
-      @TableId(value = "issue_id", type = IdType.INPUT)
+      @TableId(value = "issue_id", type = IdType.AUTO)
       private Integer issueId ;
       /** 标题 */
       @ApiModelProperty(name = "标题",notes = "")
       /** 处理状态 */
       @ApiModelProperty(name = "处理状态",notes = "")
       private String processStatus ;
+       /** 截止时间;YYYY-MM-DD */
+       @ApiModelProperty(name = "截止时间",notes = "YYYY-MM-DD")
+       private String expireDate ;
       /** 交办次数 */
       @ApiModelProperty(name = "交办次数",notes = "")
       private Integer processNum ;
       @ApiModelProperty(name = "更新时间",notes = "")
       private LocalDateTime updateDate ;
 
+
+      @TableField(exist = false)
+       @ApiModelProperty(name = "文件列表",notes = "")
+      private List<TaAttach> attachList;
 }

src/main/java/com/example/civilizedcity/entity/TaIssueProcess.java

 @ApiModel(value = "问题处理",description = "")
 @TableName("ta_issue_process")
 public class TaIssueProcess implements Serializable,Cloneable{
-     /** 过程ID */
-     @ApiModelProperty(name = "过程ID",notes = "")
-     @TableId(value = "process_id", type = IdType.INPUT)
-     private Integer processId ;
-     /** 问题ID */
-     @ApiModelProperty(name = "问题ID",notes = "")
-     private Integer issueId ;
-     /** 处理机构 */
-     @ApiModelProperty(name = "处理机构",notes = "")
-     private String orgId ;
-     /** 指定机构 */
-     @ApiModelProperty(name = "指定机构",notes = "")
-     private String nextOrg ;
-     /** 流程节点 */
-     @ApiModelProperty(name = "流程节点",notes = "")
-     private String processNode ;
-     /** 处理结果 */
-     @ApiModelProperty(name = "处理结果",notes = "")
-     private String processStatus ;
-     /** 结果说明 */
-     @ApiModelProperty(name = "结果说明",notes = "")
-     private String processResult ;
-     /** 状态 */
-     @ApiModelProperty(name = "状态",notes = "")
-     private Integer status ;
-     /** 处理人 */
-     @ApiModelProperty(name = "处理人",notes = "")
-     private String createUser ;
-     /** 处理人名称 */
-     @ApiModelProperty(name = "处理人名称",notes = "")
-     private String userName ;
-     /** 创建时间 */
-     @ApiModelProperty(name = "创建时间",notes = "")
-     private LocalDateTime createDate ;
+      /** 过程ID */
+      @ApiModelProperty(name = "过程ID",notes = "")
+      @TableId(value = "process_id", type = IdType.AUTO)
+      private Integer processId ;
+      /** 问题ID */
+      @ApiModelProperty(name = "问题ID",notes = "")
+      private Integer issueId ;
+       /** 上个流程ID */
+       @ApiModelProperty(name = "上个流程ID",notes = "")
+       private String prevProcess ;
+      /** 处理机构 */
+      @ApiModelProperty(name = "处理机构",notes = "")
+      private String orgId ;
+      /** 指定机构 */
+      @ApiModelProperty(name = "指定机构",notes = "")
+      private String nextOrg ;
+      /** 截止时间;YYYY-MM-DD */
+      @ApiModelProperty(name = "截止时间",notes = "YYYY-MM-DD")
+      private String expireDate ;
+      /** 流程节点 */
+      @ApiModelProperty(name = "流程节点",notes = "")
+      private String processNode ;
+      /** 处理结果 */
+      @ApiModelProperty(name = "处理结果",notes = "")
+      private String processStatus ;
+      /** 结果说明 */
+      @ApiModelProperty(name = "结果说明",notes = "")
+      private String processResult ;
+      /** 状态 */
+      @ApiModelProperty(name = "状态",notes = "")
+      private Integer status ;
+      /** 处理人 */
+      @ApiModelProperty(name = "处理人",notes = "")
+      private String createUser ;
+      /** 处理人名称 */
+      @ApiModelProperty(name = "处理人名称",notes = "")
+      private String userName ;
+      /** 创建时间 */
+      @ApiModelProperty(name = "创建时间",notes = "")
+      private LocalDateTime createDate ;
 
 }

src/main/java/com/example/civilizedcity/mapper/SysUserDutyMapper.java

 public interface SysUserDutyMapper  extends BaseMapper<SysUserDuty>{
 
      List<String> getListByUser(@Param("userId") String userId);
- }
+
+}

src/main/java/com/example/civilizedcity/mapper/SysUserRoleMapper.java

      SysUserRole getByUserAndRole(@Param("userId") String userId, @Param("roleId") String roleId);
 
      int deleteNotIn(@Param("userId") String userId, @Param("idList") List<Integer> idList);
- }
+
+    List<String> getRoleList(@Param("userId") String userId);
+}

src/main/java/com/example/civilizedcity/service/SysUserService.java

 import com.example.civilizedcity.vo.ChangePassword;
 import com.example.civilizedcity.vo.LoginParam;
 
+import java.util.List;
+
 /**
  * 用户表;(sys_user)表服务接口
  *
     boolean changePassword(SysUser user, ChangePassword param) throws Exception;
 
     boolean mergeData(SysUser sysUser) throws Exception;
+
+    List<String> getRoleList(String userId);
+
+    List<String> getPermissionList(String userId);
 }

src/main/java/com/example/civilizedcity/service/impl/StpInterfaceImpl.java

+package com.example.civilizedcity.service.impl;
+
+import cn.dev33.satoken.stp.StpInterface;
+import com.example.civilizedcity.service.SysUserService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+import java.util.List;
+
+@Component
+public class StpInterfaceImpl implements StpInterface {
+
+    @Autowired
+    SysUserService sysUserService;
+
+    @Override
+    public List<String> getPermissionList(Object loginId, String loginType) {
+        return sysUserService.getPermissionList(loginId.toString());
+    }
+
+    @Override
+    public List<String> getRoleList(Object loginId, String loginType) {
+        return sysUserService.getRoleList(loginId.toString());
+    }
+}

src/main/java/com/example/civilizedcity/service/impl/SysUserServiceImpl.java

 import com.example.civilizedcity.entity.SysRole;
 import com.example.civilizedcity.entity.SysUserRole;
 import com.example.civilizedcity.mapper.SysLoginMapper;
+import com.example.civilizedcity.mapper.SysUserDutyMapper;
 import com.example.civilizedcity.mapper.SysUserRoleMapper;
 import com.example.civilizedcity.vo.ChangePassword;
 import com.example.civilizedcity.vo.LoginParam;
     @Autowired
     SysUserRoleMapper sysUserRoleMapper;
 
+    @Autowired
+    SysUserDutyMapper sysUserDutyMapper;
+
     @Override
     public SysUser login(LoginParam loginParm) throws Exception {
         SysLogin sysLogin = sysLoginMapper.getByAccount(loginParm.getAccount());
         return true;
     }
 
+    @Override
+    public List<String> getRoleList(String userId) {
+        return sysUserRoleMapper.getRoleList(userId);
+    }
+
+    @Override
+    public List<String> getPermissionList(String userId) {
+        return sysUserDutyMapper.getListByUser(userId);
+    }
+
     boolean checkPassword(String src, String targ, String salt) {
         String newPass = EncryptUtils.md5(src, salt);
         return targ.equals(newPass);

src/main/resources/application.yml

     token:
     aesKey:
 
+###
+aliyun:
+  accessKeyId: LTAI5tGjnZY6k799BHxhmqcm
+  accessKeySecret: eU1DmULbgHe2dnIg3P93634PO2vEh5
+  oss:
+    roleSessionName: shigongli
+    accessKeyId: LTAI4G9zCefU1m7sKmmBnzTc
+    accessKeySecret: Vaax5O7wTL0KZdSgd8L9cGBf8AgUqJ
+    arn: acs:ram::1636896505560465:role/ramosssts
+    region: oss-cn-shanghai
+    endpoint: oss-accelerate.aliyuncs.com
+    bucketName: yz-shigongli
+    bucketURL: https://yz-shigongli.oss-accelerate.aliyuncs.com
+
 
 sa-token:
   # jwt秘钥

src/main/resources/mapper/SysUserRoleMapper.xml

             t.user_id = #{userId}
           AND t.role_id = #{roleId}
     </select>
+    <select id="getRoleList" resultType="java.lang.String">
+        SELECT
+            t.role_id
+        FROM
+            sys_user_role t
+        WHERE
+            t.user_id = #{userId}
+    </select>
 </mapper>