feats

pom.xml

@@ -25,6 +25,12 @@
 			<artifactId>spring-boot-starter-web</artifactId>
 		</dependency>
 
+		<dependency>
+			<groupId>org.springframework.boot</groupId>
+			<artifactId>spring-boot-configuration-processor</artifactId>
+			<optional>true</optional>
+		</dependency>
+
 		<dependency>
 			<groupId>org.springframework.boot</groupId>
 			<artifactId>spring-boot-starter-test</artifactId>
@@ -140,6 +146,14 @@
 					<plugin>
 						<groupId>org.springframework.boot</groupId>
 						<artifactId>spring-boot-maven-plugin</artifactId>
+						<configuration>
+							<excludes>
+								<exclude>
+									<groupId>org.springframework.boot</groupId>
+									<artifactId>spring-boot-configuration-processor</artifactId>
+								</exclude>
+							</excludes>
+						</configuration>
 					</plugin>
 				</plugins>
 				<resources>

src/main/java/com/yunzhi/nanyang/common/BaseController.java

@@ -1,27 +1,45 @@
 package com.yunzhi.nanyang.common;
 
 import com.yunzhi.nanyang.entity.SysUser;
+import com.yunzhi.nanyang.entity.TaPerson;
+import com.yunzhi.nanyang.service.ISysUserDataScopeService;
 import com.yunzhi.nanyang.service.ISysUserService;
+import com.yunzhi.nanyang.service.ITaPersonService;
+import com.yunzhi.nanyang.shiro.realms.manager.ManagerRealm;
 import com.yunzhi.nanyang.shiro.utils.JWTUtil;
 import org.apache.shiro.SecurityUtils;
 import org.apache.shiro.subject.Subject;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.List;
