feats

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

@@ -15,13 +15,13 @@ import java.util.List;
 public class BaseController {
 
     @Autowired
-    ISysUserService iSysUserService;
+    protected ISysUserService iSysUserService;
 
     @Autowired
-    ITaPersonService iTaPersonService;
+    protected ITaPersonService iTaPersonService;
 
     @Autowired
-    ISysUserDataScopeService iSysUserDataScopeService;
+    protected ISysUserDataScopeService iSysUserDataScopeService;
 
     public String getLoginId() {
         return StpUtil.getLoginIdAsString();

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

@@ -0,0 +1,14 @@
+package com.yunzhi.nanyang.config;
+
+import lombok.Data;
+import org.springframework.boot.context.properties.ConfigurationProperties;
+import org.springframework.stereotype.Component;
+
+import java.util.List;
+
+@Data
+@Component
+@ConfigurationProperties(prefix = "yz.filter")
+public class FilterConfig {
+    List<String> annList;
+}

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

@@ -1,8 +1,17 @@
 package com.yunzhi.nanyang.config;
 
+import cn.dev33.satoken.context.SaHolder;
+import cn.dev33.satoken.exception.NotLoginException;
+import cn.dev33.satoken.filter.SaServletFilter;
 import cn.dev33.satoken.interceptor.SaRouteInterceptor;
 import cn.dev33.satoken.jwt.StpLogicJwtForStateless;
+import cn.dev33.satoken.router.SaHttpMethod;
+import cn.dev33.satoken.router.SaRouter;
 import cn.dev33.satoken.stp.StpLogic;
+import cn.dev33.satoken.stp.StpUtil;
+import com.alibaba.fastjson.JSONObject;
+import com.yunzhi.nanyang.common.ResponseBean;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.web.servlet.config.annotation.InterceptorRegistry;
@@ -12,29 +21,63 @@ import java.util.ArrayList;
 import java.util.List;
 
 @Configuration
-public class SaTokenConfigure implements WebMvcConfigurer {
-    // 注册拦截器
-    @Override
-    public void addInterceptors(InterceptorRegistry registry) {
-
-        List<String> anonList = new ArrayList<>();
-        anonList.add("/swagger-ui/**");
-        anonList.add("/swagger-resources/**");
-        anonList.add("/v2/**");
-        anonList.add("/wxpay/notify/**");
-        anonList.add("/alipay/notify/**");
-        anonList.add("/**/sms-captcha");
-        anonList.add("/**/**/sms-captcha");
-        anonList.add("/**/preload");
-        anonList.add("/**/login");
-        anonList.add("/**/**/login");
-
-        // 注册Sa-Token的路由拦截器
-        registry.addInterceptor(new SaRouteInterceptor())
-                .addPathPatterns("/**")
-                .excludePathPatterns(anonList.toArray(new String[0]));
+public class SaTokenConfigure {
+//public class SaTokenConfigure implements WebMvcConfigurer {
+
+    @Autowired
+    FilterConfig filterConfig;
+
+    @Bean
+    public SaServletFilter getSaServletFilter() {
+        SaServletFilter saServletFilter = new SaServletFilter();
+        saServletFilter.addInclude("/**");
+        saServletFilter.addExclude(filterConfig.getAnnList().toArray(new String[0]));
+        saServletFilter.setAuth(auth -> {
+            // OPTIONS 请求不校验, 主要是为了解决跨域问题
+            SaRouter.notMatch(SaHttpMethod.OPTIONS).check(r -> StpUtil.checkLogin());
+        });
+
+        saServletFilter.setError(err -> {
+            SaHolder.getResponse().setHeader("Content-Type", "application/json;charset=UTF-8");
+            SaHolder.getResponse().setStatus(200);
+
+            ResponseBean responseBean = new ResponseBean<>();
+            responseBean.setMessage(err.getMessage());
+            if (err instanceof NotLoginException) {
+                responseBean.setCode(ResponseBean.ERROR_AUTH_FAIL);
+            } else {
+                responseBean.setCode(ResponseBean.ERROR_UNAVAILABLE);
+            }
+
+            String jsonStr = JSONObject.toJSONString(responseBean);
+            return jsonStr;
+        });
+
+        return saServletFilter;
     }
 
+//    // 注册拦截器
+//    @Override
+//    public void addInterceptors(InterceptorRegistry registry) {
+//
+//        List<String> anonList = new ArrayList<>();
+//        anonList.add("/swagger-ui/**");
+//        anonList.add("/swagger-resources/**");
+//        anonList.add("/v2/**");
+//        anonList.add("/wxpay/notify/**");
+//        anonList.add("/alipay/notify/**");
+//        anonList.add("/**/sms-captcha");
+//        anonList.add("/**/**/sms-captcha");
+//        anonList.add("/**/preload");
+//        anonList.add("/**/login");
+//        anonList.add("/**/**/login");
+//
+//        // 注册Sa-Token的路由拦截器
+//        registry.addInterceptor(new SaRouteInterceptor())
+//                .addPathPatterns("/**")
+//                .excludePathPatterns(anonList.toArray(new String[0]));
+//    }
+
 
 
     // Sa-Token 整合 jwt (Style模式)

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

@@ -55,9 +55,12 @@ public class MobileController extends BaseController {
             return ResponseBean.error("验证码不正确或者已过期");
         }
 
-        SysUser sysUser = iSysUserService.getExistBy("phone", phone, false, true);
-        if (null == sysUser) {
-            return ResponseBean.error("未找到对应手机号的农机手信息");
+        // 如果是农机手
+        if (Constants.CLIENT_WORKER.equals(clientId)) {
+            SysUser sysUser = iSysUserService.getExistBy("phone", phone, false, true);
+            if (null == sysUser) {
+                return ResponseBean.error("未找到对应手机号的农机手信息");
+            }
         }
 
         TaPerson taPerson = iTaPersonService.getByPhone(clientId, phone);

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

@@ -6,11 +6,9 @@ import com.yunzhi.nanyang.common.Constants;
 import com.yunzhi.nanyang.common.ResponseBean;
 import com.yunzhi.nanyang.entity.TaMachinery;
 import com.yunzhi.nanyang.entity.TaOrg;
+import com.yunzhi.nanyang.entity.TaWorkMessage;
 import com.yunzhi.nanyang.entity.TdMachineryType;
-import com.yunzhi.nanyang.service.ITaMachineryService;
-import com.yunzhi.nanyang.service.ITaOrderService;
-import com.yunzhi.nanyang.service.ITaOrgService;
-import com.yunzhi.nanyang.service.ITdMachineryTypeService;
+import com.yunzhi.nanyang.service.*;
 import com.yunzhi.nanyang.vo.ChartParam;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -42,6 +40,9 @@ public class ScreenDataController extends BaseController {
     @Autowired
     ITaOrgService iTaOrgService;
 
+    @Autowired
+    ITaWorkMessageService iTaWorkMessageService;
+
 
     @GetMapping("/basic")
     @ApiOperation(value="基本数据统计", notes = "基本数据统计", httpMethod = "GET", response = ResponseBean.class)
@@ -105,8 +106,16 @@ public class ScreenDataController extends BaseController {
 
     @GetMapping("/machinery/all")
     @ApiOperation(value="依据类型查询农机", notes = "依据类型查询农机", httpMethod = "GET", response = ResponseBean.class)
-    public ResponseBean getMachineryOfType(@ApiParam("农机类型") @RequestParam("typeId") String typeId) throws Exception {
+    public ResponseBean getMachineryOfType(@ApiParam("农机类型") @RequestParam(value = "typeId", required = false) String typeId) throws Exception {
         List<TaMachinery> result = iTaMachineryService.listByTypeWithLoc(typeId);
         return ResponseBean.success(result);
     }
+
+    @GetMapping("/message")
+    @ApiOperation(value="获取消息通知", notes = "获取消息通知", httpMethod = "GET", response = ResponseBean.class)
+    public ResponseBean getMessage(@ApiParam("数据条数") @RequestParam(value = "limit", defaultValue = "20") Integer limit,
+                                   @ApiParam(value = "消息类型, appoint 预约消息, accept 作业消息", allowableValues = "appoint,accept") @RequestParam(value = "messageType", required = false) String messageType) throws Exception {
+        List<TaWorkMessage> result = iTaWorkMessageService.listByType(messageType, limit);
+        return ResponseBean.success(result);
+    }
 }

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

@@ -156,6 +156,9 @@ public class SysUserController extends BaseController {
             iTaOrgService.updateNum(sysUser.getOrgId(), "worker_num", -1);
             iSysLoginService.removeLogicByUser(id);
 
+            // 解绑人员
+            iTaPersonService.unBindUser(id);
+
             return ResponseBean.success("success");
         }else {
             return ResponseBean.error("删除失败, 请重试", ResponseBean.ERROR_UNAVAILABLE);

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

@@ -59,6 +59,9 @@ public class TaOrderController extends BaseController {
     @Autowired
     public ITaDispatchService iTaDispatchService;
 
+    @Autowired
+    public ITaWorkMessageService iTaWorkMessageService;
+
     /**
      * 分页查询列表
      * @param pageNum
@@ -172,6 +175,7 @@ public class TaOrderController extends BaseController {
         }
 
         if (iTaOrderService.save(taOrder)){
+            iTaWorkMessageService.appoints(taOrder, taPerson);
             return ResponseBean.success(taOrder);
         }else {
             return ResponseBean.error("保存失败, 请重试", ResponseBean.ERROR_UNAVAILABLE);

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

@@ -0,0 +1,59 @@
+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 com.yunzhi.nanyang.common.StringUtils;
+import com.yunzhi.nanyang.entity.TaMessage;
+import com.yunzhi.nanyang.entity.TaWorkMessage;
+import com.yunzhi.nanyang.service.ITaWorkMessageService;
+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.*;
+
+/**
+ * <p>
+    * 作业消息表 前端控制器
+    * </p>
+ *
+ * @author yansen
+ * @since 2022-03-08
+ */
+
+@Api(tags = "作业消息表")
+@RestController
+@RequestMapping("/")
+public class TaWorkMessageController extends BaseController {
+
+    private final Logger logger = LoggerFactory.getLogger(TaWorkMessageController.class);
+
+    @Autowired
+    ITaWorkMessageService iTaWorkMessageService;
+
+    /**
+     * 分页查询列表
+     * @param pageNum
+     * @param pageSize
+     * @return
+     */
+    @RequestMapping(value="/admin/work-message",method= RequestMethod.GET)
+    @ApiOperation(value="列表", notes = "列表", httpMethod = "GET", response = ResponseBean.class)
+    public ResponseBean getList(@ApiParam("页码") @RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
+                                @ApiParam("单页数据量") @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize,
+                                @ApiParam("消息类型") @RequestParam(value ="messageType", required = false) String messageType) throws Exception{
+
+        IPage<TaWorkMessage> pg = new Page<>(pageNum, pageSize);
+        QueryWrapper<TaWorkMessage> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq(StringUtils.isEmpty(messageType), "message_type", messageType);
+        queryWrapper.orderByDesc("create_date");
+
+        IPage<TaWorkMessage> result = iTaWorkMessageService.page(pg, queryWrapper);
+        return ResponseBean.success(result);
+    }
+}

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

@@ -0,0 +1,59 @@
+package com.yunzhi.nanyang.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
+/**
+ * <p>
+ * 作业消息
+ * </p>
+ *
+ * @author yansen
+ * @since 2022-03-08
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@ApiModel(value="TaWorkMessage对象", description="作业消息")
+public class TaWorkMessage implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "消息id")
+    @TableId(value = "message_id", type = IdType.AUTO)
+    private Integer messageId;
+
+    @ApiModelProperty(value = "消息类型")
+    private String messageType;
+
+    @ApiModelProperty(value = "预约人")
+    private String appointPerson;
+
+    @ApiModelProperty(value = "预约时间")
+    private LocalDateTime appointTime;
+
+    @ApiModelProperty(value = "预约机型")
+    private String appointMachineryType;
+
+    @ApiModelProperty(value = "接单人")
+    private String acceptPerson;
+
+    @ApiModelProperty(value = "接单时间")
+    private LocalDateTime acceptTime;
+
+    @ApiModelProperty(value = "距离")
+    private Integer distance;
+
+    @ApiModelProperty(value = "创建时间")
+    private LocalDateTime createDate;
+
+
+}

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

@@ -33,6 +33,9 @@ public class TdMachineryType implements Serializable {
     @ApiModelProperty(value = "类型名")
     private String name;
 
+    @ApiModelProperty(value = "纳入大屏统计")
+    private Integer screenStatis;
+
     @ApiModelProperty(value = "状态")
     private Integer status;
 

src/main/java/com/yunzhi/nanyang/exception/GlobalExceptionHandler.java

@@ -1,5 +1,6 @@
 package com.yunzhi.nanyang.exception;
 
+import cn.dev33.satoken.exception.NotLoginException;
 import cn.dev33.satoken.exception.SaTokenException;
 import com.yunzhi.nanyang.common.ResponseBean;
 import lombok.extern.slf4j.Slf4j;
@@ -16,8 +17,10 @@ public class GlobalExceptionHandler {
     public ResponseBean handleException(Exception e){
         e.printStackTrace();
 
-        if (e instanceof SaTokenException) {
-            return ResponseBean.error("暂无权限进行当前操作", ResponseBean.ERROR_UNAUTHORIZED);
+        if (e instanceof NotLoginException) {
+            return ResponseBean.error(e.getMessage(), ResponseBean.ERROR_AUTH_FAIL);
+        } else if (e instanceof SaTokenException) {
+            return ResponseBean.error(e.getMessage(), ResponseBean.ERROR_UNAUTHORIZED);
         }
 
         String err = e.getMessage();

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

@@ -10,6 +10,8 @@ import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Select;
 import org.apache.ibatis.annotations.Update;
 
+import java.util.List;
+
 /**
  * <p>
  * 农机表 Mapper 接口
@@ -47,4 +49,6 @@ public interface TaMachineryMapper extends BaseMapper<TaMachinery> {
 
     @Select("SELECT 'machinery' as `name`, count(*) as `value` FROM ta_machinery WHERE `status` > -1")
     ChartParam statisTotal();
+
+    List<TaMachinery> listByTypeWithLoc(@Param("typeId") String typeId);
 }

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

@@ -32,4 +32,6 @@ public interface TaPersonMapper extends BaseMapper<TaPerson> {
     TaPerson getByPhone(@Param("clientId") String clientId,@Param("phone")  String phone);
 
     IPage<TaPerson> getPageBy(IPage<TaPerson> pg, @Param("identity") String identity, @Param("nickName") String nickName, @Param("phone") String phone);
+
+    int unBindUser(String userId);
 }

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

@@ -0,0 +1,18 @@
+package com.yunzhi.nanyang.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.yunzhi.nanyang.entity.TaWorkMessage;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * <p>
+ * 作业消息 Mapper 接口
+ * </p>
+ *
+ * @author yansen
+ * @since 2022-03-08
+ */
+@Mapper
+public interface TaWorkMessageMapper extends BaseMapper<TaWorkMessage> {
+
+}

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

@@ -24,4 +24,6 @@ public interface ITaPersonService extends IBaseService<TaPerson> {
     TaPerson getByPhone(String clientId, String phone);
 
     IPage<TaPerson> getPageBy(IPage<TaPerson> pg, String identity, String nickName, String phone);
+
+    boolean unBindUser(String userId) throws Exception;
 }

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

@@ -0,0 +1,22 @@
+package com.yunzhi.nanyang.service;
+
+import com.yunzhi.nanyang.entity.TaOrder;
+import com.yunzhi.nanyang.entity.TaPerson;
+import com.yunzhi.nanyang.entity.TaWorkMessage;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 作业消息 服务类
+ * </p>
+ *
+ * @author yansen
+ * @since 2022-03-08
+ */
+public interface ITaWorkMessageService extends IBaseService<TaWorkMessage> {
+
+    void appoints(TaOrder taOrder, TaPerson taPerson);
+
+    List<TaWorkMessage> listByType(String messageType, Integer limit);
+}

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

@@ -5,9 +5,11 @@ import com.yunzhi.nanyang.common.Constants;
 import com.yunzhi.nanyang.entity.TaDispatch;
 import com.yunzhi.nanyang.entity.TaOrder;
 import com.yunzhi.nanyang.entity.TaWorkJob;
+import com.yunzhi.nanyang.entity.TaWorkMessage;
 import com.yunzhi.nanyang.mapper.TaDispatchMapper;
 import com.yunzhi.nanyang.mapper.TaOrderMapper;
 import com.yunzhi.nanyang.mapper.TaWorkJobMapper;
+import com.yunzhi.nanyang.mapper.TaWorkMessageMapper;
 import com.yunzhi.nanyang.service.ITaDispatchService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -32,6 +34,9 @@ public class TaDispatchServiceImpl extends BaseServiceImpl<TaDispatchMapper, TaD
     @Autowired
     TaOrderMapper taOrderMapper;
 
+    @Autowired
+    TaWorkMessageMapper taWorkMessageMapper;
+
     @Override
     public IPage<TaOrder> getPageBy(IPage<TaOrder> pg, String orgId, String typeId, String machineryId, LocalDateTime start, LocalDateTime end, String phone, String status, Boolean isWarn) {
         return baseMapper.getPageBy(pg, orgId, typeId, machineryId, start, end, phone, status, isWarn);
@@ -68,6 +73,17 @@ public class TaDispatchServiceImpl extends BaseServiceImpl<TaDispatchMapper, TaD
             throw new Exception("更新订单状态失败");
         }
 
+        try {
+            // 生成消息
+            TaWorkMessage message = new TaWorkMessage();
+            message.setMessageType("accept");
+            message.setAcceptPerson(taWorkJob.getWorkerName());
+            message.setAcceptTime(taWorkJob.getCreateDate());
+            taWorkMessageMapper.insert(message);
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+
         return taWorkJob;
     }
 }

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

@@ -147,13 +147,7 @@ public class TaMachineryServiceImpl extends BaseServiceImpl<TaMachineryMapper, T
 
     @Override
     public List<TaMachinery> listByTypeWithLoc(String typeId) {
-        QueryWrapper<TaMachinery> queryWrapper = new QueryWrapper<>();
-        queryWrapper.eq("type_id", typeId);
-//        queryWrapper.eq("online_status", 1);
-        queryWrapper.isNotNull("location");
-        queryWrapper.gt("status", Constants.STATUS_DELETE);
-
-        return list(queryWrapper);
+        return baseMapper.listByTypeWithLoc(typeId);
     }
 
     private void saveImages(TaMachinery taMachinery) {

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

@@ -67,4 +67,9 @@ public class TaPersonServiceImpl extends BaseServiceImpl<TaPersonMapper, TaPerso
     public IPage<TaPerson> getPageBy(IPage<TaPerson> pg, String identity, String nickName, String phone) {
         return baseMapper.getPageBy(pg, identity, nickName, phone);
     }
+
+    @Override
+    public boolean unBindUser(String userId) throws Exception {
+        return baseMapper.unBindUser(userId) > 0;
+    }
 }

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

@@ -0,0 +1,53 @@
+package com.yunzhi.nanyang.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.yunzhi.nanyang.common.DateUtils;
+import com.yunzhi.nanyang.common.StringUtils;
+import com.yunzhi.nanyang.entity.*;
+import com.yunzhi.nanyang.mapper.TaWorkMessageMapper;
+import com.yunzhi.nanyang.service.ITaWorkMessageService;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.scheduling.annotation.Async;
+import org.springframework.stereotype.Service;
+
+import java.time.LocalDateTime;
+import java.util.List;
+
+
+/**
+ * <p>
+ * 作业消息 服务实现类
+ * </p>
+ *
+ * @author yansen
+ * @since 2022-03-08
+ */
+@Slf4j
+@Service
+public class TaWorkMessageServiceImpl extends BaseServiceImpl<TaWorkMessageMapper, TaWorkMessage> implements ITaWorkMessageService {
+
+    @Async
+    @Override
+    public void appoints(TaOrder taOrder, TaPerson taPerson) {
+        try {
+            TaWorkMessage message = new TaWorkMessage();
+            message.setMessageType("appoint");
+            message.setAppointPerson(StringUtils.ifNull(taPerson.getNickName(), taPerson.getPhone()));
+            message.setAppointTime(DateUtils.now());
+            message.setAppointMachineryType(taOrder.getTypeName());
+            save(message);
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+    }
+
+    @Override
+    public List<TaWorkMessage> listByType(String messageType, Integer limit) {
+        QueryWrapper<TaWorkMessage> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq(!StringUtils.isEmpty(messageType), "message_type", messageType);
+        queryWrapper.orderByDesc("create_date");
+        queryWrapper.last("limit " + limit);
+
+        return list(queryWrapper);
+    }
+}

src/main/resources/application.yml

@@ -55,6 +55,19 @@ yz:
   amap:
     url: https://restapi.amap.com
     key: 3be0a9567a794d2690d378476f057a6f
+  filter:
+    annList:
+      - "/swagger-ui/**"
+      - "/swagger-resources/**"
+      - "/v2/**"
+      - "/wxpay/notify/**"
+      - "/alipay/notify/**"
+      - "/**/sms-captcha"
+      - "/**/**/sms-captcha"
+      - "/**/preload"
+      - "/**/login"
+      - "/**/**/login"
+
 
 ###
 aliyun:

src/main/resources/mapper/TaDispatchMapper.xml

@@ -28,7 +28,8 @@
             INNER JOIN ta_person m ON t.person_id = m.person_id
             INNER JOIN ta_org n ON t.org_id = n.org_id
         WHERE
-            t.work_status < 3
+            t.`status` > -1
+            AND t.work_status < 3
           <if test="orgId != null and orgId != ''">
             AND t.org_id = #{orgId}
           </if>

src/main/resources/mapper/TaMachineryMapper.xml

@@ -90,4 +90,20 @@
         ORDER BY
             t.create_date DESC
     </select>
+    <select id="listByTypeWithLoc" resultType="com.yunzhi.nanyang.entity.TaMachinery">
+        SELECT
+            t.*,
+            m.`name` as org_name
+        FROM
+            ta_machinery t
+            INNER JOIN ta_org m ON m.org_id = t.org_id
+            INNER JOIN td_machinery_type n ON n.type_id = t.type_id AND n.screen_statis = 1
+        WHERE
+            t.`status` &gt; -1
+        <if test="typeId != null and typeId != ''">
+            AND t.type_id = #{typeId}
+        </if>
+--             AND t.online_status = 1
+            AND t.location IS NOT NULL
+    </select>
 </mapper>

src/main/resources/mapper/TaPersonMapper.xml

@@ -1,6 +1,12 @@
 <?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.TaPersonMapper">
+    <update id="unBindUser">
+        UPDATE ta_person t
+        SET t.user_id = NULL
+        WHERE
+            t.user_id = #{userId}
+    </update>
 
     <select id="getPageBy" resultType="com.yunzhi.nanyang.entity.TaPerson">
         SELECT

src/main/resources/mapper/TaWorkMessageMapper.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.TaWorkMessageMapper">
+
+</mapper>