feats

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

@@ -66,8 +66,19 @@ public class BaseController {
         return taPerson;
     }
 
-    public boolean checkOrgAccess(String orgId, String userId) {
-        return iSysUserDataScopeService.checkOrgAccess(orgId, userId);
+    public void checkOrgAccess(String orgId) throws Exception {
+        SysUser user = currentUser();
+
+        // 如果是管理员
+        if (Constants.ADMIN_ID.equals(user.getUserId())) return;
+
+        // 空机构
+        if (StringUtils.isEmpty(orgId)) return;
+
+        boolean canAccess = iSysUserDataScopeService.checkOrgAccess(orgId, user.getUserId());
+        if (!canAccess) {
+            throw new Exception("暂无机构数据权限");
+        }
     }
 
     public SysUser checkWorker(TaPerson taPerson) throws Exception {
@@ -83,6 +94,16 @@ public class BaseController {
         return sysUser;
     }
 
+    public void checkMClient(String client) throws Exception {
+        if (StringUtils.isEmpty(client)) {
+            throw new Exception("暂不支持的客户端");
+        }
+
+        if (!"android".equals(client) && !"ios".equals(client)) {
+            throw new Exception("暂不支持的客户端");
+        }
+    }
+
     public List<String> getAccessOrgs(String userId) {
         return iSysUserDataScopeService.getAccessOrgs(userId);
     }

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

@@ -13,7 +13,7 @@ public class AliyunConfig {
 
     private Oss oss;
 
-    private Sms sms;
+//    private Sms sms;
 
     @Data
     public  static class Oss {
@@ -27,14 +27,14 @@ public class AliyunConfig {
         private String bucketURL;
     }
 
-    @Data
-    public static class Sms {
-        private Captcha captcha;
-    }
-
-    @Data
-    public static class Captcha {
-        private String code;
-        private String sign;
-    }
+//    @Data
+//    public static class Sms {
+//        private Captcha captcha;
+//    }
+//
+//    @Data
+//    public static class Captcha {
+//        private String code;
+//        private String sign;
+//    }
 }

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

@@ -0,0 +1,87 @@
+package com.yunzhi.nanyang.controller;
+
+import com.yunzhi.nanyang.common.*;
+import com.yunzhi.nanyang.entity.SysUser;
+import com.yunzhi.nanyang.entity.TaPerson;
+import com.yunzhi.nanyang.service.ISysUserService;
+import com.yunzhi.nanyang.service.ITaPersonService;
+import com.yunzhi.nanyang.shiro.utils.JWTUtil;
+import com.yunzhi.nanyang.vo.LoginParam;
+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("/{client}/{clientId}")
+public class MobileController extends BaseController {
+
+    @Autowired
+    public ITaPersonService iTaPersonService;
+
+    @Autowired
+    public ISysUserService iSysUserService;
+
+    @Autowired
+    public SMSCaptcha smsCaptcha;
+
+    @PostMapping("/login")
+    @ApiOperation(value="app登录", notes = "app登录", httpMethod = "POST", response = ResponseBean.class)
+    public ResponseBean login(@ApiParam("客户端") @PathVariable String client,
+                              @ApiParam("客户端") @PathVariable String clientId,
+                              @ApiParam("登录参数") @RequestBody LoginParam loginParam) throws Exception {
+
+        checkMClient(client);
+
+        String phone = loginParam.getUserName();
+        if (StringUtils.isEmpty(phone)) {
+            return ResponseBean.error("请设置登录手机号");
+        }
+
+        String captchaCode = loginParam.getPassword();
+        if (StringUtils.isEmpty(captchaCode)) {
+            return ResponseBean.error("请设置登录验证码");
+        }
+
+        boolean isOk = smsCaptcha.validate(phone, captchaCode);
+        if (!isOk) {
+            return ResponseBean.error("验证码不正确或者已过期");
+        }
+
+        SysUser sysUser = iSysUserService.getExistBy("phone", phone, false, true);
+        if (null == sysUser) {
+            return ResponseBean.error("未找到对应手机号的农机手信息");
+        }
+
+        TaPerson taPerson = iTaPersonService.getByPhone(clientId, phone);
+        if (null == taPerson) {
+            taPerson = new TaPerson();
+            taPerson.setPhone(phone);
+            taPerson.setIdentity(clientId);
+            taPerson.setStatus(Constants.STATUS_NORMAL);
+            taPerson.setCreateDate(LocalDateTime.now());
+            iTaPersonService.save(taPerson);
+        }
+
+        // 如果是农机手
+        if (Constants.CLIENT_WORKER.equals(clientId)) {
+            iTaPersonService.tryBindUser(taPerson);
+        }
+
+        // 生成 token
+        String token = JWTUtil.sign(taPerson.getPersonId(), taPerson.getPersonId());
+
+        Map<String, Object> res = new HashMap<>();
+        res.put("person", taPerson);
+        res.put("token", token);
+
+        return ResponseBean.success(res);
+    }
+}

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

@@ -0,0 +1,63 @@
+package com.yunzhi.nanyang.controller;
+
+import com.yunzhi.nanyang.common.BaseController;
+import com.yunzhi.nanyang.common.ResponseBean;
+import com.yunzhi.nanyang.service.ITaMachineryService;
+import com.yunzhi.nanyang.service.ITaOrderService;
+import com.yunzhi.nanyang.service.ITaOrgService;
+import com.yunzhi.nanyang.service.ITaPersonService;
+import com.yunzhi.nanyang.vo.ChartParam;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+
+@Api(tags = "统计查询")
+@RestController
+@RequestMapping("/admin")
+public class StatisController extends BaseController {
+
+    @Autowired
+    ITaPersonService iTaPersonService;
+
+    @Autowired
+    ITaOrgService iTaOrgService;
+
+    @Autowired
+    ITaMachineryService iTaMachineryService;
+
+    @Autowired
+    ITaOrderService iTaOrderService;
+
+
+    @GetMapping("/summary")
+    @ApiOperation(value="登录", notes = "登录", httpMethod = "POST", response = ResponseBean.class)
+    public ResponseBean summary() throws Exception {
+
+        List<ChartParam> resp = new ArrayList<>();
+
+        // 统计注册用户
+        ChartParam personNum = iTaPersonService.statisTotal();
+        resp.add(personNum);
+
+        // 合作社数
+        ChartParam orgNum = iTaOrgService.statisTotal();
+        resp.add(orgNum);
+
+        // 农机数
+        ChartParam machineryNum = iTaMachineryService.statisTotal();
+        resp.add(machineryNum);
+
+        // 订单数
+        ChartParam orderNum = iTaOrderService.statisTotal();
+        resp.add(orderNum);
+
+        return ResponseBean.success(resp);
+    }
+}

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

@@ -94,6 +94,8 @@ public class SysUserController extends BaseController {
         sysUser.setUserId(null);
         sysUser.setCreateUser(userId);
 
+        checkOrgAccess(sysUser.getOrgId());
+
         if (StringUtils.isEmpty(sysUser.getUserName()) || StringUtils.isEmpty(sysUser.getPhone())) {
             return ResponseBean.error("姓名或者手机不能为空");
         }
@@ -102,10 +104,6 @@ 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("手机号码重复");
@@ -174,6 +172,8 @@ public class SysUserController extends BaseController {
         // 不支持更新创建人
         sysUser.setCreateUser(null);
 
+        checkOrgAccess(sysUser.getOrgId());
+
         if (StringUtils.isEmpty(sysUser.getUserName()) || StringUtils.isEmpty(sysUser.getPhone())) {
             return ResponseBean.error("姓名或者手机不能为空");
         }
@@ -181,9 +181,6 @@ 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) {

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

@@ -3,8 +3,7 @@ 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.*;
 import com.yunzhi.nanyang.entity.SysUser;
 import com.yunzhi.nanyang.entity.TaAccount;
 import com.yunzhi.nanyang.entity.TaPerson;
@@ -26,6 +25,8 @@ import com.yunzhi.nanyang.service.ITaAccountLogService;
 import com.yunzhi.nanyang.entity.TaAccountLog;
 import org.springframework.web.bind.annotation.RestController;
 
+import java.time.LocalDateTime;
+
 /**
  * <p>
     * 流水表 前端控制器
@@ -58,11 +59,23 @@ public class TaAccountLogController extends BaseController {
     @ApiOperation(value="列表", notes = "列表", httpMethod = "GET", response = ResponseBean.class)
     @RequiresPermissions("fi-system:view")
     public ResponseBean taAccountLogList(@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(value = "合作社ID") @RequestParam(value ="orgId", required = false) String orgId,
+                                         @ApiParam(value = "起始时间", example = "2022-03-01") @RequestParam(value ="start", required = false) String start,
+                                         @ApiParam(value = "结束时间", example = "2022-03-31") @RequestParam(value ="end", required = false) String end,
+                                         @ApiParam(value = "订单号") @RequestParam(value ="orderNo", required = false) String orderNo,
+                                         @ApiParam(value = "收支类型") @RequestParam(value ="feeType", required = false) Integer feeType,
+                                         @ApiParam(value = "消费类型") @RequestParam(value ="chargeType", required = false) String chargeType) throws Exception{
+
+        checkOrgAccess(orgId);
+
+        LocalDateTime startDate = DateUtils.getDayStart(start);
+        LocalDateTime endDate = DateUtils.getDayEnd(end);
+
 
         IPage<AccountRecord> pg = new Page<>(pageNum, pageSize);
 
-        IPage<AccountRecord> result = iTaAccountLogService.getPageBy(pg);
+        IPage<AccountRecord> result = iTaAccountLogService.getPageBy(pg, orgId, startDate, endDate, orderNo, feeType, chargeType);
         return ResponseBean.success(result);
     }
 

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

@@ -87,12 +87,7 @@ public class TaDispatchController extends BaseController {
                                        @ApiParam("状态") @RequestParam(value ="status", required = false) String status,
                                        @ApiParam("状态") @RequestParam(value ="isWarn", defaultValue = "false") Boolean isWarn) throws Exception{
 
-        SysUser user = currentUser();
-        if (!Constants.ADMIN_ID.equals(user.getUserId()) && !StringUtils.isEmpty(orgId)) {
-            if (!checkOrgAccess(user.getOrgId(), user.getUserId())) {
-                return ResponseBean.error("无权查询机构内容");
-            }
-        }
+        checkOrgAccess(orgId);
 
         IPage<TaOrder> pg = new Page<>(pageNum, pageSize);
 
@@ -112,10 +107,10 @@ public class TaDispatchController extends BaseController {
     @ApiOperation(value="保存", notes = "保存", httpMethod = "POST", response = ResponseBean.class)
     @RequiresPermissions("orderjob:add")
     public ResponseBean taDispatchAdd(@ApiParam("保存内容") @RequestBody TaDispatch taDispatch) throws Exception{
-        SysUser user = currentUser();
-
         taDispatch.setDispatchId(null);
 
+        checkOrgAccess(taDispatch.getOrgId());
+
         if (StringUtils.isEmpty(taDispatch.getOrderId()) || StringUtils.isEmpty(taDispatch.getOrderId())) {
             return ResponseBean.error("订单或者接单机构为空");
         }
@@ -124,10 +119,6 @@ public class TaDispatchController extends BaseController {
             return ResponseBean.error("验证订单信息异常");
         }
 
-        if (!checkOrgAccess(taDispatch.getOrgId(), user.getUserId())) {
-            return ResponseBean.error("无操作权限");
-        }
-
         taDispatch.setOrgName(iTaOrgService.getById(taDispatch.getOrgId()).getName());
 
         if (!StringUtils.isEmpty(taDispatch.getMachineryId())) {
@@ -144,18 +135,10 @@ public class TaDispatchController extends BaseController {
 
         taDispatch.setStatus(Constants.STATUS_NORMAL);
 
-
-        if (iTaDispatchService.save(taDispatch)){
-
-            // 生成作业信息
-            TaWorkJob taWorkJob = iTaWorkJobService.createByDispatch(taDispatch, taOrder);
-
-            // 更新订单状态
-            iTaOrderService.updateStatus(taDispatch.getOrderId(), "dispatch_status", Constants.DISPATCH_DONE);
-
+        TaWorkJob taWorkJob = iTaDispatchService.createNew(taDispatch, taOrder);
+        if (null != taWorkJob){
             // 发送通知
             applicationEventPublisher.publishEvent(new WorkDispatchEvent(this, taWorkJob, taOrder));
-
             return ResponseBean.success(taDispatch);
         }else {
             return ResponseBean.error("保存失败, 请重试", ResponseBean.ERROR_UNAVAILABLE);
@@ -172,11 +155,7 @@ public class TaDispatchController extends BaseController {
     public ResponseBean taDispatchDelete(@ApiParam("对象ID") @PathVariable String id) throws Exception{
         TaDispatch taDispatch = iTaDispatchService.getById(id);
 
-        SysUser user = currentUser();
-
-        if (!checkOrgAccess(taDispatch.getOrgId(), user.getUserId())) {
-            return ResponseBean.error("无操作权限");
-        }
+        checkOrgAccess(taDispatch.getOrgId());
 
         TaWorkJob taWorkJob = iTaWorkJobService.getExistBy("dispatch_id", id, false, true);
         if (null == taWorkJob) {

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

@@ -71,14 +71,7 @@ public class TaMachineryController extends BaseController {
                                         @ApiParam("类型") @RequestParam(value ="typeId", required = false) String typeId,
                                         @ApiParam("机构ID") @RequestParam(value ="orgId", required = false) String orgId,
                                         @ApiParam("状态") @RequestParam(value ="status", required = false) Integer status) throws Exception{
-        SysUser sysUser = currentUser();
-        boolean isAdmin = Constants.ADMIN_ID.equals(sysUser.getUserId());
-
-        if (!StringUtils.isEmpty(orgId) && !isAdmin) {
-            if (!checkOrgAccess(orgId, sysUser.getUserId())) {
-                return ResponseBean.error("无权限操作");
-            }
-        }
+        checkOrgAccess(orgId);
 
         IPage<TaMachinery> pg = new Page<>(pageNum, pageSize);
 
@@ -139,9 +132,7 @@ public class TaMachineryController extends BaseController {
             return ResponseBean.error("请设置农机归属");
         }
 
-        if (!checkOrgAccess(taMachinery.getOrgId(), sysUser.getUserId())) {
-            return ResponseBean.error("无权进行此操作");
-        }
+        checkOrgAccess(taMachinery.getOrgId());
 
         taMachinery.setMachineryId(null);
         taMachinery.setCreateUser(sysUser.getUserId());
@@ -161,16 +152,12 @@ public class TaMachineryController extends BaseController {
     @ApiOperation(value="删除", notes = "删除", httpMethod = "DELETE", response = ResponseBean.class)
     @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("无权进行此操作");
-        }
+        checkOrgAccess(taMachinery.getOrgId());
 
         if(iTaMachineryService.removeLogicById(id)){
             return ResponseBean.success("success");
@@ -190,15 +177,11 @@ public class TaMachineryController extends BaseController {
     @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 (!checkOrgAccess(taMachinery.getOrgId(), sysUser.getUserId())) {
-            return ResponseBean.error("无权进行此操作");
-        }
+        checkOrgAccess(taMachinery.getOrgId());
 
         taMachinery.setMachineryId(id);
 

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

@@ -82,12 +82,7 @@ public class TaOrderController extends BaseController {
                                 @ApiParam("评价状态") @RequestParam(value ="isEvaluated", required = false) Integer isEvaluated) throws Exception{
         SysUser current = currentUser();
         boolean isAdmin = Constants.ADMIN_ID.equals(current.getUserId());
-
-        if (!isAdmin && !StringUtils.isEmpty(orgId)) {
-            if (!checkOrgAccess(orgId, current.getUserId())) {
-                return ResponseBean.error("无机构查询权限");
-            }
-        }
+        checkOrgAccess(orgId);
 
         IPage<TaOrder> pg = new Page<>(pageNum, pageSize);
         IPage<TaOrder> result = iTaOrderService.getAdminPage(pg,

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

@@ -3,12 +3,10 @@ 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.SMSCaptcha;
-import com.yunzhi.nanyang.common.StringUtils;
+import com.yunzhi.nanyang.common.*;
 import com.yunzhi.nanyang.entity.SysUser;
 import com.yunzhi.nanyang.service.ISysUserService;
+import com.yunzhi.nanyang.shiro.utils.JWTUtil;
 import com.yunzhi.nanyang.vo.PhoneParam;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -25,6 +23,9 @@ import com.yunzhi.nanyang.service.ITaPersonService;
 import com.yunzhi.nanyang.entity.TaPerson;
 import org.springframework.web.bind.annotation.RestController;
 
+import java.util.HashMap;
+import java.util.Map;
+
 /**
  * <p>
     * 人员表 前端控制器
@@ -136,10 +137,13 @@ public class TaPersonController extends BaseController {
 
         taPerson.setPersonId(id);
 
-        // 关联系统人员
-        SysUser sysUser = iSysUserService.getExistBy("phone", taPerson.getPhone(), false, true);
-        if (sysUser != null && StringUtils.isEmpty(taPerson.getUserId())) {
-            taPerson.setUserId(sysUser.getUserId());
+        // 如果是农机手
+        if (Constants.CLIENT_WORKER.equals(clientId)) {
+            // 关联系统人员
+            SysUser sysUser = iSysUserService.getExistBy("phone", taPerson.getPhone(), false, true);
+            if (sysUser != null && StringUtils.isEmpty(taPerson.getUserId())) {
+                taPerson.setUserId(sysUser.getUserId());
+            }
         }
 
         if (iTaPersonService.updateById(taPerson)){
@@ -176,30 +180,65 @@ public class TaPersonController extends BaseController {
             return ResponseBean.error("验证码不正确或者已过期");
         }
 
-        taPerson.setPhone(phoneParam.getPhone());
+        if (!StringUtils.isEmpty(taPerson.getPhone())) {
+            return ResponseBean.error("暂不支持手机号修改");
+        }
 
-        // 关联系统人员
-        SysUser sysUser = iSysUserService.getExistBy("phone", phoneParam.getPhone(), false, true);
-        if (sysUser != null && StringUtils.isEmpty(taPerson.getUserId())) {
-            taPerson.setUserId(sysUser.getUserId());
+        // 先去查询是否已经注册过
+        TaPerson origin = iTaPersonService.getByPhone(clientId, phoneParam.getPhone());
+        if (origin != null && !origin.getPersonId().equals(id)) {
+            // 找到同手机号人员, 说明是 app 端注册过的
+            // 那么把小程序端人员信息移植到 app 端人员上去
+            origin.setAppId(taPerson.getAppId());
+            origin.setOpenid(taPerson.getOpenid());
+
+            if (StringUtils.isEmpty(origin.getNickName())) {
+                origin.setNickName(taPerson.getNickName());
+            }
+            if (StringUtils.isEmpty(origin.getAvatar())) {
+                origin.setAvatar(taPerson.getAvatar());
+            }
+            if (null != origin.getSex()) {
+                origin.setSex(taPerson.getSex());
+            }
+
+            // 先把小程序端人员删除
+            taPerson.setOpenid("deleted");
+            taPerson.setStatus(Constants.STATUS_DELETE);
+            iTaPersonService.updateById(taPerson);
+            // 再赋值 taPerson , 后续再处理 taPerson 实际上就是处理的 app 人员了
+            taPerson = origin;
         }
 
-        if (iTaPersonService.updateById(taPerson)){
+        taPerson.setPhone(phoneParam.getPhone());
 
+        // 如果是农机手
+        if (Constants.CLIENT_WORKER.equals(clientId)) {
+            // 关联系统人员
+            SysUser sysUser = iSysUserService.getExistBy("phone", phoneParam.getPhone(), false, true);
+            if (sysUser != null && StringUtils.isEmpty(taPerson.getUserId())) {
+                taPerson.setUserId(sysUser.getUserId());
+            }
+        }
 
-            return ResponseBean.success(taPerson);
+        if (iTaPersonService.updateById(taPerson)){
+            // 因为有可能修改 person 为 app 端的人员, 所以此处刷新一次 token
+            String token = JWTUtil.sign(taPerson.getPersonId(), taPerson.getPersonId());
+            Map<String, Object> res = new HashMap<>();
+            res.put("person", taPerson);
+            res.put("token", token);
+            return ResponseBean.success(res);
         }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查询对象
+     */
+    @RequestMapping(value="/{client}/{clientId}/person/current",method= RequestMethod.GET)
+    @ApiOperation(value="详情", notes = "详情", httpMethod = "GET", response = ResponseBean.class)
+    public ResponseBean taPersonGet() throws Exception{
+        return ResponseBean.success(currentPerson());
+    }
 }

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

@@ -63,10 +63,7 @@ public class TaUserMachineryController extends BaseController {
             return ResponseBean.error("未找到指定人员");
         }
 
-        SysUser current = currentUser();
-        if (!checkOrgAccess(sysUser.getOrgId(), current.getUserId())) {
-            return ResponseBean.error("暂无权限");
-        }
+        checkOrgAccess(sysUser.getOrgId());
 
         List<TaUserMachinery> result = iTaUserMachineryService.getByUser(userId);
         return ResponseBean.success(result);
@@ -88,10 +85,7 @@ public class TaUserMachineryController extends BaseController {
             return ResponseBean.error("未找到指定人员");
         }
 
-        SysUser current = currentUser();
-        if (!checkOrgAccess(sysUser.getOrgId(), current.getUserId())) {
-            return ResponseBean.error("暂无权限");
-        }
+        checkOrgAccess(sysUser.getOrgId());
 
         if (iTaUserMachineryService.editWithUser(userId, userMachineryList)){
             return ResponseBean.success(userMachineryList);

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

@@ -65,25 +65,17 @@ public class TaWithdrawalController extends BaseController {
                                          @ApiParam("单页数据量") @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize,
                                          @ApiParam("机构ID") @RequestParam(value ="orgId", required = false) String orgId,
                                          @ApiParam(value = "开始日期", example = "2022-03-01") @RequestParam(value ="start",required = false) String start,
-                                         @ApiParam(value = "结束日期", example = "2022-03-31") @RequestParam(value ="end",required = false) String end) throws Exception{
+                                         @ApiParam(value = "结束日期", example = "2022-03-31") @RequestParam(value ="end",required = false) String end,
+                                         @ApiParam("申请人") @RequestParam(value ="userName", required = false) String userName,
+                                         @ApiParam("审批状态") @RequestParam(value ="auditStatus", required = false) Integer auditStatus) throws Exception{
 
-        SysUser sysUser = currentUser();
-        boolean isAdmin = Constants.ADMIN_ID.equals(sysUser.getUserId());
-        if (!isAdmin) {
-            if (StringUtils.isEmpty(orgId)) {
-                orgId = sysUser.getOrgId();
-            } else {
-                if (!checkOrgAccess(orgId, sysUser.getUserId())) {
-                    return ResponseBean.error("暂无机构数据查询权限");
-                }
-            }
-        }
+        checkOrgAccess(orgId);
 
         LocalDateTime startDate = DateUtils.getDayStart(start);
         LocalDateTime endDate = DateUtils.getDayEnd(end);
 
         IPage<TaWithdrawal> pg = new Page<>(pageNum, pageSize);
-        IPage<TaWithdrawal> result = iTaWithdrawalService.getPageBy(pg, orgId, startDate, endDate);
+        IPage<TaWithdrawal> result = iTaWithdrawalService.getPageBy(pg, orgId, startDate, endDate, userName, auditStatus);
         return ResponseBean.success(result);
     }
 
@@ -235,12 +227,7 @@ public class TaWithdrawalController extends BaseController {
         }
 
         String orgId = origin.getOrgId();
-        boolean isAdmin = Constants.ADMIN_ID.equals(sysUser.getUserId());
-        if (!isAdmin) {
-            if (!checkOrgAccess(orgId, sysUser.getUserId())) {
-                return ResponseBean.error("暂无操作权限");
-            }
-        }
+        checkOrgAccess(orgId);
 
         // 不能重复审批, 因为审批有账户操作
         Integer auditStatus = origin.getAuditStatus();
@@ -259,11 +246,7 @@ public class TaWithdrawalController extends BaseController {
         origin.setAuditRemark(taWithdrawal.getAuditRemark());
         origin.setAuditDate(LocalDateTime.now());
 
-        if (iTaWithdrawalService.updateById(origin)){
-
-            // 处理账户信息
-            iTaAccountService.withdraw(origin);
-
+        if (iTaWithdrawalService.audit(origin)){
             return ResponseBean.success(iTaWithdrawalService.getById(id));
         }else {
             return ResponseBean.error("修改失败, 请重试", ResponseBean.ERROR_UNAVAILABLE);
@@ -285,14 +268,8 @@ public class TaWithdrawalController extends BaseController {
         SysUser user = iSysUserService.getById(taWithdrawal.getUserId());
         taWithdrawal.setPhone(user.getPhone());
 
-        SysUser sysUser = currentUser();
         String orgId = taWithdrawal.getOrgId();
-        boolean isAdmin = Constants.ADMIN_ID.equals(sysUser.getUserId());
-        if (!isAdmin) {
-            if (!checkOrgAccess(orgId, sysUser.getUserId())) {
-                return ResponseBean.error("暂无数据查询权限");
-            }
-        }
+        checkOrgAccess(orgId);
 
         TaOrg taOrg = iTaOrgService.getById(orgId);
         taWithdrawal.setOrgName(taOrg.getName());

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

@@ -70,12 +70,7 @@ public class TaWorkJobController extends BaseController {
                                 @ApiParam(value = "农机型号ID") @RequestParam(value ="machineryTypeId", required = false) String machineryTypeId,
                                 @ApiParam(value = "农机ID") @RequestParam(value ="machineryId", required = false) String machineryId,
                                 @ApiParam(value = "农机手名称") @RequestParam(value ="workerName", required = false) String workerName) throws Exception{
-        SysUser sysUser = currentUser();
-        if (!Constants.ADMIN_ID.equals(sysUser.getUserId()) && !StringUtils.isEmpty(orgId)) {
-            if (checkOrgAccess(orgId, sysUser.getUserId())) {
-                return ResponseBean.error("暂无合作设数据权限");
-            }
-        }
+        checkOrgAccess(orgId);
 
         LocalDateTime startDate = DateUtils.getDayStart(start);
         LocalDateTime endDate = DateUtils.getDayEnd(end);
@@ -116,13 +111,12 @@ public class TaWorkJobController extends BaseController {
     /**
      * 暂停/开启
      * @param id  实体ID
-     * @param taWorkJob 实体对象
+     * @param mode 实体对象
      * @return
      */
     @RequestMapping(value="/{client}/worker/work-job/{id}/pause",method= RequestMethod.PUT)
     @ApiOperation(value="暂停/开启", notes = "暂停/开启", httpMethod = "PUT", response = ResponseBean.class)
     public ResponseBean taWorkJobUpdate(@ApiParam("客户端") @PathVariable String client,
-//                                      @ApiParam("客户端ID") @PathVariable String clientId,
                                         @ApiParam("对象ID") @PathVariable String id,
                                         @ApiParam("是否暂停") @RequestParam("mode") Boolean mode) throws Exception{
 

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

@@ -64,11 +64,11 @@ public class WxMaController extends BaseController {
     @GetMapping("/preload")
     @ApiOperation(value="小程序登录", notes = "小程序登录", httpMethod = "POST", response = ResponseBean.class)
     public ResponseBean preload(@ApiParam("客户端ID") @PathVariable String clientId,
-                                @ApiParam("小程序预加载参数") @RequestParam WxMaPreload wxMaPreload) throws Exception {
+                                @ApiParam("小程序预加载参数") @RequestParam(required = false) WxMaPreload wxMaPreload) throws Exception {
 
         if (Constants.CLIENT_WORKER.equals(clientId)) {
             List<TaMessageTemplate> list = iTaMessageTemplateService.getByTplType(Constants.MESSAGE_MINIAPP);
-            ResponseBean.success(new HashMap<String, Object>(){{
+            return ResponseBean.success(new HashMap<String, Object>(){{
                 put("tpls", list);
             }});
         }
@@ -103,13 +103,14 @@ public class WxMaController extends BaseController {
             taPerson = new TaPerson();
             taPerson.setAppId(miniapp.getAppId());
             taPerson.setOpenid(openid);
+            taPerson.setIdentity(clientId);
             taPerson.setStatus(Constants.STATUS_NORMAL);
             taPerson.setCreateDate(LocalDateTime.now());
             iTaPersonService.save(taPerson);
         }
 
         // 如果是农机手
-        if (Constants.CLIENT_WORKER.equals(miniapp.getClient())) {
+        if (Constants.CLIENT_WORKER.equals(clientId)) {
             iTaPersonService.tryBindUser(taPerson);
         }
 

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

@@ -50,6 +50,9 @@ public class TaPerson implements Serializable {
     @ApiModelProperty(value = "手机号")
     private String phone;
 
+    @ApiModelProperty(value = "身份")
+    private String identity;
+
     @ApiModelProperty(value = "绑定人员")
     private String userId;
 

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

@@ -5,6 +5,9 @@ import com.yunzhi.nanyang.entity.TaAccountLog;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.yunzhi.nanyang.vo.AccountRecord;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.time.LocalDateTime;
 
 /**
  * <p>
@@ -17,5 +20,11 @@ import org.apache.ibatis.annotations.Mapper;
 @Mapper
 public interface TaAccountLogMapper extends BaseMapper<TaAccountLog> {
 
-    IPage<AccountRecord> getPageBy(IPage<AccountRecord> pg);
+    IPage<AccountRecord> getPageBy(IPage<AccountRecord> pg,
+                                   @Param("orgId") String orgId,
+                                   @Param("startDate") LocalDateTime startDate,
+                                   @Param("endDate") LocalDateTime endDate,
+                                   @Param("orderNo") String orderNo,
+                                   @Param("feeType") Integer feeType,
+                                   @Param("chargeType") String chargeType);
 }

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

@@ -3,9 +3,11 @@ package com.yunzhi.nanyang.mapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.yunzhi.nanyang.entity.TaMachinery;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.yunzhi.nanyang.vo.ChartParam;
 import com.yunzhi.nanyang.vo.MachineSummary;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Select;
 import org.apache.ibatis.annotations.Update;
 
 /**
@@ -42,4 +44,7 @@ public interface TaMachineryMapper extends BaseMapper<TaMachinery> {
                                  @Param("typeId") String typeId,
                                  @Param("orgId") String orgId,
                                  @Param("status") Integer status);
+
+    @Select("SELECT 'machinery' as `name`, count(*) as `value` FROM ta_machinery WHERE `status` > -1")
+    ChartParam statisTotal();
 }

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

@@ -3,9 +3,11 @@ package com.yunzhi.nanyang.mapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.yunzhi.nanyang.entity.TaOrder;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.yunzhi.nanyang.vo.ChartParam;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Select;
+import org.apache.ibatis.annotations.Update;
 
 import java.util.List;
 
@@ -48,5 +50,12 @@ public interface TaOrderMapper extends BaseMapper<TaOrder> {
 
     List<TaOrder> checkMachineryDuty(@Param("machineryId") String machineryId,@Param("appointmentDate") String appointmentDate);
 
+    @Update("UPDATE ta_order SET pay_status = #{payStatus} WHERE order_id = #{orderId}")
     int updatePayStatus(@Param("orderId") String orderId, @Param("payStatus") int payStatus);
+
+    @Update("UPDATE ta_order SET dispatch_status = #{dispatchStatus} WHERE order_id = #{orderId}")
+    int updateDispatchStatus(@Param("orderId") String orderId, @Param("dispatchStatus") int dispatchStatus);
+
+    @Select("SELECT 'order' as `name`, count(*) as `value` FROM ta_order WHERE `status` > -1")
+    ChartParam statisTotal();
 }

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

@@ -3,8 +3,10 @@ package com.yunzhi.nanyang.mapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.yunzhi.nanyang.entity.TaOrg;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.yunzhi.nanyang.vo.ChartParam;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Select;
 
 /**
  * <p>
@@ -18,4 +20,7 @@ import org.apache.ibatis.annotations.Param;
 public interface TaOrgMapper extends BaseMapper<TaOrg> {
 
     IPage<TaOrg> getPageBy(IPage<TaOrg> pg, @Param("userId") String userId, @Param("name") String name);
+
+    @Select("SELECT 'org' as `name`, count(*) as `value`  FROM ta_org t WHERE t.`status` > -1")
+    ChartParam statisTotal();
 }

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

@@ -2,6 +2,7 @@ package com.yunzhi.nanyang.mapper;
 
 import com.yunzhi.nanyang.entity.TaPerson;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.yunzhi.nanyang.vo.ChartParam;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Select;
@@ -22,4 +23,10 @@ public interface TaPersonMapper extends BaseMapper<TaPerson> {
 
     @Select("SELECT * FROM ta_person t WHERE t.user_id = #{userId} AND t.`status` > -1")
     TaPerson getByUserId(@Param("userId") String userId);
+    
+    @Select("SELECT 'person' as `name`, count(*) as `value`  FROM ta_person t WHERE t.phone is not null AND t.`status` > -1")
+    ChartParam statisTotal();
+
+    @Select("SELECT * FROM ta_person t WHERE t.phone = #{phone} AND t.identity = #{clientId} AND t.`status` > -1")
+    TaPerson getByPhone(@Param("clientId") String clientId,@Param("phone")  String phone);
 }

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

@@ -22,7 +22,9 @@ public interface TaWithdrawalMapper extends BaseMapper<TaWithdrawal> {
     IPage<TaWithdrawal> getPageBy(IPage<TaWithdrawal> pg,
                                   @Param("orgId") String orgId,
                                   @Param("startDate") LocalDateTime startDate,
-                                  @Param("endDate") LocalDateTime endDate);
+                                  @Param("endDate") LocalDateTime endDate,
+                                  @Param("userName") String userName,
+                                  @Param("auditStatus") Integer auditStatus);
 
     Integer getTotalMoney(@Param("orgId") String orgId,@Param("auditStatus") Integer auditStatus);
 }

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

@@ -20,4 +20,5 @@ public interface ISysUserService extends IBaseService<SysUser> {
     SysUser getByLoginId(String loginId);
 
     IPage<SysUser> getPageBy(IPage<SysUser> pg, String userId, String orgId, String name, String phone);
+
 }

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

@@ -2,9 +2,10 @@ package com.yunzhi.nanyang.service;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.yunzhi.nanyang.entity.TaAccountLog;
-import com.baomidou.mybatisplus.extension.service.IService;
 import com.yunzhi.nanyang.vo.AccountRecord;
 
+import java.time.LocalDateTime;
+
 /**
  * <p>
  * 流水表 服务类
@@ -15,5 +16,5 @@ import com.yunzhi.nanyang.vo.AccountRecord;
  */
 public interface ITaAccountLogService extends IBaseService<TaAccountLog> {
 
-    IPage<AccountRecord> getPageBy(IPage<AccountRecord> pg);
+    IPage<AccountRecord> getPageBy(IPage<AccountRecord> pg, String orgId, LocalDateTime startDate, LocalDateTime endDate, String orderNo, Integer feeType, String chargeType);
 }

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

@@ -3,6 +3,7 @@ package com.yunzhi.nanyang.service;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.yunzhi.nanyang.entity.TaDispatch;
 import com.yunzhi.nanyang.entity.TaOrder;
+import com.yunzhi.nanyang.entity.TaWorkJob;
 
 import java.time.LocalDateTime;
 
@@ -17,4 +18,6 @@ import java.time.LocalDateTime;
 public interface ITaDispatchService extends IBaseService<TaDispatch> {
 
     IPage<TaOrder> getPageBy(IPage<TaOrder> pg, String orgId, String typeId, String machineryId, LocalDateTime start, LocalDateTime end, String phone, String status, Boolean isWarn);
+
+    TaWorkJob createNew(TaDispatch taDispatch, TaOrder taOrder) throws Exception;
 }

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

@@ -2,6 +2,7 @@ package com.yunzhi.nanyang.service;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.yunzhi.nanyang.entity.TaMachinery;
+import com.yunzhi.nanyang.vo.ChartParam;
 import com.yunzhi.nanyang.vo.MachineSummary;
 
 /**
@@ -31,4 +32,6 @@ public interface ITaMachineryService extends IBaseService<TaMachinery> {
     boolean updateStatus(String machineryId, String statusColumn, int statusValue);
 
     IPage<TaMachinery> getPageBy(IPage<TaMachinery> pg, String name, String typeId, String orgId, Integer status);
+
+    ChartParam statisTotal();
 }

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

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.yunzhi.nanyang.entity.SysUser;
 import com.yunzhi.nanyang.entity.TaOrder;
 import com.yunzhi.nanyang.entity.TaPerson;
+import com.yunzhi.nanyang.vo.ChartParam;
 
 import java.util.List;
 
@@ -38,4 +39,6 @@ public interface ITaOrderService extends IBaseService<TaOrder> {
     boolean updateStatus(String orderId, String statusColumn, int statusValue);
 
     List<TaOrder> checkMachineryDuty(String machineryId, String appointmentDate);
+
+    ChartParam statisTotal();
 }

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

@@ -3,6 +3,7 @@ package com.yunzhi.nanyang.service;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.yunzhi.nanyang.entity.SysUser;
 import com.yunzhi.nanyang.entity.TaOrg;
+import com.yunzhi.nanyang.vo.ChartParam;
 
 /**
  * <p>
@@ -17,4 +18,6 @@ public interface ITaOrgService extends IBaseService<TaOrg> {
     IPage<TaOrg> getPageBy(IPage<TaOrg> pg, SysUser sysUser, String name);
 
     boolean saveWithDataScope(TaOrg taOrg) throws Exception;
+
+    ChartParam statisTotal();
 }

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

@@ -2,6 +2,7 @@ package com.yunzhi.nanyang.service;
 
 import com.yunzhi.nanyang.entity.TaPerson;
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.yunzhi.nanyang.vo.ChartParam;
 
 /**
  * <p>
@@ -16,4 +17,8 @@ public interface ITaPersonService extends IBaseService<TaPerson> {
     TaPerson getByOpenId(String appid, String openid);
 
     void tryBindUser(TaPerson taPerson);
+
+    ChartParam statisTotal();
+
+    TaPerson getByPhone(String clientId, String phone);
 }

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

@@ -2,7 +2,6 @@ package com.yunzhi.nanyang.service;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.yunzhi.nanyang.entity.TaWithdrawal;
-import com.baomidou.mybatisplus.extension.service.IService;
 
 import java.time.LocalDateTime;
 
@@ -16,5 +15,7 @@ import java.time.LocalDateTime;
  */
 public interface ITaWithdrawalService extends IBaseService<TaWithdrawal> {
 
-    IPage<TaWithdrawal> getPageBy(IPage<TaWithdrawal> pg, String orgId, LocalDateTime startDate, LocalDateTime endDate);
+    IPage<TaWithdrawal> getPageBy(IPage<TaWithdrawal> pg, String orgId, LocalDateTime startDate, LocalDateTime endDate, String userName, Integer auditStatus);
+
+    boolean audit(TaWithdrawal origin) throws Exception;
 }

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

@@ -4,10 +4,11 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.yunzhi.nanyang.entity.TaAccountLog;
 import com.yunzhi.nanyang.mapper.TaAccountLogMapper;
 import com.yunzhi.nanyang.service.ITaAccountLogService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.yunzhi.nanyang.vo.AccountRecord;
 import org.springframework.stereotype.Service;
 
+import java.time.LocalDateTime;
+
 /**
  * <p>
  * 流水表 服务实现类
@@ -20,7 +21,7 @@ import org.springframework.stereotype.Service;
 public class TaAccountLogServiceImpl extends BaseServiceImpl<TaAccountLogMapper, TaAccountLog> implements ITaAccountLogService {
 
     @Override
-    public IPage<AccountRecord> getPageBy(IPage<AccountRecord> pg) {
-        return baseMapper.getPageBy(pg);
+    public IPage<AccountRecord> getPageBy(IPage<AccountRecord> pg, String orgId, LocalDateTime startDate, LocalDateTime endDate, String orderNo, Integer feeType, String chargeType) {
+        return baseMapper.getPageBy(pg, orgId, startDate, endDate, orderNo, feeType, chargeType);
     }
 }

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

@@ -1,11 +1,17 @@
 package com.yunzhi.nanyang.service.impl;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
+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.mapper.TaDispatchMapper;
+import com.yunzhi.nanyang.mapper.TaOrderMapper;
+import com.yunzhi.nanyang.mapper.TaWorkJobMapper;
 import com.yunzhi.nanyang.service.ITaDispatchService;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 
 import java.time.LocalDateTime;
 
@@ -20,8 +26,48 @@ import java.time.LocalDateTime;
 @Service
 public class TaDispatchServiceImpl extends BaseServiceImpl<TaDispatchMapper, TaDispatch> implements ITaDispatchService {
 
+    @Autowired
+    TaWorkJobMapper taWorkJobMapper;
+
+    @Autowired
+    TaOrderMapper taOrderMapper;
+
     @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);
     }
+
+    @Transactional(rollbackFor = Exception.class)
+    @Override
+    public TaWorkJob createNew(TaDispatch taDispatch, TaOrder taOrder) throws Exception {
+
+        if (!save(taDispatch)) {
+            return null;
+        }
+
+        TaWorkJob taWorkJob = new TaWorkJob();
+        LocalDateTime now = LocalDateTime.now();
+        taWorkJob.setJobId(null);
+        taWorkJob.setDispatchId(taDispatch.getDispatchId());
+        taWorkJob.setOrderId(taOrder.getOrderId());
+        taWorkJob.setWorkerId(taDispatch.getWorkerId());
+        taWorkJob.setWorkerName(taDispatch.getWorkerName());    // 非数据字段, 但是消息需要用到
+        taWorkJob.setMachineryId(taDispatch.getMachineryId());
+        taWorkJob.setMachineryName(taDispatch.getMachineryName());    // 非数据字段, 但是消息需要用到
+        taWorkJob.setStartDate(now);
+        taWorkJob.setOrgId(taDispatch.getOrgId());
+        taWorkJob.setStatus(Constants.WORK_READY);
+        taWorkJob.setCreateUser(taDispatch.getWorkerId());
+        taWorkJob.setCreateDate(now);
+
+        if (taWorkJobMapper.insert(taWorkJob) < 1) {
+            throw new Exception("生成作业信息异常");
+        }
+
+        if (taOrderMapper.updateDispatchStatus(taOrder.getOrderId(), Constants.DISPATCH_DONE) < 1) {
+            throw new Exception("更新订单状态失败");
+        }
+
+        return taWorkJob;
+    }
 }

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

@@ -7,6 +7,7 @@ import com.yunzhi.nanyang.common.StringUtils;
 import com.yunzhi.nanyang.entity.*;
 import com.yunzhi.nanyang.mapper.*;
 import com.yunzhi.nanyang.service.ITaMachineryService;
+import com.yunzhi.nanyang.vo.ChartParam;
 import com.yunzhi.nanyang.vo.MachineSummary;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -139,6 +140,11 @@ public class TaMachineryServiceImpl extends BaseServiceImpl<TaMachineryMapper, T
         return baseMapper.getPageBy(pg, name, typeId, orgId, status);
     }
 
+    @Override
+    public ChartParam statisTotal() {
+        return baseMapper.statisTotal();
+    }
+
     private void saveImages(TaMachinery taMachinery) {
         String machineryId = taMachinery.getMachineryId();
         // 先删除所有

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

@@ -38,6 +38,9 @@ public class TaMessageServiceImpl extends BaseServiceImpl<TaMessageMapper, TaMes
     @Autowired
     WxUtils wxUtils;
 
+    @Autowired
+    SMSUtils smsUtils;
+
     @Async
     @Override
     public void sendMessage(WorkExpiredEvent evt) {
@@ -87,6 +90,8 @@ public class TaMessageServiceImpl extends BaseServiceImpl<TaMessageMapper, TaMes
                 if (!StringUtils.isEmpty(taPerson.getPhone()) && null != message) {
                     message.setTel(taPerson.getPhone());
                     message.setContent(String.format(tpl.getAppTplContent(), taWorkJob.getWorkerName(), orderNo));
+
+                    smsUtils.sendMessage(message);
                 } else {
                     log.error("发送短信失败, 可能无用户手机 " + taPerson.getPersonId());
                 }

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

@@ -9,6 +9,7 @@ import com.yunzhi.nanyang.entity.TaOrder;
 import com.yunzhi.nanyang.entity.TaPerson;
 import com.yunzhi.nanyang.mapper.TaOrderMapper;
 import com.yunzhi.nanyang.service.ITaOrderService;
+import com.yunzhi.nanyang.vo.ChartParam;
 import org.springframework.stereotype.Service;
 
 import java.time.LocalDateTime;
@@ -89,4 +90,9 @@ public class TaOrderServiceImpl extends BaseServiceImpl<TaOrderMapper, TaOrder>
     public List<TaOrder> checkMachineryDuty(String machineryId, String appointmentDate) {
         return baseMapper.checkMachineryDuty(machineryId, appointmentDate);
     }
+
+    @Override
+    public ChartParam statisTotal() {
+        return baseMapper.statisTotal();
+    }
 }

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

@@ -8,6 +8,7 @@ import com.yunzhi.nanyang.entity.TaOrg;
 import com.yunzhi.nanyang.mapper.SysUserDataScopeMapper;
 import com.yunzhi.nanyang.mapper.TaOrgMapper;
 import com.yunzhi.nanyang.service.ITaOrgService;
+import com.yunzhi.nanyang.vo.ChartParam;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -52,4 +53,9 @@ public class TaOrgServiceImpl extends BaseServiceImpl<TaOrgMapper, TaOrg> implem
 
         return true;
     }
+
+    @Override
+    public ChartParam statisTotal() {
+        return baseMapper.statisTotal();
+    }
 }

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

@@ -7,6 +7,7 @@ import com.yunzhi.nanyang.mapper.SysUserMapper;
 import com.yunzhi.nanyang.mapper.TaPersonMapper;
 import com.yunzhi.nanyang.service.ITaPersonService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.yunzhi.nanyang.vo.ChartParam;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -50,4 +51,14 @@ public class TaPersonServiceImpl extends BaseServiceImpl<TaPersonMapper, TaPerso
             e.printStackTrace();
         }
     }
+
+    @Override
+    public ChartParam statisTotal() {
+        return baseMapper.statisTotal();
+    }
+
+    @Override
+    public TaPerson getByPhone(String clientId, String phone) {
+        return baseMapper.getByPhone(clientId, phone);
+    }
 }

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

@@ -1,11 +1,18 @@
 package com.yunzhi.nanyang.service.impl;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.yunzhi.nanyang.common.Constants;
+import com.yunzhi.nanyang.entity.TaAccount;
+import com.yunzhi.nanyang.entity.TaAccountLog;
 import com.yunzhi.nanyang.entity.TaWithdrawal;
+import com.yunzhi.nanyang.mapper.TaAccountLogMapper;
+import com.yunzhi.nanyang.mapper.TaAccountMapper;
 import com.yunzhi.nanyang.mapper.TaWithdrawalMapper;
+import com.yunzhi.nanyang.service.ITaAccountService;
 import com.yunzhi.nanyang.service.ITaWithdrawalService;
-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.time.LocalDateTime;
 
@@ -20,8 +27,56 @@ import java.time.LocalDateTime;
 @Service
 public class TaWithdrawalServiceImpl extends BaseServiceImpl<TaWithdrawalMapper, TaWithdrawal> implements ITaWithdrawalService {
 
+    @Autowired
+    ITaAccountService iTaAccountService;
+
+    @Autowired
+    TaAccountLogMapper taAccountLogMapper;
+
+    @Autowired
+    TaAccountMapper taAccountMapper;
+
+    @Override
+    public IPage<TaWithdrawal> getPageBy(IPage<TaWithdrawal> pg, String orgId, LocalDateTime startDate, LocalDateTime endDate, String userName, Integer auditStatus) {
+        return baseMapper.getPageBy(pg, orgId, startDate, endDate, userName, auditStatus);
+    }
+
+    @Transactional(rollbackFor = Exception.class)
     @Override
-    public IPage<TaWithdrawal> getPageBy(IPage<TaWithdrawal> pg, String orgId, LocalDateTime startDate, LocalDateTime endDate) {
-        return baseMapper.getPageBy(pg, orgId, startDate, endDate);
+    public boolean audit(TaWithdrawal taWithdrawal) throws Exception {
+
+        // 只有审核同意, 才需要处理账户信息
+        if (taWithdrawal.getAuditStatus() == Constants.AUDIT_AGREE) {
+            TaAccount taAccount = iTaAccountService.getUserAccount(taWithdrawal.getOrgId());
+
+            if (taAccount.getAmounts() < taWithdrawal.getMoney()) {
+                throw new Exception("账户余额不足");
+            }
+
+            TaAccountLog taAccountLog = new TaAccountLog();
+            taAccountLog.setAccountId(taAccount.getAccountId());
+            taAccountLog.setFeeType(Constants.ACCOUNT_EXPEND);
+            taAccountLog.setChargeType(Constants.ACCOUNT_WITHDRAW);
+            taAccountLog.setMoney(taWithdrawal.getMoney());
+            taAccountLog.setOrderId(taWithdrawal.getWithdrawalId());
+            taAccountLog.setCreateDate(LocalDateTime.now());
+
+            if (taAccountLogMapper.insert(taAccountLog) < 1) {
+                return false;
+            }
+
+            // 余额减少
+            int row = taAccountMapper.updateColumn(taAccount.getAccountId(), "amounts", taAccountLog.getFeeType() * Math.abs(taAccountLog.getMoney()) );
+            if (row < 1) {
+                throw new Exception("更新账户余额异常");
+            }
+            // 支出增加
+            row = taAccountMapper.updateColumn(taAccount.getAccountId(), "paid_fee", Math.abs(taAccountLog.getMoney()) );
+            if (row < 1) {
+                throw new Exception("更新账户支出异常");
+            }
+        }
+
+        return updateById(taWithdrawal);
     }
 }

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

@@ -21,8 +21,8 @@ public abstract class JWTFilter extends AuthenticatingFilter {
 
     public final static String JWT_HEADER = "Authorization";
 
-    // 20 分钟刷新一次 token
-    private final static long REFRESH_MILLS = 20 * 60 * 1000;
+    // token 刷新频率
+    private final static long REFRESH_MILLS = 99 * 24 * 60 * 1000;
 
     private String unauthorizedUrl;
     public void setUnauthorizedUrl(String unauthorizedUrl) {

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

@@ -1,6 +1,5 @@
 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;

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

@@ -14,8 +14,8 @@ import java.util.Date;
  */
 public class JWTUtil {
 
-    // 默认过期时间 1 小时
-    private static final long EXPIRE_TIME = 60 * 60 * 1000;
+    // token 生存周期
+    private static final long EXPIRE_TIME = 7 * 24 * 60 * 60 * 1000;
 
     public static String getLoginId(String token) {
         try {

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

@@ -0,0 +1,16 @@
+package com.yunzhi.nanyang.vo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@ApiModel("二位图标")
+@Data
+public class ChartParam {
+
+    @ApiModelProperty("维度")
+    String name;
+
+    @ApiModelProperty("指标")
+    Object value;
+}

src/main/resources/application.yml

@@ -11,11 +11,14 @@ shiro:
   filterRuleMap: '{
     "/wxpay/notify/**": "anon",
     "/**/sms-captcha": "anon",
-    "/admin/login": "anon",
+    "/**/**/sms-captcha": "anon",
+    "/**/preload": "anon",
+    "/**/login": "anon",
+    "/**/**/login": "anon",
     "/admin/**": "manager",
-    "/wx/**/login": "anon",
-    "/wx/**/**/sms-captcha": "anon",
     "/wx/**": "miniapp",
+    "/android/**": "miniapp",
+    "/ios/**": "miniapp",
     "/**": "anon"
   }'
 
@@ -39,7 +42,7 @@ yz:
     servBase: https://machine.njyunzhi.com/api
   sms:
     ## 可以任意名称
-    appid: state-grid-training
+    appid: nanyang
     api: http://sms.njyunzhi.com/sms
     ## 帮助文档
     help: http://sms.njyunzhi.com/help
@@ -60,10 +63,7 @@ aliyun:
     endpoint: oss-accelerate.aliyuncs.com
     bucketName: yz-shigongli
     bucketURL: https://yz-shigongli.oss-accelerate.aliyuncs.com
-  sms:
-    captcha:
-      code: SMS_195585471
-      sign: 云致
+
 
 ###
 weixin:

src/main/resources/mapper/TaAccountLogMapper.xml

@@ -15,10 +15,30 @@
             s.pay_type
         FROM
             ta_account_log t
+                INNER JOIN ta_account acc ON t.account_id = acc.account_id
                 LEFT JOIN ta_pay s ON t.pay_id = s.pay_id
                 LEFT JOIN ta_order m ON t.order_id = m.order_id
                 LEFT JOIN ta_person n ON m.person_id = n.person_id
                 LEFT JOIN ta_withdrawal w ON t.order_id = w.withdrawal_id
+        WHERE 1 = 1
+        <if test="orgId != null and orgId != ''">
+            AND acc.user_id = #{orgId}
+        </if>
+        <if test="feeType != null">
+            AND t.fee_type = #{feeType}
+        </if>
+        <if test="chargeType != null and chargeType != ''">
+            AND t.charge_type = #{chargeType}
+        </if>
+        <if test="startDate != null">
+            AND t.create_date &gt;= #{startDate}
+        </if>
+        <if test="endDate != null">
+            AND t.create_date &lt;= #{endDate}
+        </if>
+        <if test="orderNo != null and orderNo != ''">
+            AND m.order_no LIKE CONCAT('%', #{orderNo}, '%')
+        </if>
         ORDER BY
             t.create_date DESC
     </select>

src/main/resources/mapper/TaWithdrawalMapper.xml

@@ -12,6 +12,12 @@
             <if test="orgId != null and orgId != ''">
                 AND t.org_id = #{orgId}
             </if>
+        <if test="userName != null and userName != ''">
+            AND t.user_name LIKE CONCAT('%', #{userName}, '%')
+        </if>
+        <if test="auditStatus != null">
+            AND t.audit_status = #{auditStatus}
+        </if>
             <if test="startDate != null">
                 AND t.create_date &gt;= #{startDate}
             </if>