+
 @Component
 public class BaseController {
 
     @Autowired
     ISysUserService iSysUserService;
 
-    public String currentLoginId() {
+    @Autowired
+    ITaPersonService iTaPersonService;
+
+    @Autowired
+    ISysUserDataScopeService iSysUserDataScopeService;
+
+    public String getLoginId() {
         Subject subject = SecurityUtils.getSubject();
         String token = subject.getPrincipal().toString();
+
+//        List<Object> list = Arrays.asList(subject.getPrincipals().fromRealm("managerRealm").toArray());
+//        String token = list.get(0).toString();
+
         return JWTUtil.getLoginId(token);
     }
 
     public SysUser currentUser() throws Exception {
-        String loginId = currentLoginId();
+        String loginId = getLoginId();
         if (StringUtils.isEmpty(loginId)) {
             throw new Exception("请先登录");
         }
@@ -33,4 +51,26 @@ public class BaseController {
 
         return user;
     }
+
+    public TaPerson currentPerson() throws Exception {
+        String personId = getLoginId();
+        if (StringUtils.isEmpty(personId)) {
+            throw new Exception("请先登录");
+        }
+
+        TaPerson taPerson = iTaPersonService.getById(personId);
+        if (taPerson == null || taPerson.getStatus() == Constants.STATUS_DELETE) {
+            throw new Exception("人员不存在");
+        }
+
+        return taPerson;
+    }
+
+    public boolean checkOrgAccess(String orgId, String userId) {
+        return iSysUserDataScopeService.checkOrgAccess(orgId, userId);
+    }
+
+    public List<String> getAccessOrgs(String userId) {
+        return iSysUserDataScopeService.getAccessOrgs(userId);
+    }
 }

src/main/java/com/yunzhi/nanyang/common/Constants.java

@@ -6,4 +6,12 @@ public class Constants {
     public final static int STATUS_DELETE = -1;
     public final static int STATUS_READY = 0;
     public final static int STATUS_NORMAL = 1;
+
+    //
+    public final static String CLIENT_WORKER = "worker";    // 农机手
+    public final static String CLIENT_FARMER = "farmer";    // 农户
+
+    // 资源类型
+    public final static String TARGET_MACHINERY = "machinery";  // 农机
+    public final static String TARGET_NEWS = "news";    // 资讯
 }

src/main/java/com/yunzhi/nanyang/common/OSSUtils.java

@@ -1,19 +1,73 @@
 package com.yunzhi.nanyang.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.yunzhi.nanyang.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 上传的文件
@@ -23,10 +77,7 @@ public class OSSUtils {
     public String putObject(MultipartFile mf, String ... toDirs) throws IOException {
         String fName = formatFileName(mf.getOriginalFilename());
         String preFix = String.valueOf(System.currentTimeMillis());
-        String toDir = "/";
-        if (null != toDirs && toDirs.length > 0) {
-            toDir = toDirs[0];
-        }
+        String toDir = getUploadPath(toDirs);
         String nwFName = toDir + preFix + "-" + fName;
         nwFName = StringUtils.trim(nwFName,"/");
 
@@ -36,10 +87,7 @@ public class OSSUtils {
     public String putObject(File f, String ... toDirs) throws FileNotFoundException {
         String fName = formatFileName(f.getName());
         String preFix = String.valueOf(System.currentTimeMillis());
-        String toDir = "/";
-        if (null != toDirs && toDirs.length > 0) {
-            toDir = toDirs[0];
-        }
+        String toDir = getUploadPath(toDirs);
         String nwFName = toDir + preFix + "-" + fName;
         nwFName = StringUtils.trim(nwFName,"/");
 
@@ -47,6 +95,13 @@ public class OSSUtils {
         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");
     }
@@ -63,6 +118,49 @@ public class OSSUtils {
             preURL += "/";
         }
 
-        return preURL + fname.replaceAll("\\ ", "%20");
+        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/yunzhi/nanyang/common/WxUtils.java

@@ -4,31 +4,81 @@ import cn.binarywang.wx.miniapp.api.WxMaService;
 import cn.binarywang.wx.miniapp.api.impl.WxMaServiceImpl;
 import cn.binarywang.wx.miniapp.config.impl.WxMaDefaultConfigImpl;
 import com.yunzhi.nanyang.config.WeixinConfig;
+import com.yunzhi.nanyang.entity.SysMiniapp;
+import com.yunzhi.nanyang.service.ISysMiniappService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
 @Component
 public class WxUtils {
-    private static WxMaService service;
+    // 农机手小程序
+    private static WxMaService workerService;
+    // 农户小程序
+    private static WxMaService farmerService;
+
+    // 此处不能使用变量注入方式, 否则会是 null
+    ISysMiniappService iSysMiniappService;
 
     @Autowired
-    public WxUtils(WeixinConfig config) {
-        setService(config);
+    public WxUtils(ISysMiniappService iSysMiniappService) {
+        this.iSysMiniappService = iSysMiniappService;
+
+        try {
+            setWorkerService();
+            setFarmerService();
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+    }
+
+    public WxMaService getWorkerService() throws Exception {
+        if (workerService == null) {
+            setWorkerService();
+        }
+
+        return workerService;
+    }
+
+    public WxMaService getFarmerService() throws Exception {
+        if (farmerService == null) {
+            setFarmerService();
+        }
+
+        return farmerService;
+    }
+
+    public WxMaService getService(String client) throws Exception {
+        return Constants.CLIENT_WORKER.equals(client) ? getWorkerService() : getFarmerService();
     }
 
-    private void setService(WeixinConfig config) {
+    private void setWorkerService() throws Exception {
+        SysMiniapp sysMiniapp = iSysMiniappService.getByClient(Constants.CLIENT_WORKER);
+        if (sysMiniapp == null) {
+            throw new Exception("未找到农机手小程序配置");
+        }
+
+        workerService = initService(sysMiniapp);
+    }
+
+    private void setFarmerService() throws Exception {
+        SysMiniapp sysMiniapp = iSysMiniappService.getByClient(Constants.CLIENT_FARMER);
+        if (sysMiniapp == null) {
+            throw new Exception("未找到农户小程序配置");
+        }
+
+        farmerService = initService(sysMiniapp);
+    }
+
+    private WxMaService initService(SysMiniapp sysMiniapp) {
         WxMaDefaultConfigImpl conf = new WxMaDefaultConfigImpl();
-        conf.setAppid(config.getMiniapp().getAppid());
-        conf.setSecret(config.getMiniapp().getSecret());
-        conf.setToken(config.getMiniapp().getToken());
-        conf.setAesKey(config.getMiniapp().getAesKey());
-        conf.setMsgDataFormat(config.getMiniapp().getMsgDataFormat());
+        conf.setAppid(sysMiniapp.getAppId());
+        conf.setSecret(sysMiniapp.getSecret());
+        conf.setToken(sysMiniapp.getToken());
+        conf.setAesKey(sysMiniapp.getAesKey());
+        conf.setMsgDataFormat("JSON");
 
         WxMaService service = new WxMaServiceImpl();
         service.setWxMaConfig(conf);
-    }
-
-    public WxMaService getService() {
         return service;
     }
 }

src/main/java/com/yunzhi/nanyang/config/AliyunConfig.java

@@ -2,7 +2,6 @@ package com.yunzhi.nanyang.config;
 
 import lombok.Data;
 import org.springframework.boot.context.properties.ConfigurationProperties;
-import org.springframework.boot.context.properties.NestedConfigurationProperty;
 import org.springframework.stereotype.Component;
 
 @Data
@@ -12,14 +11,17 @@ public class AliyunConfig {
     private String accessKeyId;
     private String accessKeySecret;
 
-    @NestedConfigurationProperty
-    private Oss oss = new Oss();
+    private Oss oss;
 
-    @NestedConfigurationProperty
-    private Sms sms = new Sms();
+    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;
@@ -27,8 +29,7 @@ public class AliyunConfig {
 
     @Data
     public static class Sms {
-        @NestedConfigurationProperty
-        private Captcha captcha = new Captcha();
+        private Captcha captcha;
     }
 
     @Data

src/main/java/com/yunzhi/nanyang/controller/CommController.java

@@ -0,0 +1,119 @@
+package com.yunzhi.nanyang.controller;
+
+import com.yunzhi.nanyang.common.BaseController;
+import com.yunzhi.nanyang.common.OSSUtils;
+import com.yunzhi.nanyang.common.ResponseBean;
+import com.yunzhi.nanyang.common.SMSCaptcha;
+import com.yunzhi.nanyang.config.AliyunConfig;
+import com.yunzhi.nanyang.service.ITaOrderService;
+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.time.LocalDateTime;
+import java.time.format.DateTimeFormatter;
+import java.util.Map;
+
+@Api(tags = "通用")
+@RestController
+@RequestMapping("/{plat}")
+public class CommController extends BaseController {
+
+    @Autowired
+    OSSUtils ossUtils;
+
+    @Autowired
+    AliyunConfig aliyunConfig;
+
+    @Autowired
+    SMSCaptcha smsCaptcha;
+
+
+    @Autowired
+    ITaOrderService taOrderService;
+
+
+    /**
+     * 图片
+     * @param multipartFile
+     * @return
+     */
+    @ApiOperation(value = "图片上传", notes = "图片上传")
+    @PostMapping("/image")
+    public ResponseBean uploadImage(@ApiParam("客户端") @PathVariable String client,
+                                    @RequestParam("file") MultipartFile multipartFile) {
+        try {
+            String img = ossUtils.putObject(multipartFile);
+            return ResponseBean.success(img);
+        } catch (IOException e) {
+            return ResponseBean.error("上传图片失败: " + e.getMessage(), ResponseBean.ERROR_UNAVAILABLE);
+        }
+    }
+
+    /**
+     * base64 图片上传
+     * @param data
+     * @return
+     */
+    @ApiOperation(value = "base64 图片上传", notes = "base64 图片上传")
+    @PostMapping("/image/base64")
+    public ResponseBean uploadBase64Image(@ApiParam("客户端") @PathVariable String client,
+                                          @RequestBody Map<String, String> data) {
+        try {
+            String base64Str = data.get("base64");
+            String img = ossUtils.putObject(base64Str);
+            return ResponseBean.success(img);
+        } catch (IOException e) {
+            return ResponseBean.error("上传图片失败: " + e.getMessage(), ResponseBean.ERROR_UNAVAILABLE);
+        }
+    }
+
+    @ApiOperation(value = "发送手机验证码", notes = "发送手机验证码")
+    @PostMapping("/sms-captcha")
+    public ResponseBean sendCaptcha(@ApiParam("客户端") @PathVariable String client,
+                                    @ApiParam("手机号") @RequestParam String phone) throws Exception {
+        smsCaptcha.send(phone, smsCaptcha.randCaptcha(6));
+        return ResponseBean.success("发送成功");
+    }
+
+    @ApiOperation(value = "发送手机验证码", notes = "发送手机验证码")
+    @PostMapping("/{clientId}/sms-captcha")
+    public ResponseBean sendCaptcha2(@ApiParam("客户端") @PathVariable String client,
+                                     @ApiParam("客户端ID") @PathVariable String clientId,
+                                     @ApiParam("手机号") @RequestParam String phone) throws Exception {
+        smsCaptcha.send(phone, smsCaptcha.randCaptcha(6));
+        return ResponseBean.success("发送成功");
+    }
+
+    /**
+     * 获取文件上传凭证
+     * @return
+     */
+    @ApiOperation(value = "获取文件上传凭证", notes = "获取文件上传凭证")
+    @GetMapping("/oss-sts")
+    public ResponseBean getOSSSTS(@ApiParam("客户端") @PathVariable String client) {
+        AliyunConfig.Oss oss = aliyunConfig.getOss();
+
+        try {
+            Map<String, Object> res = ossUtils.getSTSAKToken();
+            res.put("endpoint", oss.getEndpoint());
+            res.put("bucket", oss.getBucketName());
+            res.put("bucketURL", oss.getBucketURL());
+            res.put("region", oss.getRegion());
+            res.put("path", getMonth());
+
+            return ResponseBean.success(res);
+        } catch (Exception e) {
+            return ResponseBean.error("获取上传凭证失败! ", ResponseBean.ERROR_UNAVAILABLE);
+        }
+    }
+
+    private String getMonth() {
+        return DateTimeFormatter.ofPattern("yyyy-MM").format(LocalDateTime.now());
+    }
+
+}

src/main/java/com/yunzhi/nanyang/controller/SysMiniappController.java

@@ -0,0 +1,119 @@
+package com.yunzhi.nanyang.controller;
+
+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.yunzhi.nanyang.common.BaseController;
+import com.yunzhi.nanyang.common.ResponseBean;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiParam;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RequestParam;
+import com.yunzhi.nanyang.service.ISysMiniappService;
+import com.yunzhi.nanyang.entity.SysMiniapp;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * <p>
+    * 小程序表 前端控制器
+    * </p>
+ *
+ * @author yansen
+ * @since 2022-03-21
+ */
+
+@Api(tags = "小程序表")
+@RestController
+@RequestMapping("/")
+public class SysMiniappController extends BaseController {
+
+    private final Logger logger = LoggerFactory.getLogger(SysMiniappController.class);
+
+    @Autowired
+    public ISysMiniappService iSysMiniappService;
+
+//
+//    /**
+//     * 分页查询列表
+//     * @param pageNum
+//     * @param pageSize
+//     * @return
+//     */
+//    @RequestMapping(value="/sysMiniapp",method= RequestMethod.GET)
+//    @ApiOperation(value="列表", notes = "列表", httpMethod = "GET", response = ResponseBean.class)
+//    public ResponseBean sysMiniappList(@ApiParam("页码") @RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
+//									 @ApiParam("单页数据量") @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize) throws Exception{
+//
+//		    IPage<SysMiniapp> pg = new Page<>(pageNum, pageSize);
+//            QueryWrapper<SysMiniapp> queryWrapper = new QueryWrapper<>();
+//            queryWrapper.orderByDesc("create_date");
+//
+//            IPage<SysMiniapp> result = iSysMiniappService.page(pg, queryWrapper);
+//            return ResponseBean.success(result);
+//    }
+//
+//    /**
+//     * 保存对象
+//     * @param sysMiniapp 实体对象
+//     * @return
+//     */
+//    @RequestMapping(value="/sysMiniapp",method= RequestMethod.POST)
+//    @ApiOperation(value="保存", notes = "保存", httpMethod = "POST", response = ResponseBean.class)
+//    public ResponseBean sysMiniappAdd(@ApiParam("保存内容") @RequestBody SysMiniapp sysMiniapp) throws Exception{
+//
+//        if (iSysMiniappService.save(sysMiniapp)){
+//            return ResponseBean.success(sysMiniapp);
+//        }else {
+//            return ResponseBean.error("保存失败, 请重试", ResponseBean.ERROR_UNAVAILABLE);
+//        }
+//    }
+//
+//    /**
+//     * 根据id删除对象
+//     * @param id  实体ID
+//     */
+//    @RequestMapping(value="/sysMiniapp/{id}", method= RequestMethod.DELETE)
+//    @ApiOperation(value="删除", notes = "删除", httpMethod = "DELETE", response = ResponseBean.class)
+//    public ResponseBean sysMiniappDelete(@ApiParam("对象ID") @PathVariable Integer id) throws Exception{
+//        if(iSysMiniappService.removeById(id)){
+//            return ResponseBean.success("success");
+//        }else {
+//            return ResponseBean.error("删除失败, 请重试", ResponseBean.ERROR_UNAVAILABLE);
+//        }
+//    }
+//
+//    /**
+//     * 修改对象
+//     * @param id  实体ID
+//     * @param sysMiniapp 实体对象
+//     * @return
+//     */
+//    @RequestMapping(value="/sysMiniapp/{id}",method= RequestMethod.PUT)
+//    @ApiOperation(value="更新", notes = "更新", httpMethod = "PUT", response = ResponseBean.class)
+//    public ResponseBean sysMiniappUpdate(@ApiParam("对象ID") @PathVariable Integer id,
+//                                        @ApiParam("更新内容") @RequestBody SysMiniapp sysMiniapp) throws Exception{
+//
+//        if (iSysMiniappService.updateById(sysMiniapp)){
+//            return ResponseBean.success(iSysMiniappService.getById(id));
+//        }else {
+//            return ResponseBean.error("修改失败, 请重试", ResponseBean.ERROR_UNAVAILABLE);
+//        }
+//    }
+//
+//    /**
+//     * 根据id查询对象
+//     * @param id  实体ID
+//     */
+//    @RequestMapping(value="/sysMiniapp/{id}",method= RequestMethod.GET)
+//    @ApiOperation(value="详情", notes = "详情", httpMethod = "GET", response = ResponseBean.class)
+//    public ResponseBean sysMiniappGet(@ApiParam("对象ID") @PathVariable Integer id) throws Exception{
+//        return ResponseBean.success(iSysMiniappService.getById(id));
+//    }
+}

src/main/java/com/yunzhi/nanyang/controller/SysSettingController.java

@@ -4,6 +4,7 @@ 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.yunzhi.nanyang.common.BaseController;
+import com.yunzhi.nanyang.common.Constants;
 import com.yunzhi.nanyang.common.ResponseBean;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -54,7 +55,9 @@ public class SysSettingController extends BaseController {
 
         IPage<SysSetting> pg = new Page<>(pageNum, pageSize);
         QueryWrapper<SysSetting> queryWrapper = new QueryWrapper<>();
-        queryWrapper.orderByDesc("create_date");
+        queryWrapper.lt("is_hidden", Constants.STATUS_NORMAL);
+        queryWrapper.gt("status", Constants.STATUS_DELETE);
+        queryWrapper.orderByAsc("sort_no");
 
         IPage<SysSetting> result = iSysSettingService.page(pg, queryWrapper);
         return ResponseBean.success(result);

src/main/java/com/yunzhi/nanyang/controller/SysUserController.java

@@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.yunzhi.nanyang.common.*;
 import com.yunzhi.nanyang.entity.SysLogin;
 import com.yunzhi.nanyang.service.ISysLoginService;
+import com.yunzhi.nanyang.service.ISysUserDataScopeService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
@@ -45,6 +46,9 @@ public class SysUserController extends BaseController {
     @Autowired
     public ISysLoginService iSysLoginService;
 
+    @Autowired
+    public ISysUserDataScopeService iSysUserDataScopeService;
+
     @Value("${yz.default.password}")
     public String defaultPassword;
 
@@ -60,7 +64,7 @@ public class SysUserController extends BaseController {
     public ResponseBean sysUserList(@ApiParam("页码") @RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
                                     @ApiParam("单页数据量") @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize,
                                     @ApiParam("机构") @RequestParam(value ="org_id", required = false) String orgId,
-                                    @ApiParam("名称") @RequestParam(value ="name", required = false) String name,
+                                    @ApiParam("名称") @RequestParam(value ="userName", required = false) String userName,
                                     @ApiParam("手机号") @RequestParam(value ="phone", required = false) String phone) throws Exception{
 
         SysUser sysUser = currentUser();
@@ -73,7 +77,7 @@ public class SysUserController extends BaseController {
 
         IPage<SysUser> pg = new Page<>(pageNum, pageSize);
 
-        IPage<SysUser> result = iSysUserService.getPageBy(pg, userId, orgId, name, phone);
+        IPage<SysUser> result = iSysUserService.getPageBy(pg, userId, orgId, userName, phone);
         return ResponseBean.success(result);
     }
 
@@ -98,6 +102,10 @@ public class SysUserController extends BaseController {
             return ResponseBean.error("所属机构不能为空");
         }
 
+        if (!checkOrgAccess(sysUser.getOrgId(), userId)) {
+            return ResponseBean.error("无权限进行此操作");
+        }
+
         int cntPhone = iSysUserService.countBy("phone", sysUser.getPhone(), true);
         if (cntPhone > 0) {
             return ResponseBean.error("手机号码重复");
@@ -111,14 +119,10 @@ public class SysUserController extends BaseController {
         }
 
         if (iSysUserService.save(sysUser)){
+            iSysUserDataScopeService.addNew(sysUser.getOrgId(), sysUser.getUserId());
+
             if (!StringUtils.isEmpty(sysUser.getLoginName())) {
-                SysLogin sysLogin = new SysLogin();
-                sysLogin.setLoginId(StringUtils.uuid());
-                sysLogin.setUserId(sysUser.getUserId());
-                sysLogin.setLoginName(sysUser.getLoginName());
-                sysLogin.setPassword(EncryptUtils.md5(EncryptUtils.md5(defaultPassword), sysLogin.getLoginId()));
-                sysLogin.setStatus(Constants.STATUS_NORMAL);
-                iSysLoginService.save(sysLogin);
+                addNewSysLogin(sysUser);
             }
 
             return ResponseBean.success(sysUser);
@@ -177,6 +181,9 @@ public class SysUserController extends BaseController {
         if (StringUtils.isEmpty(sysUser.getOrgId())) {
             return ResponseBean.error("所属机构不能为空");
         }
+        if (!checkOrgAccess(sysUser.getOrgId(), userId)) {
+            return ResponseBean.error("无权限进行此操作");
+        }
 
         SysUser origin = iSysUserService.getByButNot("phone", sysUser.getPhone(), "user_id", id,true);
         if (origin != null) {
@@ -196,9 +203,12 @@ public class SysUserController extends BaseController {
         }
 
         if (iSysUserService.updateById(sysUser)){
+            iSysUserDataScopeService.addNew(sysUser.getOrgId(), sysUser.getUserId());
             if (!StringUtils.isEmpty(sysUser.getLoginName())) {
                 SysLogin sysLogin = iSysLoginService.getExistBy("user_id", id, false, true);
-                if (!sysLogin.getLoginName().equals(sysUser.getLoginName())) {
+                if (sysLogin == null) {
+                    addNewSysLogin(sysUser);
+                } else if (!sysLogin.getLoginName().equals(sysUser.getLoginName())) {
                     sysLogin.setLoginName(sysUser.getLoginName());
                     iSysLoginService.updateById(sysLogin);
                 }
@@ -210,6 +220,16 @@ public class SysUserController extends BaseController {
         }
     }
 
+    private SysLogin addNewSysLogin(SysUser sysUser) {
+        SysLogin sysLogin = new SysLogin();
+        sysLogin.setUserId(sysUser.getUserId());
+        sysLogin.setLoginName(sysUser.getLoginName());
+        sysLogin.setPassword(EncryptUtils.md5(EncryptUtils.md5(defaultPassword), sysLogin.getUserId()));
+        sysLogin.setStatus(Constants.STATUS_NORMAL);
+        iSysLoginService.save(sysLogin);
+        return sysLogin;
+    }
+
     /**
      * 根据id查询对象
      * @param id  实体ID

src/main/java/com/yunzhi/nanyang/controller/TaBannerController.java

@@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.yunzhi.nanyang.common.BaseController;
 import com.yunzhi.nanyang.common.Constants;
 import com.yunzhi.nanyang.common.ResponseBean;
+import com.yunzhi.nanyang.common.StringUtils;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
@@ -50,13 +51,16 @@ public class TaBannerController extends BaseController {
      */
     @RequestMapping(value="/admin/banner",method= RequestMethod.GET)
     @ApiOperation(value="列表", notes = "列表", httpMethod = "GET", response = ResponseBean.class)
-    @RequiresPermissions("banner")
     public ResponseBean taBannerList(@ApiParam("页码") @RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
-									 @ApiParam("单页数据量") @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize) throws Exception{
+									 @ApiParam("单页数据量") @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize,
+                                     @ApiParam("名称") @RequestParam(value ="title", required = false) String title,
+                                     @ApiParam("类型") @RequestParam(value ="position", required = false) String position) throws Exception{
 
         IPage<TaBanner> pg = new Page<>(pageNum, pageSize);
         QueryWrapper<TaBanner> queryWrapper = new QueryWrapper<>();
-        queryWrapper.gt("status", Constants.STATUS_NORMAL);
+        queryWrapper.like(!StringUtils.isEmpty(title), "title", "%" + title + "%");
+        queryWrapper.eq(!StringUtils.isEmpty(position), "position", position);
+        queryWrapper.gt("status", Constants.STATUS_DELETE);
         queryWrapper.orderByDesc("create_date");
 
         IPage<TaBanner> result = iTaBannerService.page(pg, queryWrapper);
@@ -68,10 +72,21 @@ public class TaBannerController extends BaseController {
      * @param taBanner 实体对象
      * @return
      */
-    @RequestMapping(value="/taBanner",method= RequestMethod.POST)
+    @RequestMapping(value="/admin/banner",method= RequestMethod.POST)
     @ApiOperation(value="保存", notes = "保存", httpMethod = "POST", response = ResponseBean.class)
-    @RequiresPermissions("banner")
+    @RequiresPermissions("banner:add")
     public ResponseBean taBannerAdd(@ApiParam("保存内容") @RequestBody TaBanner taBanner) throws Exception{
+        if (StringUtils.isEmpty(taBanner.getTitle())) {
+            return ResponseBean.error("标题不能为空");
+        }
+        if (StringUtils.isEmpty(taBanner.getThumb())) {
+            return ResponseBean.error("图片不能为空");
+        }
+        if (StringUtils.isEmpty(taBanner.getPosition())) {
+            return ResponseBean.error("位置不能为空");
+        }
+
+        taBanner.setBannerId(null);
 
         if (iTaBannerService.save(taBanner)){
             return ResponseBean.success(taBanner);
@@ -84,11 +99,11 @@ public class TaBannerController extends BaseController {
      * 根据id删除对象
      * @param id  实体ID
      */
-    @RequestMapping(value="/taBanner/{id}", method= RequestMethod.DELETE)
+    @RequestMapping(value="/admin/banner/{id}", method= RequestMethod.DELETE)
     @ApiOperation(value="删除", notes = "删除", httpMethod = "DELETE", response = ResponseBean.class)
-    @RequiresPermissions("banner")
-    public ResponseBean taBannerDelete(@ApiParam("对象ID") @PathVariable Integer id) throws Exception{
-        if(iTaBannerService.removeById(id)){
+    @RequiresPermissions("banner:delete")
+    public ResponseBean taBannerDelete(@ApiParam("对象ID") @PathVariable String id) throws Exception{
+        if(iTaBannerService.removeLogicById(id)){
             return ResponseBean.success("success");
         }else {
             return ResponseBean.error("删除失败, 请重试", ResponseBean.ERROR_UNAVAILABLE);
@@ -101,14 +116,25 @@ public class TaBannerController extends BaseController {
      * @param taBanner 实体对象
      * @return
      */
-    @RequestMapping(value="/taBanner/{id}",method= RequestMethod.PUT)
+    @RequestMapping(value="/admin/banner/{id}",method= RequestMethod.PUT)
     @ApiOperation(value="更新", notes = "更新", httpMethod = "PUT", response = ResponseBean.class)
-    @RequiresPermissions("banner")
-    public ResponseBean taBannerUpdate(@ApiParam("对象ID") @PathVariable Integer id,
+    @RequiresPermissions("banner:update")
+    public ResponseBean taBannerUpdate(@ApiParam("对象ID") @PathVariable String id,
                                         @ApiParam("更新内容") @RequestBody TaBanner taBanner) throws Exception{
+        taBanner.setBannerId(id);
+
+        if (StringUtils.isEmpty(taBanner.getTitle())) {
+            return ResponseBean.error("标题不能为空");
+        }
+        if (StringUtils.isEmpty(taBanner.getThumb())) {
+            return ResponseBean.error("图片不能为空");
+        }
+        if (StringUtils.isEmpty(taBanner.getPosition())) {
+            return ResponseBean.error("位置不能为空");
+        }
 
         if (iTaBannerService.updateById(taBanner)){
-            return ResponseBean.success(iTaBannerService.getById(id));
+            return ResponseBean.success(taBanner);
         }else {
             return ResponseBean.error("修改失败, 请重试", ResponseBean.ERROR_UNAVAILABLE);
         }

src/main/java/com/yunzhi/nanyang/controller/TaExtendContentController.java

@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.yunzhi.nanyang.common.BaseController;
 import com.yunzhi.nanyang.common.ResponseBean;
+import com.yunzhi.nanyang.common.StringUtils;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
@@ -46,17 +47,21 @@ public class TaExtendContentController extends BaseController {
      * @param pageSize
      * @return
      */
-    @RequestMapping(value="/taExtendContent",method= RequestMethod.GET)
+    @RequestMapping(value="/admin/extend-content",method= RequestMethod.GET)
     @ApiOperation(value="列表", notes = "列表", httpMethod = "GET", response = ResponseBean.class)
     public ResponseBean taExtendContentList(@ApiParam("页码") @RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
-									 @ApiParam("单页数据量") @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize) throws Exception{
+                                            @ApiParam("单页数据量") @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize,
+                                            @ApiParam("资源分类") @RequestParam(value ="targetType") String targetType,
+                                            @ApiParam("资源ID") @RequestParam(value ="targetId") String targetId) throws Exception{
 
-		    IPage<TaExtendContent> pg = new Page<>(pageNum, pageSize);
-            QueryWrapper<TaExtendContent> queryWrapper = new QueryWrapper<>();
-            queryWrapper.orderByDesc("create_date");
+        IPage<TaExtendContent> pg = new Page<>(pageNum, pageSize);
+        QueryWrapper<TaExtendContent> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("target_type", targetType);
+        queryWrapper.eq("target_id", targetId);
+        queryWrapper.orderByAsc("sort");
 
-            IPage<TaExtendContent> result = iTaExtendContentService.page(pg, queryWrapper);
-            return ResponseBean.success(result);
+        IPage<TaExtendContent> result = iTaExtendContentService.page(pg, queryWrapper);
+        return ResponseBean.success(result);
     }
 
     /**
@@ -64,10 +69,20 @@ public class TaExtendContentController extends BaseController {
      * @param taExtendContent 实体对象
      * @return
      */
-    @RequestMapping(value="/taExtendContent",method= RequestMethod.POST)
+    @RequestMapping(value="/admin/extend-content",method= RequestMethod.POST)
     @ApiOperation(value="保存", notes = "保存", httpMethod = "POST", response = ResponseBean.class)
     public ResponseBean taExtendContentAdd(@ApiParam("保存内容") @RequestBody TaExtendContent taExtendContent) throws Exception{
 
+        if (StringUtils.isEmpty(taExtendContent.getTargetId()) || StringUtils.isEmpty(taExtendContent.getTargetType())) {
+            return ResponseBean.error("资源不能为空");
+        }
+
+        if (StringUtils.isEmpty(taExtendContent.getContent())) {
+            return ResponseBean.error("内容不能为空");
+        }
+
+        taExtendContent.setExtId(null);
+
         if (iTaExtendContentService.save(taExtendContent)){
             return ResponseBean.success(taExtendContent);
         }else {
@@ -79,9 +94,9 @@ public class TaExtendContentController extends BaseController {
      * 根据id删除对象
      * @param id  实体ID
      */
-    @RequestMapping(value="/taExtendContent/{id}", method= RequestMethod.DELETE)
+    @RequestMapping(value="/admin/extend-content/{id}", method= RequestMethod.DELETE)
     @ApiOperation(value="删除", notes = "删除", httpMethod = "DELETE", response = ResponseBean.class)
-    public ResponseBean taExtendContentDelete(@ApiParam("对象ID") @PathVariable Integer id) throws Exception{
+    public ResponseBean taExtendContentDelete(@ApiParam("对象ID") @PathVariable String id) throws Exception{
         if(iTaExtendContentService.removeById(id)){
             return ResponseBean.success("success");
         }else {
@@ -95,13 +110,23 @@ public class TaExtendContentController extends BaseController {
      * @param taExtendContent 实体对象
      * @return
      */
-    @RequestMapping(value="/taExtendContent/{id}",method= RequestMethod.PUT)
+    @RequestMapping(value="/admin/extend-content/{id}",method= RequestMethod.PUT)
     @ApiOperation(value="更新", notes = "更新", httpMethod = "PUT", response = ResponseBean.class)
-    public ResponseBean taExtendContentUpdate(@ApiParam("对象ID") @PathVariable Integer id,
+    public ResponseBean taExtendContentUpdate(@ApiParam("对象ID") @PathVariable String id,
                                         @ApiParam("更新内容") @RequestBody TaExtendContent taExtendContent) throws Exception{
 
+        if (StringUtils.isEmpty(taExtendContent.getTargetId()) || StringUtils.isEmpty(taExtendContent.getTargetType())) {
+            return ResponseBean.error("资源不能为空");
+        }
+
+        if (StringUtils.isEmpty(taExtendContent.getContent())) {
+            return ResponseBean.error("内容不能为空");
+        }
+
+        taExtendContent.setExtId(id);
+
         if (iTaExtendContentService.updateById(taExtendContent)){
-            return ResponseBean.success(iTaExtendContentService.getById(id));
+            return ResponseBean.success(taExtendContent);
         }else {
             return ResponseBean.error("修改失败, 请重试", ResponseBean.ERROR_UNAVAILABLE);
         }
@@ -111,9 +136,9 @@ public class TaExtendContentController extends BaseController {
      * 根据id查询对象
      * @param id  实体ID
      */
-    @RequestMapping(value="/taExtendContent/{id}",method= RequestMethod.GET)
+    @RequestMapping(value="/admin/extend-content/{id}",method= RequestMethod.GET)
     @ApiOperation(value="详情", notes = "详情", httpMethod = "GET", response = ResponseBean.class)
-    public ResponseBean taExtendContentGet(@ApiParam("对象ID") @PathVariable Integer id) throws Exception{
+    public ResponseBean taExtendContentGet(@ApiParam("对象ID") @PathVariable String id) throws Exception{
         return ResponseBean.success(iTaExtendContentService.getById(id));
     }
 }

src/main/java/com/yunzhi/nanyang/controller/TaImagesController.java

@@ -40,80 +40,80 @@ public class TaImagesController extends BaseController {
     public ITaImagesService iTaImagesService;
 
 
-    /**
-     * 分页查询列表
-     * @param pageNum
-     * @param pageSize
-     * @return
-     */
-    @RequestMapping(value="/taImages",method= RequestMethod.GET)
-    @ApiOperation(value="列表", notes = "列表", httpMethod = "GET", response = ResponseBean.class)
-    public ResponseBean taImagesList(@ApiParam("页码") @RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
-									 @ApiParam("单页数据量") @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize) throws Exception{
+//    /**
+//     * 分页查询列表
+//     * @param pageNum
+//     * @param pageSize
+//     * @return
+//     */
+//    @RequestMapping(value="/taImages",method= RequestMethod.GET)
+//    @ApiOperation(value="列表", notes = "列表", httpMethod = "GET", response = ResponseBean.class)
+//    public ResponseBean taImagesList(@ApiParam("页码") @RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
+//									 @ApiParam("单页数据量") @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize) throws Exception{
+//
+//        IPage<TaImages> pg = new Page<>(pageNum, pageSize);
+//        QueryWrapper<TaImages> queryWrapper = new QueryWrapper<>();
+//        queryWrapper.orderByDesc("create_date");
+//
+//        IPage<TaImages> result = iTaImagesService.page(pg, queryWrapper);
+//        return ResponseBean.success(result);
+//    }
 
-		    IPage<TaImages> pg = new Page<>(pageNum, pageSize);
-            QueryWrapper<TaImages> queryWrapper = new QueryWrapper<>();
-            queryWrapper.orderByDesc("create_date");
-
-            IPage<TaImages> result = iTaImagesService.page(pg, queryWrapper);
-            return ResponseBean.success(result);
-    }
-
-    /**
-     * 保存对象
-     * @param taImages 实体对象
-     * @return
-     */
-    @RequestMapping(value="/taImages",method= RequestMethod.POST)
-    @ApiOperation(value="保存", notes = "保存", httpMethod = "POST", response = ResponseBean.class)
-    public ResponseBean taImagesAdd(@ApiParam("保存内容") @RequestBody TaImages taImages) throws Exception{
-
-        if (iTaImagesService.save(taImages)){
-            return ResponseBean.success(taImages);
-        }else {
-            return ResponseBean.error("保存失败, 请重试", ResponseBean.ERROR_UNAVAILABLE);
-        }
-    }
-
-    /**
-     * 根据id删除对象
-     * @param id  实体ID
-     */
-    @RequestMapping(value="/taImages/{id}", method= RequestMethod.DELETE)
-    @ApiOperation(value="删除", notes = "删除", httpMethod = "DELETE", response = ResponseBean.class)
-    public ResponseBean taImagesDelete(@ApiParam("对象ID") @PathVariable Integer id) throws Exception{
-        if(iTaImagesService.removeById(id)){
-            return ResponseBean.success("success");
-        }else {
-            return ResponseBean.error("删除失败, 请重试", ResponseBean.ERROR_UNAVAILABLE);
-        }
-    }
-
-    /**
-     * 修改对象
-     * @param id  实体ID
-     * @param taImages 实体对象
-     * @return
-     */
-    @RequestMapping(value="/taImages/{id}",method= RequestMethod.PUT)
-    @ApiOperation(value="更新", notes = "更新", httpMethod = "PUT", response = ResponseBean.class)
-    public ResponseBean taImagesUpdate(@ApiParam("对象ID") @PathVariable Integer id,
-                                        @ApiParam("更新内容") @RequestBody TaImages taImages) throws Exception{
-
-        if (iTaImagesService.updateById(taImages)){
-            return ResponseBean.success(iTaImagesService.getById(id));
-        }else {
-            return ResponseBean.error("修改失败, 请重试", ResponseBean.ERROR_UNAVAILABLE);
-        }
-    }
-
-    /**
-     * 根据id查询对象
-     * @param id  实体ID
-     */
-    @RequestMapping(value="/taImages/{id}",method= RequestMethod.GET)
-    @ApiOperation(value="详情", notes = "详情", httpMethod = "GET", response = ResponseBean.class)
-    public ResponseBean taImagesGet(@ApiParam("对象ID") @PathVariable Integer id) throws Exception{
-        return ResponseBean.success(iTaImagesService.getById(id));
-    }
+//    /**
+//     * 保存对象
+//     * @param taImages 实体对象
+//     * @return
+//     */
+//    @RequestMapping(value="/admin/images",method= RequestMethod.POST)
+//    @ApiOperation(value="保存", notes = "保存", httpMethod = "POST", response = ResponseBean.class)
+//    public ResponseBean taImagesAdd(@ApiParam("保存内容") @RequestBody TaImages taImages) throws Exception{
+//
+//        if (iTaImagesService.save(taImages)){
+//            return ResponseBean.success(taImages);
+//        }else {
+//            return ResponseBean.error("保存失败, 请重试", ResponseBean.ERROR_UNAVAILABLE);
+//        }
+//    }
+//
+//    /**
+//     * 根据id删除对象
+//     * @param id  实体ID
+//     */
+//    @RequestMapping(value="/taImages/{id}", method= RequestMethod.DELETE)
+//    @ApiOperation(value="删除", notes = "删除", httpMethod = "DELETE", response = ResponseBean.class)
+//    public ResponseBean taImagesDelete(@ApiParam("对象ID") @PathVariable Integer id) throws Exception{
+//        if(iTaImagesService.removeById(id)){
+//            return ResponseBean.success("success");
+//        }else {
+//            return ResponseBean.error("删除失败, 请重试", ResponseBean.ERROR_UNAVAILABLE);
+//        }
+//    }
+//
+//    /**
+//     * 修改对象
+//     * @param id  实体ID
+//     * @param taImages 实体对象
+//     * @return
+//     */
+//    @RequestMapping(value="/taImages/{id}",method= RequestMethod.PUT)
+//    @ApiOperation(value="更新", notes = "更新", httpMethod = "PUT", response = ResponseBean.class)
+//    public ResponseBean taImagesUpdate(@ApiParam("对象ID") @PathVariable Integer id,
+//                                        @ApiParam("更新内容") @RequestBody TaImages taImages) throws Exception{
+//
+//        if (iTaImagesService.updateById(taImages)){
+//            return ResponseBean.success(iTaImagesService.getById(id));
+//        }else {
+//            return ResponseBean.error("修改失败, 请重试", ResponseBean.ERROR_UNAVAILABLE);
+//        }
+//    }
+//
+//    /**
+//     * 根据id查询对象
+//     * @param id  实体ID
+//     */
+//    @RequestMapping(value="/taImages/{id}",method= RequestMethod.GET)
+//    @ApiOperation(value="详情", notes = "详情", httpMethod = "GET", response = ResponseBean.class)
+//    public ResponseBean taImagesGet(@ApiParam("对象ID") @PathVariable Integer id) throws Exception{
+//        return ResponseBean.success(iTaImagesService.getById(id));
+//    }
 }

src/main/java/com/yunzhi/nanyang/controller/TaMachineryController.java

@@ -4,10 +4,14 @@ 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.yunzhi.nanyang.common.BaseController;
+import com.yunzhi.nanyang.common.Constants;
 import com.yunzhi.nanyang.common.ResponseBean;
+import com.yunzhi.nanyang.common.StringUtils;
+import com.yunzhi.nanyang.entity.SysUser;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
+import org.apache.shiro.authz.annotation.RequiresPermissions;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -46,17 +50,25 @@ public class TaMachineryController extends BaseController {
      * @param pageSize
      * @return
      */
-    @RequestMapping(value="/taMachinery",method= RequestMethod.GET)
+    @RequestMapping(value="/admin/machinery",method= RequestMethod.GET)
     @ApiOperation(value="列表", notes = "列表", httpMethod = "GET", response = ResponseBean.class)
     public ResponseBean taMachineryList(@ApiParam("页码") @RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
-									 @ApiParam("单页数据量") @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize) throws Exception{
+                                        @ApiParam("单页数据量") @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize,
+                                        @ApiParam("名称") @RequestParam(value ="name", required = false) String name,
+                                        @ApiParam("类型") @RequestParam(value ="typeId", required = false) String typeId) throws Exception{
+        SysUser sysUser = currentUser();
+        boolean isAdmin = Constants.ADMIN_ID.equals(sysUser.getUserId());
 
-		    IPage<TaMachinery> pg = new Page<>(pageNum, pageSize);
-            QueryWrapper<TaMachinery> queryWrapper = new QueryWrapper<>();
-            queryWrapper.orderByDesc("create_date");
+        IPage<TaMachinery> pg = new Page<>(pageNum, pageSize);
+        QueryWrapper<TaMachinery> queryWrapper = new QueryWrapper<>();
+        queryWrapper.like(!StringUtils.isEmpty(name), "name", "%" + name + "%");
+        queryWrapper.eq(!StringUtils.isEmpty(typeId), "type_id", typeId);
+        queryWrapper.in(!isAdmin, "org_id", getAccessOrgs(sysUser.getUserId()));
+        queryWrapper.gt("status", Constants.STATUS_DELETE);
+        queryWrapper.orderByDesc("create_date");
 
-            IPage<TaMachinery> result = iTaMachineryService.page(pg, queryWrapper);
-            return ResponseBean.success(result);
+        IPage<TaMachinery> result = iTaMachineryService.page(pg, queryWrapper);
+        return ResponseBean.success(result);
     }
 
     /**
@@ -64,11 +76,24 @@ public class TaMachineryController extends BaseController {
      * @param taMachinery 实体对象
      * @return
      */
-    @RequestMapping(value="/taMachinery",method= RequestMethod.POST)
+    @RequestMapping(value="/admin/machinery",method= RequestMethod.POST)
     @ApiOperation(value="保存", notes = "保存", httpMethod = "POST", response = ResponseBean.class)
+    @RequiresPermissions("machinery:add")
     public ResponseBean taMachineryAdd(@ApiParam("保存内容") @RequestBody TaMachinery taMachinery) throws Exception{
+        SysUser sysUser = currentUser();
 
-        if (iTaMachineryService.save(taMachinery)){
+        if (StringUtils.isEmpty(taMachinery.getOrgId())) {
+            return ResponseBean.error("请设置农机归属");
+        }
+
+        if (!checkOrgAccess(taMachinery.getOrgId(), sysUser.getUserId())) {
+            return ResponseBean.error("无权进行此操作");
+        }
+
+        taMachinery.setMachineryId(null);
+        taMachinery.setCreateUser(sysUser.getUserId());
+
+        if (iTaMachineryService.saveAll(taMachinery)){
             return ResponseBean.success(taMachinery);
         }else {
             return ResponseBean.error("保存失败, 请重试", ResponseBean.ERROR_UNAVAILABLE);
@@ -79,10 +104,22 @@ public class TaMachineryController extends BaseController {
      * 根据id删除对象
      * @param id  实体ID
      */
-    @RequestMapping(value="/taMachinery/{id}", method= RequestMethod.DELETE)
+    @RequestMapping(value="/admin/machinery/{id}", method= RequestMethod.DELETE)
     @ApiOperation(value="删除", notes = "删除", httpMethod = "DELETE", response = ResponseBean.class)
-    public ResponseBean taMachineryDelete(@ApiParam("对象ID") @PathVariable Integer id) throws Exception{
-        if(iTaMachineryService.removeById(id)){
+    @RequiresPermissions("machinery:delete")
+    public ResponseBean taMachineryDelete(@ApiParam("对象ID") @PathVariable String id) throws Exception{
+        SysUser sysUser = currentUser();
+
+        TaMachinery taMachinery = iTaMachineryService.getExistBy("machinery_id", id, false, true);
+        if (null == taMachinery) {
+            return ResponseBean.success("success");
+        }
+
+        if (!checkOrgAccess(taMachinery.getOrgId(), sysUser.getUserId())) {
+            return ResponseBean.error("无权进行此操作");
+        }
+
+        if(iTaMachineryService.removeLogicById(id)){
             return ResponseBean.success("success");
         }else {
             return ResponseBean.error("删除失败, 请重试", ResponseBean.ERROR_UNAVAILABLE);
@@ -95,13 +132,25 @@ public class TaMachineryController extends BaseController {
      * @param taMachinery 实体对象
      * @return
      */
-    @RequestMapping(value="/taMachinery/{id}",method= RequestMethod.PUT)
+    @RequestMapping(value="/admin/machinery/{id}",method= RequestMethod.PUT)
     @ApiOperation(value="更新", notes = "更新", httpMethod = "PUT", response = ResponseBean.class)
-    public ResponseBean taMachineryUpdate(@ApiParam("对象ID") @PathVariable Integer id,
+    @RequiresPermissions("machinery:update")
+    public ResponseBean taMachineryUpdate(@ApiParam("对象ID") @PathVariable String id,
                                         @ApiParam("更新内容") @RequestBody TaMachinery taMachinery) throws Exception{
+        SysUser sysUser = currentUser();
+
+        if (StringUtils.isEmpty(taMachinery.getOrgId())) {
+            return ResponseBean.error("请设置农机归属");
+        }
 
-        if (iTaMachineryService.updateById(taMachinery)){
-            return ResponseBean.success(iTaMachineryService.getById(id));
+        if (!checkOrgAccess(taMachinery.getOrgId(), sysUser.getUserId())) {
+            return ResponseBean.error("无权进行此操作");
+        }
+
+        taMachinery.setMachineryId(id);
+
+        if (iTaMachineryService.updateAll(taMachinery)){
+            return ResponseBean.success(taMachinery);
         }else {
             return ResponseBean.error("修改失败, 请重试", ResponseBean.ERROR_UNAVAILABLE);
         }
@@ -111,9 +160,9 @@ public class TaMachineryController extends BaseController {
      * 根据id查询对象
      * @param id  实体ID
      */
-    @RequestMapping(value="/taMachinery/{id}",method= RequestMethod.GET)
+    @RequestMapping(value="/admin/machinery/{id}",method= RequestMethod.GET)
     @ApiOperation(value="详情", notes = "详情", httpMethod = "GET", response = ResponseBean.class)
-    public ResponseBean taMachineryGet(@ApiParam("对象ID") @PathVariable Integer id) throws Exception{
-        return ResponseBean.success(iTaMachineryService.getById(id));
+    public ResponseBean taMachineryGet(@ApiParam("对象ID") @PathVariable String id) throws Exception{
+        return ResponseBean.success(iTaMachineryService.getDetail(id));
     }
 }

src/main/java/com/yunzhi/nanyang/controller/TaNewsController.java

@@ -4,10 +4,17 @@ 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.yunzhi.nanyang.common.BaseController;
+import com.yunzhi.nanyang.common.Constants;
 import com.yunzhi.nanyang.common.ResponseBean;
+import com.yunzhi.nanyang.common.StringUtils;
+import com.yunzhi.nanyang.entity.SysUser;
+import com.yunzhi.nanyang.entity.TaExtendContent;
+import com.yunzhi.nanyang.service.ITaExtendContentService;
+import com.yunzhi.nanyang.service.ITaNewsTypeService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
+import org.apache.shiro.authz.annotation.RequiresPermissions;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -20,6 +27,8 @@ import com.yunzhi.nanyang.service.ITaNewsService;
 import com.yunzhi.nanyang.entity.TaNews;
 import org.springframework.web.bind.annotation.RestController;
 
+import java.util.List;
+
 /**
  * <p>
     * 资讯表 前端控制器
@@ -39,6 +48,12 @@ public class TaNewsController extends BaseController {
     @Autowired
     public ITaNewsService iTaNewsService;
 
+    @Autowired
+    public ITaNewsTypeService iTaNewsTypeService;
+
+    @Autowired
+    public ITaExtendContentService iTaExtendContentService;
+
 
     /**
      * 分页查询列表
@@ -46,17 +61,25 @@ public class TaNewsController extends BaseController {
      * @param pageSize
      * @return
      */
-    @RequestMapping(value="/taNews",method= RequestMethod.GET)
+    @RequestMapping(value="/admin/news",method= RequestMethod.GET)
     @ApiOperation(value="列表", notes = "列表", httpMethod = "GET", response = ResponseBean.class)
     public ResponseBean taNewsList(@ApiParam("页码") @RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
-									 @ApiParam("单页数据量") @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize) throws Exception{
+									 @ApiParam("单页数据量") @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize,
+                                   @ApiParam("名称") @RequestParam(value ="title", required = false) String title,
+                                   @ApiParam("类型") @RequestParam(value ="typeId", required = false) String typeId) throws Exception{
+//        SysUser sysUser = currentUser();
+//        boolean isAdmin = Constants.ADMIN_ID.equals(sysUser.getUserId());
 
-		    IPage<TaNews> pg = new Page<>(pageNum, pageSize);
-            QueryWrapper<TaNews> queryWrapper = new QueryWrapper<>();
-            queryWrapper.orderByDesc("create_date");
+        IPage<TaNews> pg = new Page<>(pageNum, pageSize);
+        QueryWrapper<TaNews> queryWrapper = new QueryWrapper<>();
+        queryWrapper.like(!StringUtils.isEmpty(title), "title", "%" + title + "%");
+        queryWrapper.eq(!StringUtils.isEmpty(typeId), "type_id", typeId);
+//        queryWrapper.in(!isAdmin, "org_id", getAccessOrgs(sysUser.getUserId()));
+        queryWrapper.gt("status", Constants.STATUS_DELETE);
+        queryWrapper.orderByDesc("create_date");
 
-            IPage<TaNews> result = iTaNewsService.page(pg, queryWrapper);
-            return ResponseBean.success(result);
+        IPage<TaNews> result = iTaNewsService.page(pg, queryWrapper);
+        return ResponseBean.success(result);
     }
 
     /**
@@ -64,11 +87,20 @@ public class TaNewsController extends BaseController {
      * @param taNews 实体对象
      * @return
      */
-    @RequestMapping(value="/taNews",method= RequestMethod.POST)
+    @RequestMapping(value="/admin/news",method= RequestMethod.POST)
     @ApiOperation(value="保存", notes = "保存", httpMethod = "POST", response = ResponseBean.class)
+    @RequiresPermissions("news:add")
     public ResponseBean taNewsAdd(@ApiParam("保存内容") @RequestBody TaNews taNews) throws Exception{
+        SysUser sysUser = currentUser();
+
+        if (StringUtils.isEmpty(taNews.getTitle()) || StringUtils.isEmpty(taNews.getTypeId())) {
+            return ResponseBean.error("标题或者分类不能为空");
+        }
+
+        taNews.setTypeName(iTaNewsTypeService.getById(taNews.getTypeId()).getName());
 
         if (iTaNewsService.save(taNews)){
+            iTaExtendContentService.editContent(Constants.TARGET_NEWS, taNews.getNewsId(), taNews.getContentList());
             return ResponseBean.success(taNews);
         }else {
             return ResponseBean.error("保存失败, 请重试", ResponseBean.ERROR_UNAVAILABLE);
@@ -79,10 +111,11 @@ public class TaNewsController extends BaseController {
      * 根据id删除对象
      * @param id  实体ID
      */
-    @RequestMapping(value="/taNews/{id}", method= RequestMethod.DELETE)
+    @RequestMapping(value="/admin/news/{id}", method= RequestMethod.DELETE)
     @ApiOperation(value="删除", notes = "删除", httpMethod = "DELETE", response = ResponseBean.class)
-    public ResponseBean taNewsDelete(@ApiParam("对象ID") @PathVariable Integer id) throws Exception{
-        if(iTaNewsService.removeById(id)){
+    @RequiresPermissions("news:delete")
+    public ResponseBean taNewsDelete(@ApiParam("对象ID") @PathVariable String id) throws Exception{
+        if(iTaNewsService.removeLogicById(id)){
             return ResponseBean.success("success");
         }else {
             return ResponseBean.error("删除失败, 请重试", ResponseBean.ERROR_UNAVAILABLE);
@@ -95,13 +128,23 @@ public class TaNewsController extends BaseController {
      * @param taNews 实体对象
      * @return
      */
-    @RequestMapping(value="/taNews/{id}",method= RequestMethod.PUT)
+    @RequestMapping(value="/admin/news/{id}",method= RequestMethod.PUT)
     @ApiOperation(value="更新", notes = "更新", httpMethod = "PUT", response = ResponseBean.class)
-    public ResponseBean taNewsUpdate(@ApiParam("对象ID") @PathVariable Integer id,
+    @RequiresPermissions("news:update")
+    public ResponseBean taNewsUpdate(@ApiParam("对象ID") @PathVariable String id,
                                         @ApiParam("更新内容") @RequestBody TaNews taNews) throws Exception{
+        taNews.setNewsId(id);
+
+        if (StringUtils.isEmpty(taNews.getTitle()) || StringUtils.isEmpty(taNews.getTypeId())) {
+            return ResponseBean.error("标题或者分类不能为空");
+        }
+
+        taNews.setTypeName(iTaNewsTypeService.getById(taNews.getTypeId()).getName());
+
+        iTaExtendContentService.editContent(Constants.TARGET_NEWS, id, taNews.getContentList());
 
         if (iTaNewsService.updateById(taNews)){
-            return ResponseBean.success(iTaNewsService.getById(id));
+            return ResponseBean.success(taNews);
         }else {
             return ResponseBean.error("修改失败, 请重试", ResponseBean.ERROR_UNAVAILABLE);
         }
@@ -111,9 +154,17 @@ public class TaNewsController extends BaseController {
      * 根据id查询对象
      * @param id  实体ID
      */
-    @RequestMapping(value="/taNews/{id}",method= RequestMethod.GET)
+    @RequestMapping(value="/admin/news/{id}",method= RequestMethod.GET)
     @ApiOperation(value="详情", notes = "详情", httpMethod = "GET", response = ResponseBean.class)
-    public ResponseBean taNewsGet(@ApiParam("对象ID") @PathVariable Integer id) throws Exception{
-        return ResponseBean.success(iTaNewsService.getById(id));
+    public ResponseBean taNewsGet(@ApiParam("对象ID") @PathVariable String id) throws Exception{
+        TaNews taNews = iTaNewsService.getExistBy("news_id", id, false, true);
+        if (null == taNews) {
+            return ResponseBean.error("内存不存在");
+        }
+
+        List<TaExtendContent> contentList = iTaExtendContentService.listByTarget(Constants.TARGET_NEWS, id);
+        taNews.setContentList(contentList);
+
+        return ResponseBean.success(taNews);
     }
 }

src/main/java/com/yunzhi/nanyang/controller/TaNewsTypeController.java

@@ -6,9 +6,12 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.yunzhi.nanyang.common.BaseController;
 import com.yunzhi.nanyang.common.Constants;
 import com.yunzhi.nanyang.common.ResponseBean;
+import com.yunzhi.nanyang.common.StringUtils;
+import com.yunzhi.nanyang.service.ITaNewsService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
+import org.apache.shiro.authz.annotation.RequiresPermissions;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -40,6 +43,8 @@ public class TaNewsTypeController extends BaseController {
     @Autowired
     public ITaNewsTypeService iTaNewsTypeService;
 
+    @Autowired
+    public ITaNewsService iTaNewsService;
 
     /**
      * 分页查询列表
@@ -50,10 +55,12 @@ public class TaNewsTypeController extends BaseController {
     @RequestMapping(value="/admin/news-type",method= RequestMethod.GET)
     @ApiOperation(value="列表", notes = "列表", httpMethod = "GET", response = ResponseBean.class)
     public ResponseBean taNewsTypeList(@ApiParam("页码") @RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
-									 @ApiParam("单页数据量") @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize) throws Exception{
+                                       @ApiParam("单页数据量") @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize,
+                                       @ApiParam("名称") @RequestParam(value ="name", required = false) String name) throws Exception{
 
         IPage<TaNewsType> pg = new Page<>(pageNum, pageSize);
         QueryWrapper<TaNewsType> queryWrapper = new QueryWrapper<>();
+        queryWrapper.like(!StringUtils.isEmpty(name), "name", "%" + name + "%");
         queryWrapper.gt("status", Constants.STATUS_DELETE);
         queryWrapper.orderByDesc("create_date");
 
@@ -66,9 +73,21 @@ public class TaNewsTypeController extends BaseController {
      * @param taNewsType 实体对象
      * @return
      */
-    @RequestMapping(value="/taNewsType",method= RequestMethod.POST)
+    @RequestMapping(value="/admin/news-type",method= RequestMethod.POST)
     @ApiOperation(value="保存", notes = "保存", httpMethod = "POST", response = ResponseBean.class)
+    @RequiresPermissions("news:add")
     public ResponseBean taNewsTypeAdd(@ApiParam("保存内容") @RequestBody TaNewsType taNewsType) throws Exception{
+        taNewsType.setTypeId(null);
+
+        if (StringUtils.isEmpty(taNewsType.getName())) {
+            return ResponseBean.error("名称不能为空");
+        }
+
+        int cnt = iTaNewsTypeService.countBy("name", taNewsType.getName(), true);
+        if (cnt > 0) {
+            return ResponseBean.error("名称重复");
+        }
+
 
         if (iTaNewsTypeService.save(taNewsType)){
             return ResponseBean.success(taNewsType);
@@ -81,9 +100,20 @@ public class TaNewsTypeController extends BaseController {
      * 根据id删除对象
      * @param id  实体ID
      */
-    @RequestMapping(value="/taNewsType/{id}", method= RequestMethod.DELETE)
+    @RequestMapping(value="/admin/news-type/{id}", method= RequestMethod.DELETE)
     @ApiOperation(value="删除", notes = "删除", httpMethod = "DELETE", response = ResponseBean.class)
-    public ResponseBean taNewsTypeDelete(@ApiParam("对象ID") @PathVariable Integer id) throws Exception{
+    @RequiresPermissions("news:delete")
+    public ResponseBean taNewsTypeDelete(@ApiParam("对象ID") @PathVariable String id) throws Exception{
+        TaNewsType taNewsType = iTaNewsTypeService.getExistBy("type_id", id, false, true);
+        if (null == taNewsType) {
+            return ResponseBean.success("success");
+        }
+
+        int cnt = iTaNewsService.countBy("type_id", id, true);
+        if (cnt > 0) {
+            return ResponseBean.error("请先移除当前分类下的资讯信息");
+        }
+
         if(iTaNewsTypeService.removeById(id)){
             return ResponseBean.success("success");
         }else {
@@ -97,10 +127,20 @@ public class TaNewsTypeController extends BaseController {
      * @param taNewsType 实体对象
      * @return
      */
-    @RequestMapping(value="/taNewsType/{id}",method= RequestMethod.PUT)
+    @RequestMapping(value="/admin/news-type/{id}",method= RequestMethod.PUT)
     @ApiOperation(value="更新", notes = "更新", httpMethod = "PUT", response = ResponseBean.class)
-    public ResponseBean taNewsTypeUpdate(@ApiParam("对象ID") @PathVariable Integer id,
+    @RequiresPermissions("news:update")
+    public ResponseBean taNewsTypeUpdate(@ApiParam("对象ID") @PathVariable String id,
                                         @ApiParam("更新内容") @RequestBody TaNewsType taNewsType) throws Exception{
+        taNewsType.setTypeId(id);
+
+        if (StringUtils.isEmpty(taNewsType.getName())) {
+            return ResponseBean.error("名称不能为空");
+        }
+        TaNewsType origin = iTaNewsTypeService.getByButNot("name", taNewsType.getName(), "type_id", id, true);
+        if (origin != null) {
+            return ResponseBean.error("名称重复");
+        }
 
         if (iTaNewsTypeService.updateById(taNewsType)){
             return ResponseBean.success(iTaNewsTypeService.getById(id));
@@ -113,9 +153,9 @@ public class TaNewsTypeController extends BaseController {
      * 根据id查询对象
      * @param id  实体ID
      */
-    @RequestMapping(value="/taNewsType/{id}",method= RequestMethod.GET)
+    @RequestMapping(value="/admin/news-type/{id}",method= RequestMethod.GET)
     @ApiOperation(value="详情", notes = "详情", httpMethod = "GET", response = ResponseBean.class)
     public ResponseBean taNewsTypeGet(@ApiParam("对象ID") @PathVariable Integer id) throws Exception{
-        return ResponseBean.success(iTaNewsTypeService.getById(id));
+        return ResponseBean.success(iTaNewsTypeService.getExistBy("type_id", id, false, true));
     }
 }

src/main/java/com/yunzhi/nanyang/controller/TaPersonController.java

@@ -5,6 +5,8 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.yunzhi.nanyang.common.BaseController;
 import com.yunzhi.nanyang.common.ResponseBean;
+import com.yunzhi.nanyang.common.SMSCaptcha;
+import com.yunzhi.nanyang.vo.PhoneParam;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
@@ -39,81 +41,98 @@ public class TaPersonController extends BaseController {
     @Autowired
     public ITaPersonService iTaPersonService;
 
+    @Autowired
+    public SMSCaptcha smsCaptcha;
 
-    /**
-     * 分页查询列表
-     * @param pageNum
-     * @param pageSize
-     * @return
-     */
-    @RequestMapping(value="/taPerson",method= RequestMethod.GET)
-    @ApiOperation(value="列表", notes = "列表", httpMethod = "GET", response = ResponseBean.class)
-    public ResponseBean taPersonList(@ApiParam("页码") @RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
-									 @ApiParam("单页数据量") @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize) throws Exception{
-
-		    IPage<TaPerson> pg = new Page<>(pageNum, pageSize);
-            QueryWrapper<TaPerson> queryWrapper = new QueryWrapper<>();
-            queryWrapper.orderByDesc("create_date");
-
-            IPage<TaPerson> result = iTaPersonService.page(pg, queryWrapper);
-            return ResponseBean.success(result);
-    }
 
+//    /**
+//     * 分页查询列表
+//     * @param pageNum
+//     * @param pageSize
+//     * @return
+//     */
+//    @RequestMapping(value="/taPerson",method= RequestMethod.GET)
+//    @ApiOperation(value="列表", notes = "列表", httpMethod = "GET", response = ResponseBean.class)
+//    public ResponseBean taPersonList(@ApiParam("页码") @RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
+//									 @ApiParam("单页数据量") @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize) throws Exception{
+//
+//		    IPage<TaPerson> pg = new Page<>(pageNum, pageSize);
+//            QueryWrapper<TaPerson> queryWrapper = new QueryWrapper<>();
+//            queryWrapper.orderByDesc("create_date");
+//
+//            IPage<TaPerson> result = iTaPersonService.page(pg, queryWrapper);
+//            return ResponseBean.success(result);
+//    }
+//
+//    /**
+//     * 保存对象
+//     * @param taPerson 实体对象
+//     * @return
+//     */
+//    @RequestMapping(value="/taPerson",method= RequestMethod.POST)
+//    @ApiOperation(value="保存", notes = "保存", httpMethod = "POST", response = ResponseBean.class)
+//    public ResponseBean taPersonAdd(@ApiParam("保存内容") @RequestBody TaPerson taPerson) throws Exception{
+//
+//        if (iTaPersonService.save(taPerson)){
+//            return ResponseBean.success(taPerson);
+//        }else {
+//            return ResponseBean.error("保存失败, 请重试", ResponseBean.ERROR_UNAVAILABLE);
+//        }
+//    }
+//
+//    /**
+//     * 根据id删除对象
+//     * @param id  实体ID
+//     */
+//    @RequestMapping(value="/taPerson/{id}", method= RequestMethod.DELETE)
+//    @ApiOperation(value="删除", notes = "删除", httpMethod = "DELETE", response = ResponseBean.class)
+//    public ResponseBean taPersonDelete(@ApiParam("对象ID") @PathVariable Integer id) throws Exception{
+//        if(iTaPersonService.removeById(id)){
+//            return ResponseBean.success("success");
+//        }else {
+//            return ResponseBean.error("删除失败, 请重试", ResponseBean.ERROR_UNAVAILABLE);
+//        }
+//    }
+//
     /**
-     * 保存对象
-     * @param taPerson 实体对象
+     * 修改对象
+     * @param appid  实体ID
+     * @param id  实体ID
+     * @param phoneParam 实体对象
      * @return
      */
-    @RequestMapping(value="/taPerson",method= RequestMethod.POST)
-    @ApiOperation(value="保存", notes = "保存", httpMethod = "POST", response = ResponseBean.class)
-    public ResponseBean taPersonAdd(@ApiParam("保存内容") @RequestBody TaPerson taPerson) throws Exception{
+    @RequestMapping(value="/wx/{appid}/person/{id}/phone",method= RequestMethod.PUT)
+    @ApiOperation(value="更新电话", notes = "更新电话", httpMethod = "PUT", response = ResponseBean.class)
+    public ResponseBean taPersonUpdate(@ApiParam("小程序ID") @PathVariable String appid,
+                                       @ApiParam("对象ID") @PathVariable String id,
+                                       @ApiParam("更新内容") @RequestBody PhoneParam phoneParam) throws Exception{
 
-        if (iTaPersonService.save(taPerson)){
-            return ResponseBean.success(taPerson);
-        }else {
-            return ResponseBean.error("保存失败, 请重试", ResponseBean.ERROR_UNAVAILABLE);
+        TaPerson taPerson = currentPerson();
+        if (!id.equals(taPerson.getPersonId())) {
+            return ResponseBean.error("待更新人员ID不正确");
         }
-    }
 
-    /**
-     * 根据id删除对象
-     * @param id  实体ID
-     */
-    @RequestMapping(value="/taPerson/{id}", method= RequestMethod.DELETE)
-    @ApiOperation(value="删除", notes = "删除", httpMethod = "DELETE", response = ResponseBean.class)
-    public ResponseBean taPersonDelete(@ApiParam("对象ID") @PathVariable Integer id) throws Exception{
-        if(iTaPersonService.removeById(id)){
-            return ResponseBean.success("success");
-        }else {
-            return ResponseBean.error("删除失败, 请重试", ResponseBean.ERROR_UNAVAILABLE);
+        boolean isOk = smsCaptcha.validate(phoneParam.getPhone(), phoneParam.getCaptcha());
+        if (!isOk) {
+            return ResponseBean.error("验证码不正确或者已过期");
         }
-    }
 
-    /**
-     * 修改对象
-     * @param id  实体ID
-     * @param taPerson 实体对象
-     * @return
-     */
-    @RequestMapping(value="/taPerson/{id}",method= RequestMethod.PUT)
-    @ApiOperation(value="更新", notes = "更新", httpMethod = "PUT", response = ResponseBean.class)
-    public ResponseBean taPersonUpdate(@ApiParam("对象ID") @PathVariable Integer id,
-                                        @ApiParam("更新内容") @RequestBody TaPerson taPerson) throws Exception{
+        taPerson.setPhone(phoneParam.getPhone());
 
         if (iTaPersonService.updateById(taPerson)){
-            return ResponseBean.success(iTaPersonService.getById(id));
+            return ResponseBean.success(taPerson);
         }else {
             return ResponseBean.error("修改失败, 请重试", ResponseBean.ERROR_UNAVAILABLE);
         }
     }
-
-    /**
-     * 根据id查询对象
-     * @param id  实体ID
-     */
-    @RequestMapping(value="/taPerson/{id}",method= RequestMethod.GET)
-    @ApiOperation(value="详情", notes = "详情", httpMethod = "GET", response = ResponseBean.class)
-    public ResponseBean taPersonGet(@ApiParam("对象ID") @PathVariable Integer id) throws Exception{
-        return ResponseBean.success(iTaPersonService.getById(id));
-    }
+//
+//    /**
+//     * 根据id查询对象
+//     * @param id  实体ID
+//     */
+//    @RequestMapping(value="/taPerson/{id}",method= RequestMethod.GET)
+//    @ApiOperation(value="详情", notes = "详情", httpMethod = "GET", response = ResponseBean.class)
+//    public ResponseBean taPersonGet(@ApiParam("对象ID") @PathVariable Integer id) throws Exception{
+//        return ResponseBean.success(iTaPersonService.getById(id));
+//    }
 }

src/main/java/com/yunzhi/nanyang/controller/TdMachineryTypeController.java

@@ -4,10 +4,14 @@ 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.yunzhi.nanyang.common.BaseController;
+import com.yunzhi.nanyang.common.Constants;
 import com.yunzhi.nanyang.common.ResponseBean;
+import com.yunzhi.nanyang.common.StringUtils;
+import com.yunzhi.nanyang.service.ITaMachineryService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
+import org.apache.shiro.authz.annotation.RequiresPermissions;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -39,6 +43,9 @@ public class TdMachineryTypeController extends BaseController {
     @Autowired
     public ITdMachineryTypeService iTdMachineryTypeService;
 
+    @Autowired
+    public ITaMachineryService iTaMachineryService;
+
 
     /**
      * 分页查询列表
@@ -46,17 +53,20 @@ public class TdMachineryTypeController extends BaseController {
      * @param pageSize
      * @return
      */
-    @RequestMapping(value="/tdMachineryType",method= RequestMethod.GET)
+    @RequestMapping(value="/admin/machinery-type",method= RequestMethod.GET)
     @ApiOperation(value="列表", notes = "列表", httpMethod = "GET", response = ResponseBean.class)
     public ResponseBean tdMachineryTypeList(@ApiParam("页码") @RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
-									 @ApiParam("单页数据量") @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize) throws Exception{
+                                            @ApiParam("单页数据量") @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize,
+                                            @ApiParam("单页数据量") @RequestParam(value ="name", required = false) String name) throws Exception{
 
-		    IPage<TdMachineryType> pg = new Page<>(pageNum, pageSize);
-            QueryWrapper<TdMachineryType> queryWrapper = new QueryWrapper<>();
-            queryWrapper.orderByDesc("create_date");
+        IPage<TdMachineryType> pg = new Page<>(pageNum, pageSize);
+        QueryWrapper<TdMachineryType> queryWrapper = new QueryWrapper<>();
+        queryWrapper.like(!StringUtils.isEmpty(name), "name", "%" + name + "%");
+        queryWrapper.gt("status", Constants.STATUS_DELETE);
+        queryWrapper.orderByDesc("create_date");
 
-            IPage<TdMachineryType> result = iTdMachineryTypeService.page(pg, queryWrapper);
-            return ResponseBean.success(result);
+        IPage<TdMachineryType> result = iTdMachineryTypeService.page(pg, queryWrapper);
+        return ResponseBean.success(result);
     }
 
     /**
@@ -64,10 +74,22 @@ public class TdMachineryTypeController extends BaseController {
      * @param tdMachineryType 实体对象
      * @return
      */
-    @RequestMapping(value="/tdMachineryType",method= RequestMethod.POST)
+    @RequestMapping(value="/admin/machinery-type",method= RequestMethod.POST)
     @ApiOperation(value="保存", notes = "保存", httpMethod = "POST", response = ResponseBean.class)
+    @RequiresPermissions("machinetype:add")
     public ResponseBean tdMachineryTypeAdd(@ApiParam("保存内容") @RequestBody TdMachineryType tdMachineryType) throws Exception{
 
+        tdMachineryType.setTypeId(null);
+
+        if (StringUtils.isEmpty(tdMachineryType.getName())) {
+            return ResponseBean.error("名称不能为空");
+        }
+
+        int cnt = iTdMachineryTypeService.countBy("name", tdMachineryType.getName(), true);
+        if (cnt > 0) {
+            return ResponseBean.error("名称重复");
+        }
+
         if (iTdMachineryTypeService.save(tdMachineryType)){
             return ResponseBean.success(tdMachineryType);
         }else {
@@ -79,10 +101,23 @@ public class TdMachineryTypeController extends BaseController {
      * 根据id删除对象
      * @param id  实体ID
      */
-    @RequestMapping(value="/tdMachineryType/{id}", method= RequestMethod.DELETE)
+    @RequestMapping(value="/admin/machinery-type/{id}", method= RequestMethod.DELETE)
     @ApiOperation(value="删除", notes = "删除", httpMethod = "DELETE", response = ResponseBean.class)
-    public ResponseBean tdMachineryTypeDelete(@ApiParam("对象ID") @PathVariable Integer id) throws Exception{
-        if(iTdMachineryTypeService.removeById(id)){
+    @RequiresPermissions("machinetype:delete")
+    public ResponseBean tdMachineryTypeDelete(@ApiParam("对象ID") @PathVariable String id) throws Exception{
+
+        TdMachineryType tdMachineryType = iTdMachineryTypeService.getExistBy("type_id", id, false, true);
+        if (null == tdMachineryType) {
+            return ResponseBean.success("success");
+        }
+
+        int cnt = iTaMachineryService.countBy("type_id", id, true);
+        if (cnt > 0) {
+            return ResponseBean.error("请先移除当前分类下的农机信息");
+        }
+
+
+        if(iTdMachineryTypeService.removeLogicById(id)){
             return ResponseBean.success("success");
         }else {
             return ResponseBean.error("删除失败, 请重试", ResponseBean.ERROR_UNAVAILABLE);
@@ -95,10 +130,21 @@ public class TdMachineryTypeController extends BaseController {
      * @param tdMachineryType 实体对象
      * @return
      */
-    @RequestMapping(value="/tdMachineryType/{id}",method= RequestMethod.PUT)
+    @RequestMapping(value="/admin/machinery-type/{id}",method= RequestMethod.PUT)
     @ApiOperation(value="更新", notes = "更新", httpMethod = "PUT", response = ResponseBean.class)
-    public ResponseBean tdMachineryTypeUpdate(@ApiParam("对象ID") @PathVariable Integer id,
+    @RequiresPermissions("machinetype:update")
+    public ResponseBean tdMachineryTypeUpdate(@ApiParam("对象ID") @PathVariable String id,
                                         @ApiParam("更新内容") @RequestBody TdMachineryType tdMachineryType) throws Exception{
+        tdMachineryType.setTypeId(id);
+
+        if (StringUtils.isEmpty(tdMachineryType.getName())) {
+            return ResponseBean.error("名称不能为空");
+        }
+
+        TdMachineryType origin = iTdMachineryTypeService.getByButNot("name", tdMachineryType.getName(), "type_id", id, true);
+        if (origin != null) {
+            return ResponseBean.error("名称重复");
+        }
 
         if (iTdMachineryTypeService.updateById(tdMachineryType)){
             return ResponseBean.success(iTdMachineryTypeService.getById(id));
@@ -111,9 +157,9 @@ public class TdMachineryTypeController extends BaseController {
      * 根据id查询对象
      * @param id  实体ID
      */
-    @RequestMapping(value="/tdMachineryType/{id}",method= RequestMethod.GET)
+    @RequestMapping(value="/admin/machinery-type/{id}",method= RequestMethod.GET)
     @ApiOperation(value="详情", notes = "详情", httpMethod = "GET", response = ResponseBean.class)
-    public ResponseBean tdMachineryTypeGet(@ApiParam("对象ID") @PathVariable Integer id) throws Exception{
-        return ResponseBean.success(iTdMachineryTypeService.getById(id));
+    public ResponseBean tdMachineryTypeGet(@ApiParam("对象ID") @PathVariable String id) throws Exception{
+        return ResponseBean.success(iTdMachineryTypeService.getExistBy("type_id", id, false, true));
     }
 }

src/main/java/com/yunzhi/nanyang/controller/WxMaController.java

@@ -0,0 +1,173 @@
+package com.yunzhi.nanyang.controller;
+
+import cn.binarywang.wx.miniapp.api.WxMaService;
+import cn.binarywang.wx.miniapp.bean.WxMaJscode2SessionResult;
+import cn.binarywang.wx.miniapp.bean.WxMaPhoneNumberInfo;
+import cn.binarywang.wx.miniapp.bean.WxMaUserInfo;
+import com.yunzhi.nanyang.common.*;
+import com.yunzhi.nanyang.entity.SysMiniapp;
+import com.yunzhi.nanyang.entity.TaPerson;
+import com.yunzhi.nanyang.service.ISysMiniappService;
+import com.yunzhi.nanyang.service.ITaPersonService;
+import com.yunzhi.nanyang.shiro.utils.JWTUtil;
+import com.yunzhi.nanyang.vo.LoginParam;
+import com.yunzhi.nanyang.vo.WxMaAuthParam;
+import com.yunzhi.nanyang.vo.WxMaPreload;
+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 java.time.LocalDateTime;
+import java.util.HashMap;
+import java.util.Map;
+
+@Api(tags = "小程序登入/登出")
+@RestController
+@RequestMapping("/wx/{appid}")
+public class WxMaController extends BaseController {
+
+    @Autowired
+    ISysMiniappService iSysMiniappService;
+
+    @Autowired
+    ITaPersonService iTaPersonService;
+
+    @Autowired
+    SMSCaptcha smsCaptcha;
+
+    @Autowired
+    WxUtils wxUtils;
+
+    private boolean checkLoginParam(LoginParam loginParam) {
+        return !StringUtils.isEmpty(loginParam.getCode())
+                && !StringUtils.isEmpty(loginParam.getUserName())
+                && !StringUtils.isEmpty(loginParam.getPassword());
+    }
+
+    private WxMaService getService(String appid) throws Exception {
+        SysMiniapp miniapp = iSysMiniappService.getById(appid);
+        if (null == miniapp || miniapp.getStatus() != Constants.STATUS_NORMAL) {
+            throw new Exception("未找到有效的小程序配置");
+        }
+
+        return wxUtils.getService(miniapp.getClient());
+    }
+
+    @GetMapping("/preload")
+    @ApiOperation(value="小程序登录", notes = "小程序登录", httpMethod = "POST", response = ResponseBean.class)
+    public ResponseBean preload(@ApiParam("小程序ID") @PathVariable String appid,
+                                @ApiParam("小程序预加载参数") @RequestParam WxMaPreload wxMaPreload) throws Exception {
+        if (!appid.equals(wxMaPreload.getAppid())) {
+            return ResponseBean.error("小程序预加载接口配置错误");
+        }
+
+        return ResponseBean.success(null);
+    }
+
+    /**
+     * 小程序
+     * @param loginParam
+     * @return
+     * @throws Exception
+     */
+    @PostMapping("/login")
+    @ApiOperation(value="小程序登录", notes = "小程序登录", httpMethod = "POST", response = ResponseBean.class)
+    public ResponseBean appLogin(@ApiParam("小程序ID") @PathVariable String appid,
+                                 @ApiParam("登录参数") @RequestBody LoginParam loginParam) throws Exception {
+
+        if (StringUtils.isEmpty(loginParam.getCode())) {
+            return ResponseBean.error("CODE 不能为空");
+        }
+
+        WxMaService service = getService(appid);
+
+        WxMaJscode2SessionResult sessionInfo = service.getUserService().getSessionInfo(loginParam.getCode());
+        String openid = sessionInfo.getOpenid();
+        String sessionKey = sessionInfo.getSessionKey();
+
+        TaPerson taPerson = iTaPersonService.getByOpenId(appid, openid);
+        if (null == taPerson) {
+            taPerson = new TaPerson();
+            taPerson.setOpenid(openid);
+            taPerson.setStatus(Constants.STATUS_NORMAL);
+            taPerson.setCreateDate(LocalDateTime.now());
+            iTaPersonService.save(taPerson);
+        }
+
+        // 生成 token
+        String token = JWTUtil.sign(taPerson.getPersonId(), taPerson.getPersonId());
+
+        Map<String, Object> res = new HashMap<>();
+        res.put("person", taPerson);
+        res.put("token", token);
+        res.put("sessionKey", sessionKey);
+
+        return ResponseBean.success(res);
+    }
+
+
+    @PutMapping("/auth-user")
+    @ApiOperation(value="授权头像", notes = "授权头像", httpMethod = "PUT", response = TaPerson.class)
+    public ResponseBean updateUserInfo(@ApiParam("小程序ID") @PathVariable String appid,
+                                       @ApiParam("授权头像的参数") @RequestBody WxMaAuthParam params) throws Exception {
+        WxMaService service = getService(appid);
+        checkAuthParams(service, params);
+
+        // 解密用户信息
+        WxMaUserInfo userInfo = service.getUserService().getUserInfo(params.getSessionKey(), params.getEncryptedData(), params.getIv());
+
+        TaPerson taPerson = currentPerson();
+        if (null == taPerson) {
+            throw new Exception("校验当前人员失败, 请重试");
+        }
+
+        taPerson.setAvatar(userInfo.getAvatarUrl());
+        taPerson.setNickName(userInfo.getNickName());
+        taPerson.setSex(Integer.parseInt(userInfo.getGender()));
+
+        iTaPersonService.updateById(taPerson);
+
+        return ResponseBean.success(taPerson);
+    }
+
+    @ApiOperation(value="授权手机", notes = "授权手机", httpMethod = "PUT", response = TaPerson.class)
+    @PutMapping("/auth-phone")
+    public ResponseBean updateUserPhone(@ApiParam("小程序ID") @PathVariable String appid,
+                                        @ApiParam("授权手机的参数") @RequestBody WxMaAuthParam params) throws Exception {
+
+        WxMaService service = getService(appid);
+
+        // 解密
+        WxMaPhoneNumberInfo phoneNoInfo = service.getUserService().getPhoneNoInfo(params.getSessionKey(), params.getEncryptedData(), params.getIv());
+
+        TaPerson taPerson = currentPerson();
+        if (null == taPerson) {
+            throw new Exception("校验当前人员失败, 请重试");
+        }
+
+        taPerson.setPhone(phoneNoInfo.getPhoneNumber());
+        iTaPersonService.updateById(taPerson);
+
+        return ResponseBean.success(taPerson);
+    }
+
+
+    private void checkAuthParams(WxMaService service, WxMaAuthParam params) throws Exception {
+        String signature = params.getSignature();
+        String rawData = params.getRawData();
+        String encryptedData = params.getEncryptedData();
+        String iv = params.getIv();
+        String sessionKey = params.getSessionKey();
+
+        if (StringUtils.isEmpty(signature) || StringUtils.isEmpty(rawData) || StringUtils.isEmpty(encryptedData) || StringUtils.isEmpty(iv) || StringUtils.isEmpty(sessionKey)) {
+            throw new Exception("缺失授权参数");
+        }
+
+        boolean isValid = service.getUserService().checkUserInfo(sessionKey, rawData, signature);
+        if (!isValid) {
+            throw new Exception("校验授权参数失败, 请重试");
+        }
+    }
+}

src/main/java/com/yunzhi/nanyang/entity/SysMiniapp.java

@@ -0,0 +1,55 @@
+package com.yunzhi.nanyang.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import java.time.LocalDateTime;
+import com.baomidou.mybatisplus.annotation.TableId;
+import java.io.Serializable;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * <p>
+ * 小程序表
+ * </p>
+ *
+ * @author yansen
+ * @since 2022-03-21
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@ApiModel(value="SysMiniapp对象", description="小程序表")
+public class SysMiniapp implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "appid")
+    @TableId(value = "app_id", type = IdType.INPUT)
+    private String appId;
+
+    @ApiModelProperty(value = "小程序名称")
+    private String name;
+
+    @ApiModelProperty(value = "secret")
+    private String secret;
+
+    @ApiModelProperty(value = "token")
+    private String token;
+
+    @ApiModelProperty(value = "aesKey")
+    private String aesKey;
+
+    @ApiModelProperty(value = "客户端")
+    private String client;
+
+    @ApiModelProperty(value = "状态")
+    private Integer status;
+
+    @ApiModelProperty(value = "创建时间")
+    private LocalDateTime createDate;
+
+
+}

src/main/java/com/yunzhi/nanyang/entity/TaBanner.java

@@ -27,7 +27,7 @@ public class TaBanner implements Serializable {
     private static final long serialVersionUID = 1L;
 
     @ApiModelProperty(value = "轮播图Id")
-    @TableId(value = "banner_id", type = IdType.INPUT)
+    @TableId(value = "banner_id", type = IdType.UUID)
     private String bannerId;
 
     @ApiModelProperty(value = "名称")

src/main/java/com/yunzhi/nanyang/entity/TaExtendContent.java

@@ -27,7 +27,7 @@ public class TaExtendContent implements Serializable {
     private static final long serialVersionUID = 1L;
 
     @ApiModelProperty(value = "租户号")
-    @TableId(value = "ext_id", type = IdType.INPUT)
+    @TableId(value = "ext_id", type = IdType.UUID)
     private String extId;
 
     @ApiModelProperty(value = "扩展对象类型;message消息表 bannar轮播图 info资讯")

src/main/java/com/yunzhi/nanyang/entity/TaImages.java

@@ -27,7 +27,7 @@ public class TaImages implements Serializable {
     private static final long serialVersionUID = 1L;
 
     @ApiModelProperty(value = "图片ID")
-    @TableId(value = "image_id", type = IdType.INPUT)
+    @TableId(value = "image_id", type = IdType.UUID)
     private String imageId;
 
     @ApiModelProperty(value = "图片地址")

src/main/java/com/yunzhi/nanyang/entity/TaMachinery.java

@@ -2,8 +2,12 @@ package com.yunzhi.nanyang.entity;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import java.time.LocalDateTime;
+
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import java.io.Serializable;
+import java.util.List;
+
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -27,7 +31,7 @@ public class TaMachinery implements Serializable {
     private static final long serialVersionUID = 1L;
 
     @ApiModelProperty(value = "农机Id")
-    @TableId(value = "machinery_id", type = IdType.INPUT)
+    @TableId(value = "machinery_id", type = IdType.UUID)
     private String machineryId;
 
     @ApiModelProperty(value = "名称")
@@ -84,5 +88,7 @@ public class TaMachinery implements Serializable {
     @ApiModelProperty(value = "更新时间")
     private LocalDateTime updateDate;
 
-
+    @TableField(exist = false)
+    @ApiModelProperty(value = "主图")
+    private List<TaImages> images;
 }

src/main/java/com/yunzhi/nanyang/entity/TaNews.java

@@ -2,8 +2,12 @@ package com.yunzhi.nanyang.entity;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import java.time.LocalDateTime;
+
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import java.io.Serializable;
+import java.util.List;
+
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -27,7 +31,7 @@ public class TaNews implements Serializable {
     private static final long serialVersionUID = 1L;
 
     @ApiModelProperty(value = "资讯Id")
-    @TableId(value = "news_id", type = IdType.INPUT)
+    @TableId(value = "news_id", type = IdType.UUID)
     private String newsId;
 
     @ApiModelProperty(value = "资讯标题")
@@ -51,5 +55,7 @@ public class TaNews implements Serializable {
     @ApiModelProperty(value = "创建时间")
     private LocalDateTime createDate;
 
-
+    @TableField(exist = false)
+    @ApiModelProperty(value = "内容详情")
+    private List<TaExtendContent> contentList;
 }

src/main/java/com/yunzhi/nanyang/entity/TaNewsType.java

@@ -27,7 +27,7 @@ public class TaNewsType implements Serializable {
     private static final long serialVersionUID = 1L;
 
     @ApiModelProperty(value = "分类Id")
-    @TableId(value = "type_id", type = IdType.INPUT)
+    @TableId(value = "type_id", type = IdType.UUID)
     private String typeId;
 
     @ApiModelProperty(value = "分类名")

src/main/java/com/yunzhi/nanyang/entity/TaPerson.java

@@ -27,9 +27,12 @@ public class TaPerson implements Serializable {
     private static final long serialVersionUID = 1L;
 
     @ApiModelProperty(value = "用户ID")
-    @TableId(value = "person_id", type = IdType.INPUT)
+    @TableId(value = "person_id", type = IdType.UUID)
     private String personId;
 
+    @ApiModelProperty(value = "appId")
+    private String appId;
+
     @ApiModelProperty(value = "openid")
     private String openid;
 
@@ -49,7 +52,7 @@ public class TaPerson implements Serializable {
     private String userId;
 
     @ApiModelProperty(value = "状态")
-    private Integer state;
+    private Integer status;
 
     @ApiModelProperty(value = "创建时间")
     private LocalDateTime createDate;

src/main/java/com/yunzhi/nanyang/entity/TdMachineryType.java

@@ -27,14 +27,14 @@ public class TdMachineryType implements Serializable {
     private static final long serialVersionUID = 1L;
 
     @ApiModelProperty(value = "农机类型Id")
-    @TableId(value = "type_id", type = IdType.INPUT)
+    @TableId(value = "type_id", type = IdType.UUID)
     private String typeId;
 
     @ApiModelProperty(value = "类型名")
     private String name;
 
     @ApiModelProperty(value = "状态")
-    private Integer state;
+    private Integer status;
 
     @ApiModelProperty(value = "创建时间")
     private LocalDateTime createDate;

src/main/java/com/yunzhi/nanyang/mapper/SysMiniappMapper.java

@@ -0,0 +1,22 @@
+package com.yunzhi.nanyang.mapper;
+
+import com.yunzhi.nanyang.entity.SysMiniapp;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Select;
+
+/**
+ * <p>
+ * 小程序表 Mapper 接口
+ * </p>
+ *
+ * @author yansen
+ * @since 2022-03-21
+ */
+@Mapper
+public interface SysMiniappMapper extends BaseMapper<SysMiniapp> {
+
+    @Select("select * from sys_miniapp t where t.client = #{client} and t.`status` = 1")
+    SysMiniapp getByClient(@Param("client") String client);
+}

src/main/java/com/yunzhi/nanyang/mapper/SysUserDataScopeMapper.java

@@ -3,6 +3,9 @@ package com.yunzhi.nanyang.mapper;
 import com.yunzhi.nanyang.entity.SysUserDataScope;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
 
 /**
  * <p>
@@ -15,4 +18,5 @@ import org.apache.ibatis.annotations.Mapper;
 @Mapper
 public interface SysUserDataScopeMapper extends BaseMapper<SysUserDataScope> {
 
+    List<String> getAccessOrgs(@Param("userId") String userId);
 }

src/main/java/com/yunzhi/nanyang/mapper/TaImagesMapper.java

@@ -3,6 +3,9 @@ package com.yunzhi.nanyang.mapper;
 import com.yunzhi.nanyang.entity.TaImages;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
 
 /**
  * <p>
@@ -15,4 +18,5 @@ import org.apache.ibatis.annotations.Mapper;
 @Mapper
 public interface TaImagesMapper extends BaseMapper<TaImages> {
 
+    List<TaImages> getListBy(@Param("targetType") String targetType, @Param("targetId") String targetId);
 }

src/main/java/com/yunzhi/nanyang/mapper/TaPersonMapper.java

@@ -3,6 +3,8 @@ package com.yunzhi.nanyang.mapper;
 import com.yunzhi.nanyang.entity.TaPerson;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Select;
 
 /**
  * <p>
@@ -15,4 +17,6 @@ import org.apache.ibatis.annotations.Mapper;
 @Mapper
 public interface TaPersonMapper extends BaseMapper<TaPerson> {
 
+    @Select("SELECT * FROM ta_person t WHERE t.app_id = #{appid} AND t.openid = #{openid} AND t.`status` > -1")
+    TaPerson getByOpenId(@Param("appid") String appid, @Param("openid") String openid);
 }

src/main/java/com/yunzhi/nanyang/service/ISysMiniappService.java

@@ -0,0 +1,17 @@
+package com.yunzhi.nanyang.service;
+
+import com.yunzhi.nanyang.entity.SysMiniapp;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ * 小程序表 服务类
+ * </p>
+ *
+ * @author yansen
+ * @since 2022-03-21
+ */
+public interface ISysMiniappService extends IService<SysMiniapp> {
+
+    SysMiniapp getByClient(String client);
+}

src/main/java/com/yunzhi/nanyang/service/ISysUserDataScopeService.java

@@ -3,6 +3,8 @@ package com.yunzhi.nanyang.service;
 import com.yunzhi.nanyang.entity.SysUserDataScope;
 import com.baomidou.mybatisplus.extension.service.IService;
 
+import java.util.List;
+
 /**
  * <p>
  * 用户数据权限 服务类
@@ -12,5 +14,9 @@ import com.baomidou.mybatisplus.extension.service.IService;
  * @since 2022-03-08
  */
 public interface ISysUserDataScopeService extends IBaseService<SysUserDataScope> {
+    boolean checkOrgAccess(String orgId, String userId);
+
+    boolean addNew(String orgId, String userId);
 
+    List<String> getAccessOrgs(String userId);
 }

src/main/java/com/yunzhi/nanyang/service/ITaExtendContentService.java

@@ -3,6 +3,8 @@ package com.yunzhi.nanyang.service;
 import com.yunzhi.nanyang.entity.TaExtendContent;
 import com.baomidou.mybatisplus.extension.service.IService;
 
+import java.util.List;
+
 /**
  * <p>
  * 拓展内容表 服务类
@@ -13,4 +15,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
  */
 public interface ITaExtendContentService extends IBaseService<TaExtendContent> {
 
+    List<TaExtendContent> listByTarget(String targetType, String targetId);
+
+    boolean editContent(String targetType, String targetId, List<TaExtendContent> contentList) throws Exception;
 }

src/main/java/com/yunzhi/nanyang/service/ITaMachineryService.java

@@ -13,4 +13,9 @@ import com.baomidou.mybatisplus.extension.service.IService;
  */
 public interface ITaMachineryService extends IBaseService<TaMachinery> {
 
+    boolean saveAll(TaMachinery taMachinery) throws Exception;
+
+    boolean updateAll(TaMachinery taMachinery)  throws Exception;
+
+    TaMachinery getDetail(String machineryId);
 }

src/main/java/com/yunzhi/nanyang/service/ITaPersonService.java

@@ -13,4 +13,5 @@ import com.baomidou.mybatisplus.extension.service.IService;
  */
 public interface ITaPersonService extends IBaseService<TaPerson> {
 
+    TaPerson getByOpenId(String appid, String openid);
 }

src/main/java/com/yunzhi/nanyang/service/impl/SysMiniappServiceImpl.java

@@ -0,0 +1,24 @@
+package com.yunzhi.nanyang.service.impl;
+
+import com.yunzhi.nanyang.entity.SysMiniapp;
+import com.yunzhi.nanyang.mapper.SysMiniappMapper;
+import com.yunzhi.nanyang.service.ISysMiniappService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 小程序表 服务实现类
+ * </p>
+ *
+ * @author yansen
+ * @since 2022-03-21
+ */
+@Service
+public class SysMiniappServiceImpl extends ServiceImpl<SysMiniappMapper, SysMiniapp> implements ISysMiniappService {
+
+    @Override
+    public SysMiniapp getByClient(String client) {
+        return baseMapper.getByClient(client);
+    }
+}

src/main/java/com/yunzhi/nanyang/service/impl/SysUserDataScopeServiceImpl.java

@@ -1,11 +1,18 @@
 package com.yunzhi.nanyang.service.impl;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.yunzhi.nanyang.common.Constants;
+import com.yunzhi.nanyang.common.StringUtils;
 import com.yunzhi.nanyang.entity.SysUserDataScope;
 import com.yunzhi.nanyang.mapper.SysUserDataScopeMapper;
 import com.yunzhi.nanyang.service.ISysUserDataScopeService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.stereotype.Service;
 
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.List;
+
 /**
  * <p>
  * 用户数据权限 服务实现类
@@ -17,4 +24,39 @@ import org.springframework.stereotype.Service;
 @Service
 public class SysUserDataScopeServiceImpl extends BaseServiceImpl<SysUserDataScopeMapper, SysUserDataScope> implements ISysUserDataScopeService {
 
+    @Override
+    public boolean checkOrgAccess(String orgId, String userId) {
+        // 人员空
+        if (StringUtils.isEmpty(userId)) return false;
+        // 组织空或者管理员
+        if (StringUtils.isEmpty(orgId) || Constants.ADMIN_ID.equals(userId)) return true;
+
+        Collection<SysUserDataScope> sysUserDataScopes = listByMap(new HashMap<String, Object>() {{
+            put("org_id", orgId);
+            put("user_id", userId);
+        }});
+
+        return null != sysUserDataScopes && sysUserDataScopes.size() > 0;
+    }
+
+    @Override
+    public boolean addNew(String orgId, String userId) {
+        Collection<SysUserDataScope> sysUserDataScopes = listByMap(new HashMap<String, Object>() {{
+            put("org_id", orgId);
+            put("user_id", userId);
+        }});
+
+        if (null != sysUserDataScopes && sysUserDataScopes.size() > 0) return true;
+
+        SysUserDataScope sysUserDataScope = new SysUserDataScope();
+        sysUserDataScope.setOrgId(orgId);
+        sysUserDataScope.setUserId(userId);
+
+        return save(sysUserDataScope);
+    }
+
+    @Override
+    public List<String> getAccessOrgs(String userId) {
+        return baseMapper.getAccessOrgs(userId);
+    }
 }

src/main/java/com/yunzhi/nanyang/service/impl/TaExtendContentServiceImpl.java

@@ -1,10 +1,16 @@
 package com.yunzhi.nanyang.service.impl;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.yunzhi.nanyang.common.StringUtils;
 import com.yunzhi.nanyang.entity.TaExtendContent;
 import com.yunzhi.nanyang.mapper.TaExtendContentMapper;
 import com.yunzhi.nanyang.service.ITaExtendContentService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.HashMap;
+import java.util.List;
 
 /**
  * <p>
@@ -17,4 +23,38 @@ import org.springframework.stereotype.Service;
 @Service
 public class TaExtendContentServiceImpl extends BaseServiceImpl<TaExtendContentMapper, TaExtendContent> implements ITaExtendContentService {
 
+    @Override
+    public List<TaExtendContent> listByTarget(String targetType, String targetId) {
+        QueryWrapper<TaExtendContent> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("target_type", targetType);
+        queryWrapper.eq("target_id", targetId);
+        queryWrapper.orderByAsc("sort");
+
+        return list(queryWrapper);
+    }
+
+    @Transactional(rollbackFor = Exception.class)
+    @Override
+    public boolean editContent(String targetType, String targetId, List<TaExtendContent> contentList) throws Exception {
+        // 先删除原有数据
+        removeByMap(new HashMap<String, Object>(){{
+            put("target_type", targetType);
+            put("target_id", targetId);
+        }});
+
+        if (contentList == null || contentList.isEmpty()) return true;
+
+        for (TaExtendContent content : contentList) {
+            content.setTargetType(targetType);
+            content.setTargetId(targetId);
+
+            if (StringUtils.isEmpty(content.getExtId())) {
+                save(content);
+            } else {
+                updateById(content);
+            }
+        }
+
+        return true;
+    }
 }

src/main/java/com/yunzhi/nanyang/service/impl/TaMachineryServiceImpl.java

@@ -1,10 +1,23 @@
 package com.yunzhi.nanyang.service.impl;
 
+import com.yunzhi.nanyang.common.Constants;
+import com.yunzhi.nanyang.common.StringUtils;
+import com.yunzhi.nanyang.entity.TaImages;
 import com.yunzhi.nanyang.entity.TaMachinery;
+import com.yunzhi.nanyang.entity.TaRegion;
+import com.yunzhi.nanyang.entity.TdMachineryType;
+import com.yunzhi.nanyang.mapper.TaImagesMapper;
 import com.yunzhi.nanyang.mapper.TaMachineryMapper;
+import com.yunzhi.nanyang.mapper.TaRegionMapper;
+import com.yunzhi.nanyang.mapper.TdMachineryTypeMapper;
 import com.yunzhi.nanyang.service.ITaMachineryService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.HashMap;
+import java.util.List;
 
 /**
  * <p>
@@ -17,4 +30,104 @@ import org.springframework.stereotype.Service;
 @Service
 public class TaMachineryServiceImpl extends BaseServiceImpl<TaMachineryMapper, TaMachinery> implements ITaMachineryService {
 
+    @Autowired
+    TaImagesMapper taImagesMapper;
+
+    @Autowired
+    TdMachineryTypeMapper tdMachineryTypeMapper;
+
+    @Autowired
+    TaRegionMapper taRegionMapper;
+
+    @Transactional(rollbackFor = Exception.class)
+    @Override
+    public boolean saveAll(TaMachinery taMachinery) throws Exception {
+        setRedundanceName(taMachinery);
+
+        boolean isOk = save(taMachinery);
+        if (!isOk) return false;
+
+        // 图片保存失败不影响主记录
+        try {
+            saveImages(taMachinery);
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+
+        return true;
+    }
+
+    @Override
+    public boolean updateAll(TaMachinery taMachinery) throws Exception {
+        setRedundanceName(taMachinery);
+
+        boolean isOk = updateById(taMachinery);
+        if (!isOk) return false;
+
+        // 图片保存失败不影响主记录
+        try {
+            saveImages(taMachinery);
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+
+        return true;
+    }
+
+    @Override
+    public TaMachinery getDetail(String machineryId) {
+        TaMachinery taMachinery = getExistBy("machinery_id", machineryId, false, true);
+        if (null == taMachinery) return null;
+
+        setRedundanceName(taMachinery);
+
+        List<TaImages> images = taImagesMapper.getListBy(Constants.TARGET_MACHINERY, machineryId);
+        taMachinery.setImages(images);
+
+        return taMachinery;
+    }
+
+    private void saveImages(TaMachinery taMachinery) {
+        String machineryId = taMachinery.getMachineryId();
+        // 先删除所有
+        taImagesMapper.deleteByMap(new HashMap<String, Object>(){{
+            put("target_id", machineryId);
+            put("target_type", Constants.TARGET_MACHINERY);
+        }});
+
+        List<TaImages> images = taMachinery.getImages();
+        if (null != images && images.size() > 0) {
+            for (TaImages image : images) {
+                if (!StringUtils.isEmpty(image.getUrl())) {
+                    image.setTargetId(machineryId);
+                    image.setTargetType(Constants.TARGET_MACHINERY);
+                    taImagesMapper.insert(image);
+                }
+            }
+        }
+    }
+
+    private void setRedundanceName(TaMachinery taMachinery) {
+        // 分类
+        if (!StringUtils.isEmpty(taMachinery.getTypeId())) {
+            TdMachineryType tdMachineryType = tdMachineryTypeMapper.selectById(taMachinery.getTypeId());
+            if (null != tdMachineryType && tdMachineryType.getStatus() > Constants.STATUS_DELETE) {
+                taMachinery.setTypeName(tdMachineryType.getName());
+            } else {
+                taMachinery.setTypeId(null);
+                taMachinery.setTypeName(null);
+            }
+        }
+
+        // 所属区域
+        if (!StringUtils.isEmpty(taMachinery.getRegionId())) {
+            TaRegion taRegion = taRegionMapper.selectById(taMachinery.getRegionId());
+            if (null != taRegion && taRegion.getStatus() > Constants.STATUS_DELETE) {
+                taMachinery.setRegionName(taRegion.getName());
+            } else {
+                taMachinery.setRegionId(null);
+                taMachinery.setRegionName(null);
+            }
+        }
+    }
 }

src/main/java/com/yunzhi/nanyang/service/impl/TaPersonServiceImpl.java

@@ -17,4 +17,8 @@ import org.springframework.stereotype.Service;
 @Service
 public class TaPersonServiceImpl extends BaseServiceImpl<TaPersonMapper, TaPerson> implements ITaPersonService {
 
+    @Override
+    public TaPerson getByOpenId(String appid, String openid) {
+        return baseMapper.getByOpenId(appid, openid);
+    }
 }

src/main/java/com/yunzhi/nanyang/shiro/ShiroConfig.java

@@ -1,11 +1,20 @@
 package com.yunzhi.nanyang.shiro;
 
 import com.yunzhi.nanyang.shiro.filters.JWTFilter;
+import com.yunzhi.nanyang.shiro.filters.ManagerFilter;
+import com.yunzhi.nanyang.shiro.filters.MiniappFilter;
 import com.yunzhi.nanyang.shiro.matcher.JWTCredentialsMatcher;
 import com.yunzhi.nanyang.shiro.realms.manager.IManagerService;
 import com.yunzhi.nanyang.shiro.realms.manager.ManagerRealm;
+import com.yunzhi.nanyang.shiro.realms.miniapp.MiniappRealm;
+import org.apache.shiro.authc.Authenticator;
+import org.apache.shiro.authc.pam.AtLeastOneSuccessfulStrategy;
+import org.apache.shiro.authc.pam.FirstSuccessfulStrategy;
+import org.apache.shiro.authc.pam.ModularRealmAuthenticator;
+import org.apache.shiro.authz.Authorizer;
 import org.apache.shiro.mgt.DefaultSessionStorageEvaluator;
 import org.apache.shiro.mgt.DefaultSubjectDAO;
+import org.apache.shiro.realm.Realm;
 import org.apache.shiro.spring.web.ShiroFilterFactoryBean;
 import org.apache.shiro.web.mgt.DefaultWebSecurityManager;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -14,7 +23,9 @@ import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 
 import javax.servlet.Filter;
+import java.util.ArrayList;
 import java.util.HashMap;
+import java.util.List;
 import java.util.Map;
 
 @Configuration
@@ -37,16 +48,26 @@ public class ShiroConfig {
         return realm;
     }
 
+    @Bean
+    public MiniappRealm miniappRealm() {
+        MiniappRealm realm = new MiniappRealm();
+        realm.setCredentialsMatcher(new JWTCredentialsMatcher());
+        return realm;
+    }
+
     @Bean("shiroFilterFactoryBean")
     public ShiroFilterFactoryBean factory(DefaultWebSecurityManager securityManager) {
         ShiroFilterFactoryBean factoryBean = new ShiroFilterFactoryBean();
 
-        // 手动加入 JWTFilter
-        JWTFilter jwtFilter = new JWTFilter();
-        jwtFilter.setUnauthorizedUrl(unauthorizedUrl);
+        // 手动加入 Filter
+        ManagerFilter managerFilter = new ManagerFilter();
+        managerFilter.setUnauthorizedUrl(unauthorizedUrl);
+        MiniappFilter miniappFilter = new MiniappFilter();
+        miniappFilter.setUnauthorizedUrl(unauthorizedUrl);
 
         Map<String, Filter> filterMap = new HashMap<>();
-        filterMap.put("jwt", jwtFilter);
+        filterMap.put("manager", managerFilter);
+        filterMap.put("miniapp", miniappFilter);
         factoryBean.setFilters(filterMap);
 
         factoryBean.setSecurityManager(securityManager);
@@ -59,8 +80,17 @@ public class ShiroConfig {
     @Bean("securityManager")
     public DefaultWebSecurityManager securityManager() {
         DefaultWebSecurityManager manager = new DefaultWebSecurityManager();
+        // 修改多 Realm 的处理逻辑
+        ModularRealmAuthenticator realmAuthenticator = (ModularRealmAuthenticator) manager.getAuthenticator();
+        // 主要有一个 Realm 成功, 就立即返回
+        realmAuthenticator.setAuthenticationStrategy(new AtLeastOneSuccessfulStrategy());
+
         //  Use your own realm
-        manager.setRealm(managerRealm());
+        List<Realm> realmList = new ArrayList<Realm>() {{
+            add(managerRealm());
+            add(miniappRealm());
+        }};
+        manager.setRealms(realmList);
 
         /*
          * 禁用 session

src/main/java/com/yunzhi/nanyang/shiro/filters/JWTFilter.java

@@ -1,8 +1,6 @@
 package com.yunzhi.nanyang.shiro.filters;
 
-import com.yunzhi.nanyang.shiro.utils.JWTToken;
 import com.yunzhi.nanyang.shiro.utils.JWTUtil;
-import org.apache.shiro.authc.AuthenticationException;
 import org.apache.shiro.authc.AuthenticationToken;
 import org.apache.shiro.subject.Subject;
 import org.apache.shiro.web.filter.authc.AuthenticatingFilter;
@@ -17,7 +15,7 @@ import java.io.IOException;
 import java.io.UnsupportedEncodingException;
 import java.net.URLEncoder;
 
-public class JWTFilter extends AuthenticatingFilter {
+public abstract class JWTFilter extends AuthenticatingFilter {
 
     private Logger LOGGER = LoggerFactory.getLogger(this.getClass());
 
@@ -31,35 +29,15 @@ public class JWTFilter extends AuthenticatingFilter {
         this.unauthorizedUrl = unauthorizedUrl;
     }
 
-    @Override
-    protected AuthenticationToken createToken(ServletRequest servletRequest, ServletResponse servletResponse) throws Exception {
-        String authorization = WebUtils.toHttp(servletRequest).getHeader(JWT_HEADER);
-        if (authorization == null || "".equals(authorization)) {
-            throw new Exception("请先登录系统");
-        }
-
-        return new JWTToken(authorization);
-    }
-
-    @Override
-    protected boolean executeLogin(ServletRequest request, ServletResponse response) throws Exception {
-        AuthenticationToken token = this.createToken(request, response);
-        Subject subject = this.getSubject(request, response);
-        subject.login(token);
-        return this.onLoginSuccess(token, subject, request, response);
-    }
-
     @Override
     protected boolean isAccessAllowed(ServletRequest request, ServletResponse response, Object mappedValue) {
-        boolean allowed = false;
         try {
-            allowed = executeLogin(request, response);
+            return executeLogin(request, response);
         } catch (Exception e) {
             response401(request, response, e);
         }
 
-        return allowed;
-//        return allowed || super.isPermissive(mappedValue);
+        return false;
     }
 
     @Override
@@ -67,6 +45,9 @@ public class JWTFilter extends AuthenticatingFilter {
         return false;
     }
 
+    @Override
+    protected abstract AuthenticationToken createToken(ServletRequest servletRequest, ServletResponse servletResponse) throws Exception;
+
     // 主要用来刷新 token
     @Override
     protected boolean onLoginSuccess(AuthenticationToken token, Subject subject, ServletRequest request, ServletResponse response) throws Exception {
@@ -84,7 +65,7 @@ public class JWTFilter extends AuthenticatingFilter {
     /**
      *Jump illegal request to / 401
      */
-    private void response401(ServletRequest request, ServletResponse response, Exception e) {
+    protected void response401(ServletRequest request, ServletResponse response, Exception e) {
         String message = "";
         if (e != null) {
             try {

src/main/java/com/yunzhi/nanyang/shiro/filters/ManagerFilter.java

@@ -0,0 +1,29 @@
+package com.yunzhi.nanyang.shiro.filters;
+
+import com.yunzhi.nanyang.shiro.utils.JWTToken;
+import com.yunzhi.nanyang.shiro.utils.MiniappToken;
+import org.apache.shiro.authc.AuthenticationToken;
+import org.apache.shiro.web.util.WebUtils;
+
+import javax.servlet.ServletRequest;
+import javax.servlet.ServletResponse;
+import javax.servlet.http.HttpServletRequest;
+
+/**
+ * ManagerFilter 与 MiniappFilter 实际上是一样的，只是返回的 token 类型不一致
+ */
+public class ManagerFilter extends JWTFilter {
+
+    @Override
+    protected AuthenticationToken createToken(ServletRequest servletRequest, ServletResponse servletResponse) throws Exception {
+        HttpServletRequest request = WebUtils.toHttp(servletRequest);
+        String authorization = request.getHeader(JWT_HEADER);
+        if (authorization == null || "".equals(authorization)) {
+            throw new Exception("请先登录系统");
+        }
+
+        return new JWTToken(authorization);
+    }
+
+
+}

src/main/java/com/yunzhi/nanyang/shiro/filters/MiniappFilter.java

@@ -0,0 +1,25 @@
+package com.yunzhi.nanyang.shiro.filters;
+
+import com.yunzhi.nanyang.shiro.utils.JWTToken;
+import com.yunzhi.nanyang.shiro.utils.MiniappToken;
+import org.apache.shiro.authc.AuthenticationToken;
+import org.apache.shiro.web.util.WebUtils;
+
+import javax.servlet.ServletRequest;
+import javax.servlet.ServletResponse;
+import javax.servlet.http.HttpServletRequest;
+
+public class MiniappFilter  extends JWTFilter {
+
+    @Override
+    protected AuthenticationToken createToken(ServletRequest servletRequest, ServletResponse servletResponse) throws Exception {
+        HttpServletRequest request = WebUtils.toHttp(servletRequest);
+        String authorization = request.getHeader(JWT_HEADER);
+        if (authorization == null || "".equals(authorization)) {
+            throw new Exception("请先登录系统");
+        }
+
+        return new MiniappToken(authorization);
+    }
+
+}

src/main/java/com/yunzhi/nanyang/shiro/realms/manager/ManagerRealm.java

@@ -4,6 +4,7 @@ import com.auth0.jwt.exceptions.JWTDecodeException;
 import com.auth0.jwt.exceptions.TokenExpiredException;
 import com.yunzhi.nanyang.shiro.utils.JWTToken;
 import com.yunzhi.nanyang.shiro.utils.JWTUtil;
+import lombok.extern.slf4j.Slf4j;
 import org.apache.shiro.authc.*;
 import org.apache.shiro.authz.AuthorizationInfo;
 import org.apache.shiro.authz.SimpleAuthorizationInfo;
@@ -12,10 +13,16 @@ import org.apache.shiro.subject.PrincipalCollection;
 
 import java.util.Set;
 
+@Slf4j
 public class ManagerRealm extends AuthorizingRealm {
 
     IManagerService iManagerService;
 
+    @Override
+    public String getName() {
+        return "managerRealm";
+    }
+
     public void setManagerService(IManagerService iManagerService) {
         this.iManagerService = iManagerService;
     }
@@ -41,6 +48,8 @@ public class ManagerRealm extends AuthorizingRealm {
 
     @Override
     protected AuthenticationInfo doGetAuthenticationInfo(AuthenticationToken authenticationToken) throws AuthenticationException {
+        log.info("===========ManagerRealm===========");
+
         String token = (String) authenticationToken.getPrincipal();
 
         // 这里进行 token 验证, CredentialsMatcher 就不做了

src/main/java/com/yunzhi/nanyang/shiro/realms/miniapp/MiniappRealm.java

@@ -0,0 +1,44 @@
+package com.yunzhi.nanyang.shiro.realms.miniapp;
+
+import com.auth0.jwt.exceptions.JWTDecodeException;
+import com.auth0.jwt.exceptions.TokenExpiredException;
+import com.yunzhi.nanyang.shiro.utils.JWTUtil;
+import com.yunzhi.nanyang.shiro.utils.MiniappToken;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.shiro.authc.*;
+import org.apache.shiro.realm.AuthenticatingRealm;
+
+@Slf4j
+public class MiniappRealm extends AuthenticatingRealm {
+
+    @Override
+    public String getName() {
+        return "miniappRealm";
+    }
+
+    @Override
+    public boolean supports(AuthenticationToken token) {
+        return token instanceof MiniappToken;
+    }
+
+    @Override
+    protected AuthenticationInfo doGetAuthenticationInfo(AuthenticationToken authenticationToken) throws AuthenticationException {
+        log.info("===========MiniappRealm===========");
+
+        String token = (String) authenticationToken.getPrincipal();
+
+        // 这里进行 token 验证, CredentialsMatcher 就不做了
+        try {
+            JWTUtil.verify(token);
+        } catch (JWTDecodeException e1) {
+            throw new AuthenticationException("非法的权限凭证");
+        } catch (TokenExpiredException e2) {
+            throw new ExpiredCredentialsException("授权过期, 请重新登录");
+        } catch (Exception e) {
+            e.printStackTrace();
+            throw new AuthenticationException("凭证校验失败, 请重新登录");
+        }
+        // 交给 AuthenticatingRealm 使用 CredentialsMatcher 行校验
+        return new SimpleAuthenticationInfo(token, token, getName());
+    }
+}

src/main/java/com/yunzhi/nanyang/shiro/utils/MiniappToken.java

@@ -0,0 +1,23 @@
+package com.yunzhi.nanyang.shiro.utils;
+
+import org.apache.shiro.authc.AuthenticationToken;
+
+public class MiniappToken implements AuthenticationToken {
+
+    //Key
+    private String token;
+
+    public MiniappToken(String token) {
+        this.token = token;
+    }
+
+    @Override
+    public Object getPrincipal() {
+        return token;
+    }
+
+    @Override
+    public Object getCredentials() {
+        return token;
+    }
+}

src/main/java/com/yunzhi/nanyang/vo/LoginParam.java

@@ -11,6 +11,9 @@ public class LoginParam {
     @ApiModelProperty("登录方式")
     String loginType;
 
+    @ApiModelProperty("code")
+    String code;
+
     @ApiModelProperty("用户名")
     String userName;
 

src/main/java/com/yunzhi/nanyang/vo/PhoneParam.java

@@ -0,0 +1,17 @@
+package com.yunzhi.nanyang.vo;
+
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@ApiModel(value = "手机号信息", description = "手机号信息")
+@Data
+public class PhoneParam {
+
+    @ApiModelProperty("手机号")
+    private String phone;
+
+    @ApiModelProperty("验证码")
+    private String captcha;
+}

src/main/java/com/yunzhi/nanyang/vo/WxMaAuthParam.java

@@ -0,0 +1,26 @@
+package com.yunzhi.nanyang.vo;
+
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@ApiModel(value = "微信小程序授权", description = "微信小程序授权参数")
+@Data
+public class WxMaAuthParam {
+
+    @ApiModelProperty("signature")
+    String signature;
+
+    @ApiModelProperty("rawData")
+    String rawData;
+
+    @ApiModelProperty("encryptedData")
+    String encryptedData;
+
+    @ApiModelProperty("iv")
+    String iv;
+
+    @ApiModelProperty("sessionKey")
+    String sessionKey;
+}

src/main/java/com/yunzhi/nanyang/vo/WxMaPreload.java

@@ -0,0 +1,32 @@
+package com.yunzhi.nanyang.vo;
+
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@ApiModel(description = "小程序预加载参数")
+@Data
+public class WxMaPreload {
+
+    @ApiModelProperty("小程序标识")
+    String appid;
+
+    @ApiModelProperty("用户设置的 TOKEN")
+    String token;
+
+    @ApiModelProperty("用户登录凭证")
+    String code;
+
+    @ApiModelProperty("时间戳，微信客户端发起请求的时间")
+    Integer timestamp;
+
+    @ApiModelProperty("打开小程序的路径")
+    String path;
+
+    @ApiModelProperty("打开小程序的query")
+    String query;
+
+    @ApiModelProperty("打开小程序的场景值")
+    Integer scene;
+}

src/main/resources/application.yml

@@ -10,7 +10,11 @@ shiro:
   unauthorizedUrl: /api/401
   filterRuleMap: '{
     "/admin/login": "anon",
-    "/admin/**": "jwt",
+    "/admin/**": "manager",
+    "/wx/**/login": "anon",
+    "/wx/**": "miniapp",
+    "/**/sms-captcha": "anon",
+    "/wx/**/sms-captcha": "anon",
     "/**": "anon"
   }'
 
@@ -40,12 +44,17 @@ yz:
 
 ###
 aliyun:
-  accessKeyId: LTAI4FdMQNh1xUoiqqbKJ15J
-  accessKeySecret: F7vmuXBu8IrhouQYYhFMLRhIRivIzb
+  accessKeyId: LTAI5tGjnZY6k799BHxhmqcm
+  accessKeySecret: eU1DmULbgHe2dnIg3P93634PO2vEh5
   oss:
-    endpoint: oss-cn-shanghai.aliyuncs.com
-    bucketName: njcj
-    bucketURL: https://njcj.oss-cn-shanghai.aliyuncs.com
+    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
   sms:
     captcha:
       code: SMS_195585471

src/main/resources/mapper/SysMenuMapper.xml

@@ -9,7 +9,7 @@
             1 AS can_access
         </if>
         <if test="!isAdmin">
-            IF ( s.role_id IS NULL, 0, 1 ) AS can_access
+            IF ( m.role_id IS NULL, 0, 1 ) AS can_access
         </if>
         FROM
             sys_menu t

src/main/resources/mapper/SysMiniappMapper.xml

@@ -0,0 +1,5 @@
+<?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.yunzhi.nanyang.mapper.SysMiniappMapper">
+
+</mapper>

src/main/resources/mapper/SysUserDataScopeMapper.xml

@@ -2,4 +2,12 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.yunzhi.nanyang.mapper.SysUserDataScopeMapper">
 
+    <select id="getAccessOrgs" resultType="java.lang.String">
+        SELECT
+            t.org_id
+        FROM
+            sys_user_data_scope t
+        WHERE
+            t.user_id = #{userId}
+    </select>
 </mapper>

src/main/resources/mapper/TaImagesMapper.xml

@@ -2,4 +2,16 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.yunzhi.nanyang.mapper.TaImagesMapper">
 
+    <select id="getListBy" resultType="com.yunzhi.nanyang.entity.TaImages">
+        SELECT
+            *
+        FROM
+            ta_images t
+        WHERE
+            t.target_type = #{targetType}
+          AND t.target_id = #{targetId}
+          AND t.`status` = 1
+        ORDER BY
+            t.create_date ASC
+    </select>
 </mapper>