feats

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

@@ -7,11 +7,19 @@ public class Constants {
     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";    // 资讯
+
+    // 支付状态
+    public final static int PAY_READY = 0;  // 待支付
+    public final static int PAY_PAID = 1;  // 已支付
+    public final static int PAY_REFUND = -1;  // 已退款
+
+    // 工作状态
+    public final static int WORK_READY = 0;   // 预备中
 }

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

@@ -1,15 +1,13 @@
 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.common.*;
 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.beans.factory.annotation.Value;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 
@@ -32,10 +30,28 @@ public class CommController extends BaseController {
     @Autowired
     SMSCaptcha smsCaptcha;
 
-
     @Autowired
     ITaOrderService taOrderService;
 
+    @Autowired
+    HttpUtils httpUtils;
+
+    @Value("${yz.amap.url}")
+    String amapBaseUrl;
+
+    @Value("${yz.amap.key}")
+    String amapWebKey;
+
+    @ApiOperation(value = "高德地图接口", notes = "高德地图接口")
+    @PostMapping("/{clientId}/amap")
+    public ResponseBean amapWeb(@ApiParam("客户端") @PathVariable String client,
+                                @ApiParam("客户端ID") @PathVariable String clientId,
+                                @ApiParam("接口路径") @RequestParam String path,
+                                @ApiParam("接口参数") @RequestParam String params) throws Exception {
+        String url = amapBaseUrl + path + "?key=" + amapWebKey + "&" + params;
+        String resp = httpUtils.get(url);
+        return ResponseBean.success(resp);
+    }
 
     /**
      * 图片

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

@@ -4,7 +4,9 @@ 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.entity.TaPerson;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
@@ -46,17 +48,23 @@ public class TaAddressController extends BaseController {
      * @param pageSize
      * @return
      */
-    @RequestMapping(value="/taAddress",method= RequestMethod.GET)
+    @RequestMapping(value="/{client}/{clientId}/address",method= RequestMethod.GET)
     @ApiOperation(value="列表", notes = "列表", httpMethod = "GET", response = ResponseBean.class)
-    public ResponseBean taAddressList(@ApiParam("页码") @RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
-									 @ApiParam("单页数据量") @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize) throws Exception{
+    public ResponseBean taAddressList(@ApiParam("客户端") @PathVariable String client,
+                                      @ApiParam("客户端ID") @PathVariable String clientId,
+                                      @ApiParam("页码") @RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
+                                      @ApiParam("单页数据量") @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize) throws Exception{
 
-		    IPage<TaAddress> pg = new Page<>(pageNum, pageSize);
-            QueryWrapper<TaAddress> queryWrapper = new QueryWrapper<>();
-            queryWrapper.orderByDesc("create_date");
+        TaPerson taPerson = currentPerson();
 
-            IPage<TaAddress> result = iTaAddressService.page(pg, queryWrapper);
-            return ResponseBean.success(result);
+        IPage<TaAddress> pg = new Page<>(pageNum, pageSize);
+        QueryWrapper<TaAddress> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("owner_type", clientId);
+        queryWrapper.eq("owner_id", taPerson.getPersonId());
+        queryWrapper.orderByAsc("sort_no");
+
+        IPage<TaAddress> result = iTaAddressService.page(pg, queryWrapper);
+        return ResponseBean.success(result);
     }
 
     /**
@@ -64,13 +72,21 @@ public class TaAddressController extends BaseController {
      * @param taAddress 实体对象
      * @return
      */
-    @RequestMapping(value="/taAddress",method= RequestMethod.POST)
+    @RequestMapping(value="/{client}/{clientId}/address",method= RequestMethod.POST)
     @ApiOperation(value="保存", notes = "保存", httpMethod = "POST", response = ResponseBean.class)
-    public ResponseBean taAddressAdd(@ApiParam("保存内容") @RequestBody TaAddress taAddress) throws Exception{
+    public ResponseBean taAddressAdd(@ApiParam("客户端") @PathVariable String client,
+                                     @ApiParam("客户端ID") @PathVariable String clientId,
+                                     @ApiParam("保存内容") @RequestBody TaAddress taAddress) throws Exception{
+        TaPerson taPerson = currentPerson();
+
+        taAddress.setAddressId(null);
+        taAddress.setOwnerId(taPerson.getPersonId());
+        taAddress.setOwnerType(clientId);
+        taAddress.setStatus(Constants.STATUS_NORMAL);
 
         if (iTaAddressService.save(taAddress)){
             return ResponseBean.success(taAddress);
-        }else {
+        } else {
             return ResponseBean.error("保存失败, 请重试", ResponseBean.ERROR_UNAVAILABLE);
         }
     }
@@ -79,9 +95,22 @@ public class TaAddressController extends BaseController {
      * 根据id删除对象
      * @param id  实体ID
      */
-    @RequestMapping(value="/taAddress/{id}", method= RequestMethod.DELETE)
+    @RequestMapping(value="/{client}/{clientId}/address/{id}", method= RequestMethod.DELETE)
     @ApiOperation(value="删除", notes = "删除", httpMethod = "DELETE", response = ResponseBean.class)
-    public ResponseBean taAddressDelete(@ApiParam("对象ID") @PathVariable Integer id) throws Exception{
+    public ResponseBean taAddressDelete(@ApiParam("客户端") @PathVariable String client,
+                                        @ApiParam("客户端ID") @PathVariable String clientId,
+                                        @ApiParam("对象ID") @PathVariable String id) throws Exception{
+        TaPerson current = currentPerson();
+        TaAddress taAddress = iTaAddressService.getById(id);
+
+        if (null == taAddress) {
+            return ResponseBean.error("未找到地址信息");
+        }
+
+        if (!clientId.equals(taAddress.getOwnerType()) || !current.getPersonId().equals(taAddress.getOwnerId())) {
+            return ResponseBean.error("无操作权限");
+        }
+
         if(iTaAddressService.removeById(id)){
             return ResponseBean.success("success");
         }else {
@@ -95,25 +124,60 @@ public class TaAddressController extends BaseController {
      * @param taAddress 实体对象
      * @return
      */
-    @RequestMapping(value="/taAddress/{id}",method= RequestMethod.PUT)
+    @RequestMapping(value="/{client}/{clientId}/address/{id}",method= RequestMethod.PUT)
     @ApiOperation(value="更新", notes = "更新", httpMethod = "PUT", response = ResponseBean.class)
-    public ResponseBean taAddressUpdate(@ApiParam("对象ID") @PathVariable Integer id,
+    public ResponseBean taAddressUpdate(@ApiParam("客户端") @PathVariable String client,
+                                        @ApiParam("客户端ID") @PathVariable String clientId,
+                                        @ApiParam("对象ID") @PathVariable String id,
                                         @ApiParam("更新内容") @RequestBody TaAddress taAddress) throws Exception{
 
+        TaPerson current = currentPerson();
+        TaAddress origin = iTaAddressService.getById(id);
+
+        if (null == origin) {
+            return ResponseBean.error("未找到地址信息");
+        }
+
+        if (!clientId.equals(origin.getOwnerType()) || !current.getPersonId().equals(origin.getOwnerId())) {
+            return ResponseBean.error("无操作权限");
+        }
+
+        taAddress.setAddressId(id);
+
         if (iTaAddressService.updateById(taAddress)){
-            return ResponseBean.success(iTaAddressService.getById(id));
+            return ResponseBean.success(taAddress);
         }else {
             return ResponseBean.error("修改失败, 请重试", ResponseBean.ERROR_UNAVAILABLE);
         }
     }
 
     /**
-     * 根据id查询对象
+     * 设置默认地址
      * @param id  实体ID
+     * @param taAddress 实体对象
+     * @return
      */
-    @RequestMapping(value="/taAddress/{id}",method= RequestMethod.GET)
-    @ApiOperation(value="详情", notes = "详情", httpMethod = "GET", response = ResponseBean.class)
-    public ResponseBean taAddressGet(@ApiParam("对象ID") @PathVariable Integer id) throws Exception{
-        return ResponseBean.success(iTaAddressService.getById(id));
+    @RequestMapping(value="/{client}/{clientId}/address/{id}/default",method= RequestMethod.PUT)
+    @ApiOperation(value="设置默认地址", notes = "设置默认地址", httpMethod = "PUT", response = ResponseBean.class)
+    public ResponseBean updateDefault(@ApiParam("客户端") @PathVariable String client,
+                                      @ApiParam("客户端ID") @PathVariable String clientId,
+                                      @ApiParam("对象ID") @PathVariable String id) throws Exception{
+
+        TaPerson current = currentPerson();
+        TaAddress origin = iTaAddressService.getById(id);
+
+        if (null == origin) {
+            return ResponseBean.error("未找到地址信息");
+        }
+
+        if (!clientId.equals(origin.getOwnerType()) || !current.getPersonId().equals(origin.getOwnerId())) {
+            return ResponseBean.error("无操作权限");
+        }
+
+        if (iTaAddressService.updateDefault(origin)){
+            return ResponseBean.success("success");
+        }else {
+            return ResponseBean.error("修改失败, 请重试", ResponseBean.ERROR_UNAVAILABLE);
+        }
     }
 }

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

@@ -23,6 +23,8 @@ import com.yunzhi.nanyang.service.ITaBannerService;
 import com.yunzhi.nanyang.entity.TaBanner;
 import org.springframework.web.bind.annotation.RestController;
 
+import java.util.List;
+
 /**
  * <p>
     * 轮播图表 前端控制器
@@ -67,6 +69,28 @@ public class TaBannerController extends BaseController {
         return ResponseBean.success(result);
     }
 
+
+    /**
+     * 分页查询列表
+     * @param client
+     * @param clientId
+     * @return
+     */
+    @RequestMapping(value="/{client}/{clientId}/banner",method= RequestMethod.GET)
+    @ApiOperation(value="移动端列表", notes = "移动端列表", httpMethod = "GET", response = ResponseBean.class)
+    public ResponseBean getList(@ApiParam("客户端") @PathVariable String client,
+                                @ApiParam("客户端ID") @PathVariable String clientId,
+                                @ApiParam("类型") @RequestParam(value ="position", required = false) String position) throws Exception{
+
+        QueryWrapper<TaBanner> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq(!StringUtils.isEmpty(position), "position", position);
+        queryWrapper.eq("status", Constants.STATUS_NORMAL);
+        queryWrapper.orderByDesc("create_date");
+
+        List<TaBanner> result = iTaBannerService.list(queryWrapper);
+        return ResponseBean.success(result);
+    }
+
     /**
      * 保存对象
      * @param taBanner 实体对象

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

@@ -4,10 +4,13 @@ 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 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 +49,16 @@ public class TaFeedbackController extends BaseController {
      * @param pageSize
      * @return
      */
-    @RequestMapping(value="/taFeedback",method= RequestMethod.GET)
+    @RequestMapping(value="/admin/feedback",method= RequestMethod.GET)
     @ApiOperation(value="列表", notes = "列表", httpMethod = "GET", response = ResponseBean.class)
     public ResponseBean taFeedbackList(@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 ="nickName", required = false) String nickName,
+                                       @ApiParam("手机号") @RequestParam(value ="phone", required = false) String phone) throws Exception{
 
-		    IPage<TaFeedback> pg = new Page<>(pageNum, pageSize);
-            QueryWrapper<TaFeedback> queryWrapper = new QueryWrapper<>();
-            queryWrapper.orderByDesc("create_date");
-
-            IPage<TaFeedback> result = iTaFeedbackService.page(pg, queryWrapper);
-            return ResponseBean.success(result);
+        IPage<TaFeedback> pg = new Page<>(pageNum, pageSize);
+        IPage<TaFeedback> result = iTaFeedbackService.getPageBy(pg, nickName, phone);
+        return ResponseBean.success(result);
     }
 
     /**
@@ -64,9 +66,15 @@ public class TaFeedbackController extends BaseController {
      * @param taFeedback 实体对象
      * @return
      */
-    @RequestMapping(value="/taFeedback",method= RequestMethod.POST)
+    @RequestMapping(value="/{client}/{clientId}/feedback",method= RequestMethod.POST)
     @ApiOperation(value="保存", notes = "保存", httpMethod = "POST", response = ResponseBean.class)
-    public ResponseBean taFeedbackAdd(@ApiParam("保存内容") @RequestBody TaFeedback taFeedback) throws Exception{
+    public ResponseBean taFeedbackAdd(@ApiParam("客户端") @PathVariable String client,
+                                      @ApiParam("客户端ID") @PathVariable String clientId,
+                                      @ApiParam("保存内容") @RequestBody TaFeedback taFeedback) throws Exception{
+
+        taFeedback.setFromPerson(currentPerson().getPersonId());
+        taFeedback.setFromPort(clientId);
+        taFeedback.setStatus(Constants.STATUS_READY);
 
         if (iTaFeedbackService.save(taFeedback)){
             return ResponseBean.success(taFeedback);
@@ -75,31 +83,17 @@ public class TaFeedbackController extends BaseController {
         }
     }
 
-    /**
-     * 根据id删除对象
-     * @param id  实体ID
-     */
-    @RequestMapping(value="/taFeedback/{id}", method= RequestMethod.DELETE)
-    @ApiOperation(value="删除", notes = "删除", httpMethod = "DELETE", response = ResponseBean.class)
-    public ResponseBean taFeedbackDelete(@ApiParam("对象ID") @PathVariable Integer id) throws Exception{
-        if(iTaFeedbackService.removeById(id)){
-            return ResponseBean.success("success");
-        }else {
-            return ResponseBean.error("删除失败, 请重试", ResponseBean.ERROR_UNAVAILABLE);
-        }
-    }
-
     /**
      * 修改对象
      * @param id  实体ID
      * @param taFeedback 实体对象
      * @return
      */
-    @RequestMapping(value="/taFeedback/{id}",method= RequestMethod.PUT)
+    @RequestMapping(value="/admin/feedback/{id}",method= RequestMethod.PUT)
     @ApiOperation(value="更新", notes = "更新", httpMethod = "PUT", response = ResponseBean.class)
-    public ResponseBean taFeedbackUpdate(@ApiParam("对象ID") @PathVariable Integer id,
+    @RequiresPermissions("feedback:update")
+    public ResponseBean taFeedbackUpdate(@ApiParam("对象ID") @PathVariable String id,
                                         @ApiParam("更新内容") @RequestBody TaFeedback taFeedback) throws Exception{
-
         if (iTaFeedbackService.updateById(taFeedback)){
             return ResponseBean.success(iTaFeedbackService.getById(id));
         }else {
@@ -111,9 +105,11 @@ public class TaFeedbackController extends BaseController {
      * 根据id查询对象
      * @param id  实体ID
      */
-    @RequestMapping(value="/taFeedback/{id}",method= RequestMethod.GET)
+    @RequestMapping(value="/{client}/{clientId}/feedback/{id}",method= RequestMethod.GET)
     @ApiOperation(value="详情", notes = "详情", httpMethod = "GET", response = ResponseBean.class)
-    public ResponseBean taFeedbackGet(@ApiParam("对象ID") @PathVariable Integer id) throws Exception{
+    public ResponseBean taFeedbackGet(@ApiParam("客户端") @PathVariable String client,
+                                      @ApiParam("客户端ID") @PathVariable String clientId,
+                                      @ApiParam("对象ID") @PathVariable String id) throws Exception{
         return ResponseBean.success(iTaFeedbackService.getById(id));
     }
 }

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

@@ -8,6 +8,9 @@ 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.TaPerson;
+import com.yunzhi.nanyang.service.ISysUserService;
+import com.yunzhi.nanyang.vo.MachineSummary;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
@@ -43,6 +46,9 @@ public class TaMachineryController extends BaseController {
     @Autowired
     public ITaMachineryService iTaMachineryService;
 
+    @Autowired
+    public ISysUserService iSysUserService;
+
 
     /**
      * 分页查询列表
@@ -55,15 +61,23 @@ public class TaMachineryController extends BaseController {
     public ResponseBean taMachineryList(@ApiParam("页码") @RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
                                         @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{
+                                        @ApiParam("类型") @RequestParam(value ="typeId", required = false) String typeId,
+                                        @ApiParam("机构ID") @RequestParam(value ="orgId", required = false) String orgId) throws Exception{
         SysUser sysUser = currentUser();
         boolean isAdmin = Constants.ADMIN_ID.equals(sysUser.getUserId());
 
+        if (!StringUtils.isEmpty(orgId)) {
+            if (!checkOrgAccess(orgId, sysUser.getUserId())) {
+                return ResponseBean.error("无权限操作");
+            }
+        }
+
         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.eq(!StringUtils.isEmpty(orgId), "org_id", orgId);
         queryWrapper.gt("status", Constants.STATUS_DELETE);
         queryWrapper.orderByDesc("create_date");
 
@@ -71,6 +85,44 @@ public class TaMachineryController extends BaseController {
         return ResponseBean.success(result);
     }
 
+
+    /**
+     * 分页查询列表
+     * @param pageNum
+     * @param pageSize
+     * @return
+     */
+    @RequestMapping(value="/{client}/{clientId}/machinery",method= RequestMethod.GET)
+    @ApiOperation(value="列表", notes = "列表", httpMethod = "GET", response = ResponseBean.class)
+    public ResponseBean getSummaryList(@ApiParam("客户端") @PathVariable String client,
+                                       @ApiParam("客户端ID") @PathVariable String clientId,
+                                       @ApiParam("页码") @RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
+                                       @ApiParam("单页数据量") @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize,
+                                       @ApiParam("当前位置") @RequestParam(value ="location") String location,
+                                       @ApiParam("分类") @RequestParam(value = "typeId", required = false) String typeId) throws Exception{
+
+        String orgId = null;
+        TaPerson current = currentPerson();
+        if (Constants.CLIENT_WORKER.equals(clientId)) {
+            // 农机手查询机器列表, 只能查询自己绑定的机器
+            if (StringUtils.isEmpty(current.getUserId())) {
+                return ResponseBean.error("未找到绑定农机手信息");
+            }
+
+            SysUser user = iSysUserService.getExistBy("user_id", current.getUserId(), false, true);
+            if (user == null) {
+                return ResponseBean.error("未找到绑定农机手信息");
+            }
+            orgId = user.getOrgId();
+        }
+
+
+        IPage<MachineSummary> pg = new Page<>(pageNum, pageSize);
+
+        IPage<MachineSummary> result = iTaMachineryService.getSummaryList(pg, location, typeId, orgId);
+        return ResponseBean.success(result);
+    }
+
     /**
      * 保存对象
      * @param taMachinery 实体对象
@@ -165,4 +217,19 @@ public class TaMachineryController extends BaseController {
     public ResponseBean taMachineryGet(@ApiParam("对象ID") @PathVariable String id) throws Exception{
         return ResponseBean.success(iTaMachineryService.getDetail(id));
     }
+
+
+    /**
+     * 根据id查询对象
+     * @param id  实体ID
+     */
+    @RequestMapping(value="/{client}/{clientId}/machinery-summary/{id}",method= RequestMethod.GET)
+    @ApiOperation(value="详情", notes = "详情", httpMethod = "GET", response = ResponseBean.class)
+    public ResponseBean getSummaryDetail(@ApiParam("客户端") @PathVariable String client,
+                                         @ApiParam("客户端ID") @PathVariable String clientId,
+                                         @ApiParam("对象ID") @PathVariable String id,
+                                         @ApiParam("当前位置") @RequestParam(value ="location") String location,
+                                         @ApiParam("是否查询附件") @RequestParam(value ="attached", defaultValue = "false") Boolean attached) throws Exception{
+        return ResponseBean.success(iTaMachineryService.getSummaryDetail(id, location, attached));
+    }
 }

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

@@ -4,7 +4,9 @@ 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.entity.TaPerson;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
@@ -46,17 +48,21 @@ public class TaOrderController extends BaseController {
      * @param pageSize
      * @return
      */
-    @RequestMapping(value="/taOrder",method= RequestMethod.GET)
+    @RequestMapping(value="/{client}/{clientId}/order",method= RequestMethod.GET)
     @ApiOperation(value="列表", notes = "列表", httpMethod = "GET", response = ResponseBean.class)
     public ResponseBean taOrderList(@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 = "mine", defaultValue = "false") Boolean isMine) throws Exception{
+        TaPerson taPerson = currentPerson();
 
-		    IPage<TaOrder> pg = new Page<>(pageNum, pageSize);
-            QueryWrapper<TaOrder> queryWrapper = new QueryWrapper<>();
-            queryWrapper.orderByDesc("create_date");
+        IPage<TaOrder> pg = new Page<>(pageNum, pageSize);
+        QueryWrapper<TaOrder> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq(isMine, "person_id", taPerson.getPersonId());
+        queryWrapper.eq("status", Constants.STATUS_NORMAL);
+        queryWrapper.orderByDesc("create_date");
 
-            IPage<TaOrder> result = iTaOrderService.page(pg, queryWrapper);
-            return ResponseBean.success(result);
+        IPage<TaOrder> result = iTaOrderService.page(pg, queryWrapper);
+        return ResponseBean.success(result);
     }
 
     /**
@@ -64,9 +70,18 @@ public class TaOrderController extends BaseController {
      * @param taOrder 实体对象
      * @return
      */
-    @RequestMapping(value="/taOrder",method= RequestMethod.POST)
-    @ApiOperation(value="保存", notes = "保存", httpMethod = "POST", response = ResponseBean.class)
-    public ResponseBean taOrderAdd(@ApiParam("保存内容") @RequestBody TaOrder taOrder) throws Exception{
+    @RequestMapping(value="/{client}/{clientId}/order",method= RequestMethod.POST)
+    @ApiOperation(value="生成订单", notes = "生成订单", httpMethod = "POST", response = ResponseBean.class)
+    public ResponseBean taOrderAdd(@ApiParam("客户端") @PathVariable String client,
+                                   @ApiParam("客户端ID") @PathVariable String clientId,
+                                   @ApiParam("保存内容") @RequestBody TaOrder taOrder) throws Exception{
+        TaPerson taPerson = currentPerson();
+
+        String orderNo = iTaOrderService.getNextOrderNO();
+
+        taOrder.setOrderId(null);
+        taOrder.setOrderNo(orderNo);
+        taOrder.setPersonId(taPerson.getPersonId());
 
         if (iTaOrderService.save(taOrder)){
             return ResponseBean.success(taOrder);
@@ -79,31 +94,29 @@ public class TaOrderController extends BaseController {
      * 根据id删除对象
      * @param id  实体ID
      */
-    @RequestMapping(value="/taOrder/{id}", method= RequestMethod.DELETE)
-    @ApiOperation(value="删除", notes = "删除", httpMethod = "DELETE", response = ResponseBean.class)
-    public ResponseBean taOrderDelete(@ApiParam("对象ID") @PathVariable Integer id) throws Exception{
-        if(iTaOrderService.removeById(id)){
-            return ResponseBean.success("success");
-        }else {
-            return ResponseBean.error("删除失败, 请重试", ResponseBean.ERROR_UNAVAILABLE);
+    @RequestMapping(value="/{client}/{clientId}/order/{id}", method= RequestMethod.DELETE)
+    @ApiOperation(value="取消订单", notes = "取消订单", httpMethod = "DELETE", response = ResponseBean.class)
+    public ResponseBean taOrderDelete(@ApiParam("对象ID") @PathVariable String id) throws Exception{
+
+        TaPerson taPerson = currentPerson();
+        //
+        TaOrder taOrder = iTaOrderService.getById(id);
+        if (null == taOrder || taOrder.getStatus() == Constants.STATUS_DELETE) {
+            return ResponseBean.error("未找到订单信息");
         }
-    }
 
-    /**
-     * 修改对象
-     * @param id  实体ID
-     * @param taOrder 实体对象
-     * @return
-     */
-    @RequestMapping(value="/taOrder/{id}",method= RequestMethod.PUT)
-    @ApiOperation(value="更新", notes = "更新", httpMethod = "PUT", response = ResponseBean.class)
-    public ResponseBean taOrderUpdate(@ApiParam("对象ID") @PathVariable Integer id,
-                                        @ApiParam("更新内容") @RequestBody TaOrder taOrder) throws Exception{
+        if (!taOrder.getPersonId().equals(taPerson.getPersonId())) {
+            return ResponseBean.error("无权操作");
+        }
 
-        if (iTaOrderService.updateById(taOrder)){
-            return ResponseBean.success(iTaOrderService.getById(id));
+        if (taOrder.getPayStatus() == Constants.PAY_PAID) {
+            return ResponseBean.error("订单已支付");
+        }
+
+        if(iTaOrderService.removeLogicById(id)){
+            return ResponseBean.success("success");
         }else {
-            return ResponseBean.error("修改失败, 请重试", ResponseBean.ERROR_UNAVAILABLE);
+            return ResponseBean.error("删除失败, 请重试", ResponseBean.ERROR_UNAVAILABLE);
         }
     }
 
@@ -111,9 +124,9 @@ public class TaOrderController extends BaseController {
      * 根据id查询对象
      * @param id  实体ID
      */
-    @RequestMapping(value="/taOrder/{id}",method= RequestMethod.GET)
+    @RequestMapping(value="/{client}/{clientId}/order/{id}",method= RequestMethod.GET)
     @ApiOperation(value="详情", notes = "详情", httpMethod = "GET", response = ResponseBean.class)
-    public ResponseBean taOrderGet(@ApiParam("对象ID") @PathVariable Integer id) throws Exception{
+    public ResponseBean taOrderGet(@ApiParam("对象ID") @PathVariable String id) throws Exception{
         return ResponseBean.success(iTaOrderService.getById(id));
     }
 }

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

@@ -100,18 +100,67 @@ public class TaPersonController extends BaseController {
 //        }
 //    }
 //
+
+    /**
+     * 更新人员信息
+     * @param client  客户端
+     * @param clientId  客户端ID
+     * @param id  实体ID
+     * @param taPerson 实体对象
+     * @return
+     */
+    @RequestMapping(value="/{client}/{clientId}/person/{id}",method= RequestMethod.PUT)
+    @ApiOperation(value="更新人员信息", notes = "更新人员信息", httpMethod = "PUT", response = ResponseBean.class)
+    public ResponseBean taPersonUpdate(@ApiParam("客户端") @PathVariable String client,
+                                       @ApiParam("客户端ID") @PathVariable String clientId,
+                                       @ApiParam("对象ID") @PathVariable String id,
+                                       @ApiParam("更新内容") @RequestBody TaPerson taPerson) throws Exception{
+
+        TaPerson current = currentPerson();
+        if (!id.equals(current.getPersonId())) {
+            return ResponseBean.error("待更新人员ID不正确");
+        }
+
+        if (StringUtils.isEmpty(taPerson.getPhone())) {
+            return ResponseBean.error("手机号码为空");
+        }
+
+        if (StringUtils.isEmpty(taPerson.getNickName())) {
+            return ResponseBean.error("姓名为空");
+        }
+
+//        boolean isOk = smsCaptcha.validate(phoneParam.getPhone(), phoneParam.getCaptcha());
+//        if (!isOk) {
+//            return ResponseBean.error("验证码不正确或者已过期");
+//        }
+
+        taPerson.setPersonId(id);
+
+        // 关联系统人员
+        SysUser sysUser = iSysUserService.getExistBy("phone", taPerson.getPhone(), false, true);
+        if (sysUser != null && StringUtils.isEmpty(taPerson.getUserId())) {
+            taPerson.setUserId(sysUser.getUserId());
+        }
+
+        if (iTaPersonService.updateById(taPerson)){
+            return ResponseBean.success(taPerson);
+        }else {
+            return ResponseBean.error("修改失败, 请重试", ResponseBean.ERROR_UNAVAILABLE);
+        }
+    }
+
     /**
      * 修改对象
-     * @param appid  实体ID
+     * @param clientId  客户端ID
      * @param id  实体ID
      * @param phoneParam 实体对象
      * @return
      */
-    @RequestMapping(value="/wx/{appid}/person/{id}/phone",method= RequestMethod.PUT)
+    @RequestMapping(value="/wx/{clientId}/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{
+    public ResponseBean updatePhone(@ApiParam("客户端ID") @PathVariable String clientId,
+                                    @ApiParam("对象ID") @PathVariable String id,
+                                    @ApiParam("更新内容") @RequestBody PhoneParam phoneParam) throws Exception{
 
         TaPerson taPerson = currentPerson();
         if (!id.equals(taPerson.getPersonId())) {

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

@@ -5,6 +5,7 @@ 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.service.ITaMachineryService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
@@ -40,6 +41,9 @@ public class TaRegionController extends BaseController {
     @Autowired
     public ITaRegionService iTaRegionService;
 
+    @Autowired
+    public ITaMachineryService iTaMachineryService;
+
 
     /**
      * 分页查询列表
@@ -127,7 +131,8 @@ public class TaRegionController extends BaseController {
         }
 
         if (iTaRegionService.updateById(taRegion)){
-            return ResponseBean.success(iTaRegionService.getById(id));
+            iTaMachineryService.updateRegionName(taRegion.getRegionId(), taRegion.getName());
+            return ResponseBean.success(taRegion);
         }else {
             return ResponseBean.error("修改失败, 请重试", ResponseBean.ERROR_UNAVAILABLE);
         }

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

@@ -5,9 +5,13 @@ 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.entity.SysUser;
+import com.yunzhi.nanyang.entity.TaMachinery;
+import com.yunzhi.nanyang.service.ISysUserService;
 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 +24,8 @@ import com.yunzhi.nanyang.service.ITaUserMachineryService;
 import com.yunzhi.nanyang.entity.TaUserMachinery;
 import org.springframework.web.bind.annotation.RestController;
 
+import java.util.List;
+
 /**
  * <p>
     * 农机绑定 前端控制器
@@ -39,81 +45,59 @@ public class TaUserMachineryController extends BaseController {
     @Autowired
     public ITaUserMachineryService iTaUserMachineryService;
 
+    @Autowired
+    public ISysUserService iSysUserService;
+
 
     /**
      * 分页查询列表
-     * @param pageNum
-     * @param pageSize
+     * @param userId
      * @return
      */
-    @RequestMapping(value="/taUserMachinery",method= RequestMethod.GET)
+    @RequestMapping(value="/admin/user-machinery",method= RequestMethod.GET)
     @ApiOperation(value="列表", notes = "列表", httpMethod = "GET", response = ResponseBean.class)
-    public ResponseBean taUserMachineryList(@ApiParam("页码") @RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
-									 @ApiParam("单页数据量") @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize) throws Exception{
+    public ResponseBean taUserMachineryList(@ApiParam("用户ID") @RequestParam(value ="userId") String userId) throws Exception{
 
-		    IPage<TaUserMachinery> pg = new Page<>(pageNum, pageSize);
-            QueryWrapper<TaUserMachinery> queryWrapper = new QueryWrapper<>();
-            queryWrapper.orderByDesc("create_date");
+        SysUser sysUser = iSysUserService.getExistBy("user_id", userId, false, true);
+        if (null == sysUser) {
+            return ResponseBean.error("未找到指定人员");
+        }
 
-            IPage<TaUserMachinery> result = iTaUserMachineryService.page(pg, queryWrapper);
-            return ResponseBean.success(result);
+        SysUser current = currentUser();
+        if (!checkOrgAccess(sysUser.getOrgId(), current.getUserId())) {
+            return ResponseBean.error("暂无权限");
+        }
+
+        List<TaUserMachinery> result = iTaUserMachineryService.getByUser(userId);
+        return ResponseBean.success(result);
     }
 
     /**
      * 保存对象
-     * @param taUserMachinery 实体对象
+     * @param userMachineryList 实体对象
      * @return
      */
-    @RequestMapping(value="/taUserMachinery",method= RequestMethod.POST)
+    @RequestMapping(value="/admin/user/{userId}/machinery",method= RequestMethod.POST)
     @ApiOperation(value="保存", notes = "保存", httpMethod = "POST", response = ResponseBean.class)
-    public ResponseBean taUserMachineryAdd(@ApiParam("保存内容") @RequestBody TaUserMachinery taUserMachinery) throws Exception{
+    @RequiresPermissions("user:update")
+    public ResponseBean taUserMachineryAdd(@ApiParam("用户ID") @PathVariable String userId,
+                                           @ApiParam("保存内容") @RequestBody List<TaUserMachinery> userMachineryList) throws Exception{
 
-        if (iTaUserMachineryService.save(taUserMachinery)){
-            return ResponseBean.success(taUserMachinery);
-        }else {
-            return ResponseBean.error("保存失败, 请重试", ResponseBean.ERROR_UNAVAILABLE);
+        SysUser sysUser = iSysUserService.getExistBy("user_id", userId, false, true);
+        if (null == sysUser) {
+            return ResponseBean.error("未找到指定人员");
         }
-    }
 
-    /**
-     * 根据id删除对象
-     * @param id  实体ID
-     */
-    @RequestMapping(value="/taUserMachinery/{id}", method= RequestMethod.DELETE)
-    @ApiOperation(value="删除", notes = "删除", httpMethod = "DELETE", response = ResponseBean.class)
-    public ResponseBean taUserMachineryDelete(@ApiParam("对象ID") @PathVariable Integer id) throws Exception{
-        if(iTaUserMachineryService.removeById(id)){
-            return ResponseBean.success("success");
-        }else {
-            return ResponseBean.error("删除失败, 请重试", ResponseBean.ERROR_UNAVAILABLE);
+        SysUser current = currentUser();
+        if (!checkOrgAccess(sysUser.getOrgId(), current.getUserId())) {
+            return ResponseBean.error("暂无权限");
         }
-    }
 
-    /**
-     * 修改对象
-     * @param id  实体ID
-     * @param taUserMachinery 实体对象
-     * @return
-     */
-    @RequestMapping(value="/taUserMachinery/{id}",method= RequestMethod.PUT)
-    @ApiOperation(value="更新", notes = "更新", httpMethod = "PUT", response = ResponseBean.class)
-    public ResponseBean taUserMachineryUpdate(@ApiParam("对象ID") @PathVariable Integer id,
-                                        @ApiParam("更新内容") @RequestBody TaUserMachinery taUserMachinery) throws Exception{
-
-        if (iTaUserMachineryService.updateById(taUserMachinery)){
-            return ResponseBean.success(iTaUserMachineryService.getById(id));
-        }else {
-            return ResponseBean.error("修改失败, 请重试", ResponseBean.ERROR_UNAVAILABLE);
+        if (iTaUserMachineryService.editWithUser(userId, userMachineryList)){
+            return ResponseBean.success(userMachineryList);
+        } else {
+            return ResponseBean.error("保存失败, 请重试", ResponseBean.ERROR_UNAVAILABLE);
         }
     }
 
-    /**
-     * 根据id查询对象
-     * @param id  实体ID
-     */
-    @RequestMapping(value="/taUserMachinery/{id}",method= RequestMethod.GET)
-    @ApiOperation(value="详情", notes = "详情", httpMethod = "GET", response = ResponseBean.class)
-    public ResponseBean taUserMachineryGet(@ApiParam("对象ID") @PathVariable Integer id) throws Exception{
-        return ResponseBean.success(iTaUserMachineryService.getById(id));
-    }
 }

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

@@ -69,6 +69,31 @@ public class TdMachineryTypeController extends BaseController {
         return ResponseBean.success(result);
     }
 
+
+    /**
+     * 移动端列表
+     * @param pageNum
+     * @param pageSize
+     * @return
+     */
+    @RequestMapping(value="/{client}/{clientId}/machinery-type",method= RequestMethod.GET)
+    @ApiOperation(value="移动端列表", notes = "移动端列表", httpMethod = "GET", response = ResponseBean.class)
+    public ResponseBean getList(@ApiParam("客户端") @PathVariable String client,
+                                @ApiParam("客户端ID") @PathVariable String clientId,
+                                @ApiParam("页码") @RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
+                                @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.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);
+    }
+
     /**
      * 保存对象
      * @param tdMachineryType 实体对象
@@ -147,7 +172,8 @@ public class TdMachineryTypeController extends BaseController {
         }
 
         if (iTdMachineryTypeService.updateById(tdMachineryType)){
-            return ResponseBean.success(iTdMachineryTypeService.getById(id));
+            iTaMachineryService.updateTypeName(tdMachineryType.getTypeId(), tdMachineryType.getName());
+            return ResponseBean.success(tdMachineryType);
         }else {
             return ResponseBean.error("修改失败, 请重试", ResponseBean.ERROR_UNAVAILABLE);
         }

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

@@ -25,7 +25,7 @@ import java.util.Map;
 
 @Api(tags = "小程序登入/登出")
 @RestController
-@RequestMapping("/wx/{appid}")
+@RequestMapping("/wx/{clientId}")
 public class WxMaController extends BaseController {
 
     @Autowired
@@ -46,8 +46,8 @@ public class WxMaController extends BaseController {
                 && !StringUtils.isEmpty(loginParam.getPassword());
     }
 
-    private WxMaService getService(String appid) throws Exception {
-        SysMiniapp miniapp = iSysMiniappService.getById(appid);
+    private WxMaService getService(String clientId) throws Exception {
+        SysMiniapp miniapp = iSysMiniappService.getByClient(clientId);
         if (null == miniapp || miniapp.getStatus() != Constants.STATUS_NORMAL) {
             throw new Exception("未找到有效的小程序配置");
         }
@@ -57,11 +57,8 @@ public class WxMaController extends BaseController {
 
     @GetMapping("/preload")
     @ApiOperation(value="小程序登录", notes = "小程序登录", httpMethod = "POST", response = ResponseBean.class)
-    public ResponseBean preload(@ApiParam("小程序ID") @PathVariable String appid,
+    public ResponseBean preload(@ApiParam("客户端ID") @PathVariable String clientId,
                                 @ApiParam("小程序预加载参数") @RequestParam WxMaPreload wxMaPreload) throws Exception {
-        if (!appid.equals(wxMaPreload.getAppid())) {
-            return ResponseBean.error("小程序预加载接口配置错误");
-        }
 
         return ResponseBean.success(null);
     }
@@ -74,29 +71,35 @@ public class WxMaController extends BaseController {
      */
     @PostMapping("/login")
     @ApiOperation(value="小程序登录", notes = "小程序登录", httpMethod = "POST", response = ResponseBean.class)
-    public ResponseBean appLogin(@ApiParam("小程序ID") @PathVariable String appid,
+    public ResponseBean appLogin(@ApiParam("客户端ID") @PathVariable String clientId,
                                  @ApiParam("登录参数") @RequestBody LoginParam loginParam) throws Exception {
 
         if (StringUtils.isEmpty(loginParam.getCode())) {
             return ResponseBean.error("CODE 不能为空");
         }
 
-        WxMaService service = getService(appid);
+        SysMiniapp miniapp = iSysMiniappService.getByClient(clientId);
+        WxMaService service = getService(clientId);
 
         WxMaJscode2SessionResult sessionInfo = service.getUserService().getSessionInfo(loginParam.getCode());
         String openid = sessionInfo.getOpenid();
         String sessionKey = sessionInfo.getSessionKey();
 
-        TaPerson taPerson = iTaPersonService.getByOpenId(appid, openid);
+        TaPerson taPerson = iTaPersonService.getByOpenId(miniapp.getAppId(), openid);
         if (null == taPerson) {
             taPerson = new TaPerson();
-            taPerson.setAppId(appid);
+            taPerson.setAppId(miniapp.getAppId());
             taPerson.setOpenid(openid);
             taPerson.setStatus(Constants.STATUS_NORMAL);
             taPerson.setCreateDate(LocalDateTime.now());
             iTaPersonService.save(taPerson);
         }
 
+        // 如果是农机手
+        if (Constants.CLIENT_WORKER.equals(miniapp.getClient())) {
+            iTaPersonService.tryBindUser(taPerson);
+        }
+
         // 生成 token
         String token = JWTUtil.sign(taPerson.getPersonId(), taPerson.getPersonId());
 
@@ -111,9 +114,9 @@ public class WxMaController extends BaseController {
 
     @PutMapping("/auth-user")
     @ApiOperation(value="授权头像", notes = "授权头像", httpMethod = "PUT", response = TaPerson.class)
-    public ResponseBean updateUserInfo(@ApiParam("小程序ID") @PathVariable String appid,
+    public ResponseBean updateUserInfo(@ApiParam("客户端ID") @PathVariable String clientId,
                                        @ApiParam("授权头像的参数") @RequestBody WxMaAuthParam params) throws Exception {
-        WxMaService service = getService(appid);
+        WxMaService service = getService(clientId);
         checkAuthParams(service, params);
 
         // 解密用户信息
@@ -135,10 +138,10 @@ public class WxMaController extends BaseController {
 
     @ApiOperation(value="授权手机", notes = "授权手机", httpMethod = "PUT", response = TaPerson.class)
     @PutMapping("/auth-phone")
-    public ResponseBean updateUserPhone(@ApiParam("小程序ID") @PathVariable String appid,
+    public ResponseBean updateUserPhone(@ApiParam("客户端ID") @PathVariable String clientId,
                                         @ApiParam("授权手机的参数") @RequestBody WxMaAuthParam params) throws Exception {
 
-        WxMaService service = getService(appid);
+        WxMaService service = getService(clientId);
 
         // 解密
         WxMaPhoneNumberInfo phoneNoInfo = service.getUserService().getPhoneNoInfo(params.getSessionKey(), params.getEncryptedData(), params.getIv());

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

@@ -26,11 +26,11 @@ public class TaAddress implements Serializable {
     private static final long serialVersionUID = 1L;
 
     @ApiModelProperty(value = "地址ID")
-    @TableId(value = "address_id", type = IdType.INPUT)
+    @TableId(value = "address_id", type = IdType.UUID)
     private String addressId;
 
     @ApiModelProperty(value = "地址")
-    private Integer address;
+    private String address;
 
     @ApiModelProperty(value = "所属人类型")
     private String ownerType;
@@ -39,7 +39,7 @@ public class TaAddress implements Serializable {
     private String ownerId;
 
     @ApiModelProperty(value = "是否默认")
-    private Integer isDefault;
+    private Boolean isDefault;
 
     @ApiModelProperty(value = "排序")
     private Integer sortNo;

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

@@ -2,6 +2,8 @@ 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 io.swagger.annotations.ApiModel;
@@ -27,7 +29,7 @@ public class TaFeedback implements Serializable {
     private static final long serialVersionUID = 1L;
 
     @ApiModelProperty(value = "反馈ID")
-    @TableId(value = "feedback_id", type = IdType.INPUT)
+    @TableId(value = "feedback_id", type = IdType.UUID)
     private String feedbackId;
 
     @ApiModelProperty(value = "反馈端口")
@@ -48,5 +50,11 @@ public class TaFeedback implements Serializable {
     @ApiModelProperty(value = "创建时间")
     private LocalDateTime createDate;
 
+    @TableField(exist = false)
+    @ApiModelProperty(value = "名称")
+    private String nickName;
 
+    @TableField(exist = false)
+    @ApiModelProperty(value = "手机号")
+    private String phone;
 }

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

@@ -64,6 +64,9 @@ public class TaMachinery implements Serializable {
     @ApiModelProperty(value = "归属区域")
     private String regionName;
 
+    @ApiModelProperty(value = "当前位置")
+    private String location;
+
     @ApiModelProperty(value = "APP 注册状态")
     private String appStatus;
 

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

@@ -27,7 +27,7 @@ public class TaOrder implements Serializable {
     private static final long serialVersionUID = 1L;
 
     @ApiModelProperty(value = "订单Id")
-    @TableId(value = "order_id", type = IdType.INPUT)
+    @TableId(value = "order_id", type = IdType.UUID)
     private String orderId;
 
     @ApiModelProperty(value = "订单编号")
@@ -39,6 +39,18 @@ public class TaOrder implements Serializable {
     @ApiModelProperty(value = "费用")
     private Integer charges;
 
+    @ApiModelProperty(value = "单价")
+    private Integer price;
+
+    @ApiModelProperty(value = "作业面积")
+    private Integer amount;
+
+    @ApiModelProperty(value = "农机ID")
+    private String machineryId;
+
+    @ApiModelProperty(value = "农机名称")
+    private String machineryName;
+
     @ApiModelProperty(value = "农机类型")
     private String machineryType;
 

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

@@ -1,6 +1,7 @@
 package com.yunzhi.nanyang.entity;
 
 import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import java.io.Serializable;
 import io.swagger.annotations.ApiModel;
@@ -35,5 +36,8 @@ public class TaUserMachinery implements Serializable {
     @ApiModelProperty(value = "农机ID")
     private String machineryId;
 
+    @TableField(exist = false)
+    @ApiModelProperty(value = "农机名称")
+    private String machineryName;
 
 }

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

@@ -5,6 +5,7 @@ import com.yunzhi.nanyang.entity.SysUser;
 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>
@@ -25,4 +26,7 @@ public interface SysUserMapper extends BaseMapper<SysUser> {
                              @Param("orgId") String orgId,
                              @Param("name") String name,
                              @Param("phone") String phone);
+
+    @Select("select * from sys_user where phone = #{phone} and status > -1")
+    SysUser selectByPhone(@Param("phone") String phone);
 }

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

@@ -3,6 +3,10 @@ package com.yunzhi.nanyang.mapper;
 import com.yunzhi.nanyang.entity.TaExtendContent;
 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;
+
+import java.util.List;
 
 /**
  * <p>
@@ -15,4 +19,6 @@ import org.apache.ibatis.annotations.Mapper;
 @Mapper
 public interface TaExtendContentMapper extends BaseMapper<TaExtendContent> {
 
+    @Select("SELECT * FROM ta_extend_content t WHERE t.target_type = #{targetType} AND t.target_id = #{targetId} ORDER BY t.sort ASC")
+    List<TaExtendContent> getByTarget(@Param("targetType") String targetType, @Param("targetId") String targetId);
 }

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

@@ -1,8 +1,10 @@
 package com.yunzhi.nanyang.mapper;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.yunzhi.nanyang.entity.TaFeedback;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
 
 /**
  * <p>
@@ -15,4 +17,5 @@ import org.apache.ibatis.annotations.Mapper;
 @Mapper
 public interface TaFeedbackMapper extends BaseMapper<TaFeedback> {
 
+    IPage<TaFeedback> getPageBy(IPage<TaFeedback> pg, @Param("nickName") String nickName, @Param("phone") String phone);
 }

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

@@ -1,8 +1,12 @@
 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.MachineSummary;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Update;
 
 /**
  * <p>
@@ -15,4 +19,18 @@ import org.apache.ibatis.annotations.Mapper;
 @Mapper
 public interface TaMachineryMapper extends BaseMapper<TaMachinery> {
 
+    @Update("UPDATE ta_machinery SET type_name = #{typeName} WHERE type_id = #{typeId}")
+    int updateTypeName(@Param("typeId") String typeId, @Param("typeName") String typeName);
+
+    @Update("UPDATE ta_machinery SET region_name = #{regionName} WHERE region_id = #{regionId}")
+    int updateRegionName(@Param("regionId") String regionId, @Param("regionName") String regionName);
+
+    IPage<MachineSummary> getSummaryList(IPage<MachineSummary> pg,
+                                         @Param("location") String location,
+                                         @Param("typeId") String typeId,
+                                         @Param("orgId") String orgId);
+
+    MachineSummary getSummaryDetail(@Param("machineryId") String machineryId, @Param("location") String location);
+
+    IPage<MachineSummary> getOneOfTypes(IPage<MachineSummary> pg, @Param("location") String location, @Param("typeId") String typeId);
 }

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

@@ -3,6 +3,8 @@ package com.yunzhi.nanyang.mapper;
 import com.yunzhi.nanyang.entity.TaOrder;
 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 TaOrderMapper extends BaseMapper<TaOrder> {
 
+    @Select("SELECT fn_nextval(#{name})")
+    int getNextOrderNO(@Param("name") String name);
 }

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

@@ -1,8 +1,11 @@
 package com.yunzhi.nanyang.mapper;
 
-import com.yunzhi.nanyang.entity.TaUserMachinery;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.yunzhi.nanyang.entity.TaUserMachinery;
 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 TaUserMachineryMapper extends BaseMapper<TaUserMachinery> {
 
+    List<TaUserMachinery> getByUser(@Param("userId") String userId);
 }

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

@@ -13,4 +13,5 @@ import com.baomidou.mybatisplus.extension.service.IService;
  */
 public interface ITaAddressService extends IBaseService<TaAddress> {
 
+    boolean updateDefault(TaAddress taAddress) throws Exception;
 }

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

@@ -1,5 +1,6 @@
 package com.yunzhi.nanyang.service;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.yunzhi.nanyang.entity.TaFeedback;
 import com.baomidou.mybatisplus.extension.service.IService;
 
@@ -13,4 +14,5 @@ import com.baomidou.mybatisplus.extension.service.IService;
  */
 public interface ITaFeedbackService extends IBaseService<TaFeedback> {
 
+    IPage<TaFeedback> getPageBy(IPage<TaFeedback> pg, String nickName, String phone);
 }

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

@@ -1,7 +1,8 @@
 package com.yunzhi.nanyang.service;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.yunzhi.nanyang.entity.TaMachinery;
-import com.baomidou.mybatisplus.extension.service.IService;
+import com.yunzhi.nanyang.vo.MachineSummary;
 
 /**
  * <p>
@@ -18,4 +19,12 @@ public interface ITaMachineryService extends IBaseService<TaMachinery> {
     boolean updateAll(TaMachinery taMachinery)  throws Exception;
 
     TaMachinery getDetail(String machineryId);
+
+    boolean updateTypeName(String typeId, String typeName);
+
+    boolean updateRegionName(String regionId, String regionName);
+
+    IPage<MachineSummary> getSummaryList(IPage<MachineSummary> pg, String location, String typeId, String orgId);
+
+    MachineSummary getSummaryDetail(String machineryId, String location, Boolean attached);
 }

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

@@ -13,4 +13,5 @@ import com.baomidou.mybatisplus.extension.service.IService;
  */
 public interface ITaOrderService extends IBaseService<TaOrder> {
 
+    String getNextOrderNO();
 }

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

@@ -14,4 +14,6 @@ import com.baomidou.mybatisplus.extension.service.IService;
 public interface ITaPersonService extends IBaseService<TaPerson> {
 
     TaPerson getByOpenId(String appid, String openid);
+
+    void tryBindUser(TaPerson taPerson);
 }

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

@@ -1,7 +1,8 @@
 package com.yunzhi.nanyang.service;
 
 import com.yunzhi.nanyang.entity.TaUserMachinery;
-import com.baomidou.mybatisplus.extension.service.IService;
+
+import java.util.List;
 
 /**
  * <p>
@@ -13,4 +14,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
  */
 public interface ITaUserMachineryService extends IBaseService<TaUserMachinery> {
 
+    List<TaUserMachinery> getByUser(String userId);
+
+    boolean editWithUser(String userId, List<TaUserMachinery> userMachineryList) throws Exception;
 }

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

@@ -1,10 +1,12 @@
 package com.yunzhi.nanyang.service.impl;
 
+import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.yunzhi.nanyang.entity.TaAddress;
 import com.yunzhi.nanyang.mapper.TaAddressMapper;
 import com.yunzhi.nanyang.service.ITaAddressService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 
 /**
  * <p>
@@ -17,4 +19,21 @@ import org.springframework.stereotype.Service;
 @Service
 public class TaAddressServiceImpl extends BaseServiceImpl<TaAddressMapper, TaAddress> implements ITaAddressService {
 
+    @Transactional(rollbackFor = Exception.class)
+    @Override
+    public boolean updateDefault(TaAddress taAddress) throws Exception {
+
+        // 先清除所有
+        UpdateWrapper<TaAddress> updateWrapper = new UpdateWrapper<>();
+        updateWrapper.set("is_default", 0);
+        updateWrapper.eq("owner_type", taAddress.getOwnerType());
+        updateWrapper.eq("owner_id", taAddress.getOwnerId());
+        update(updateWrapper);
+
+        // 再更新当前
+        taAddress.setIsDefault(true);
+        taAddress.setSortNo(0);
+
+        return updateById(taAddress);
+    }
 }

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

@@ -1,5 +1,6 @@
 package com.yunzhi.nanyang.service.impl;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.yunzhi.nanyang.entity.TaFeedback;
 import com.yunzhi.nanyang.mapper.TaFeedbackMapper;
 import com.yunzhi.nanyang.service.ITaFeedbackService;
@@ -17,4 +18,8 @@ import org.springframework.stereotype.Service;
 @Service
 public class TaFeedbackServiceImpl extends BaseServiceImpl<TaFeedbackMapper, TaFeedback> implements ITaFeedbackService {
 
+    @Override
+    public IPage<TaFeedback> getPageBy(IPage<TaFeedback> pg, String nickName, String phone) {
+        return baseMapper.getPageBy(pg, nickName, phone);
+    }
 }

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

@@ -1,17 +1,12 @@
 package com.yunzhi.nanyang.service.impl;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
 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.entity.*;
+import com.yunzhi.nanyang.mapper.*;
 import com.yunzhi.nanyang.service.ITaMachineryService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.yunzhi.nanyang.vo.MachineSummary;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -39,6 +34,9 @@ public class TaMachineryServiceImpl extends BaseServiceImpl<TaMachineryMapper, T
     @Autowired
     TaRegionMapper taRegionMapper;
 
+    @Autowired
+    TaExtendContentMapper taExtendContentMapper;
+
     @Transactional(rollbackFor = Exception.class)
     @Override
     public boolean saveAll(TaMachinery taMachinery) throws Exception {
@@ -87,6 +85,45 @@ public class TaMachineryServiceImpl extends BaseServiceImpl<TaMachineryMapper, T
         return taMachinery;
     }
 
+    @Override
+    public boolean updateTypeName(String typeId, String typeName) {
+        return baseMapper.updateTypeName(typeId, typeName) > 0;
+    }
+
+    @Override
+    public boolean updateRegionName(String regionId, String regionName) {
+        return baseMapper.updateRegionName(regionId, regionName) > 0;
+    }
+
+    @Override
+    public IPage<MachineSummary> getSummaryList(IPage<MachineSummary> pg, String location, String typeId, String orgId) {
+
+        // 有没有 orgId 实际上用来区分是否农机手端
+        if (StringUtils.isEmpty(orgId)) {
+            // 农户端, 实际上过滤的是所有组织下的所有分类的其中一个机器
+            return baseMapper.getOneOfTypes(pg, location, typeId);
+        } else {
+            // 农机手端
+            return baseMapper.getSummaryList(pg, location, typeId, orgId);
+        }
+
+    }
+
+    @Override
+    public MachineSummary getSummaryDetail(String machineryId, String location, Boolean attached) {
+        MachineSummary summaryDetail = baseMapper.getSummaryDetail(machineryId, location);
+
+        if (attached) {
+            List<TaExtendContent> extendContentList = taExtendContentMapper.getByTarget(Constants.TARGET_MACHINERY, machineryId);
+            summaryDetail.setContentList(extendContentList);
+
+            List<TaImages> images = taImagesMapper.getListBy(Constants.TARGET_MACHINERY, machineryId);
+            summaryDetail.setImagesList(images);
+        }
+
+        return summaryDetail;
+    }
+
     private void saveImages(TaMachinery taMachinery) {
         String machineryId = taMachinery.getMachineryId();
         // 先删除所有

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

@@ -1,11 +1,15 @@
 package com.yunzhi.nanyang.service.impl;
 
+import com.yunzhi.nanyang.common.DateUtils;
+import com.yunzhi.nanyang.common.StringUtils;
 import com.yunzhi.nanyang.entity.TaOrder;
 import com.yunzhi.nanyang.mapper.TaOrderMapper;
 import com.yunzhi.nanyang.service.ITaOrderService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.stereotype.Service;
 
+import java.time.LocalDateTime;
+
 /**
  * <p>
  * 订单表 服务实现类
@@ -17,4 +21,12 @@ import org.springframework.stereotype.Service;
 @Service
 public class TaOrderServiceImpl extends BaseServiceImpl<TaOrderMapper, TaOrder> implements ITaOrderService {
 
+    @Override
+    public String getNextOrderNO() {
+        String today = DateUtils.toString(LocalDateTime.now(), "yyyyMMdd");
+        String prefix = "M-" + today;
+
+        int next = baseMapper.getNextOrderNO(prefix);
+        return prefix + StringUtils.lpad(String.valueOf(next), "0", 6);
+    }
 }

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

@@ -1,9 +1,13 @@
 package com.yunzhi.nanyang.service.impl;
 
+import com.yunzhi.nanyang.common.StringUtils;
+import com.yunzhi.nanyang.entity.SysUser;
 import com.yunzhi.nanyang.entity.TaPerson;
+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 org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 /**
@@ -17,8 +21,29 @@ import org.springframework.stereotype.Service;
 @Service
 public class TaPersonServiceImpl extends BaseServiceImpl<TaPersonMapper, TaPerson> implements ITaPersonService {
 
+    @Autowired
+    SysUserMapper sysUserMapper;
+
     @Override
     public TaPerson getByOpenId(String appid, String openid) {
         return baseMapper.getByOpenId(appid, openid);
     }
+
+    @Override
+    public void tryBindUser(TaPerson taPerson) {
+        if (null == taPerson) return;
+
+        try {
+            if (!StringUtils.isEmpty(taPerson.getPhone()) && StringUtils.isEmpty(taPerson.getUserId())) {
+                // 尝试去绑定农机手人员
+                SysUser sysUser = sysUserMapper.selectByPhone(taPerson.getPhone());
+                if (null != sysUser) {
+                    taPerson.setUserId(sysUser.getUserId());
+                    updateById(taPerson);
+                }
+            }
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+    }
 }

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

@@ -3,8 +3,11 @@ package com.yunzhi.nanyang.service.impl;
 import com.yunzhi.nanyang.entity.TaUserMachinery;
 import com.yunzhi.nanyang.mapper.TaUserMachineryMapper;
 import com.yunzhi.nanyang.service.ITaUserMachineryService;
-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 +20,28 @@ import org.springframework.stereotype.Service;
 @Service
 public class TaUserMachineryServiceImpl extends BaseServiceImpl<TaUserMachineryMapper, TaUserMachinery> implements ITaUserMachineryService {
 
+    @Override
+    public List<TaUserMachinery> getByUser(String userId) {
+        return baseMapper.getByUser(userId);
+    }
+
+    @Transactional(rollbackFor = Exception.class)
+    @Override
+    public boolean editWithUser(String userId, List<TaUserMachinery> userMachineryList) throws Exception {
+
+        // 先删除所有
+        removeByMap(new HashMap<String, Object>(){{
+            put("user_id", userId);
+        }});
+
+        if (null == userMachineryList || userMachineryList.size() < 1) return true;
+
+        //
+        for (TaUserMachinery userMachinery : userMachineryList) {
+            userMachinery.setSerialNo(null);
+            userMachinery.setUserId(userId);
+        }
+
+        return saveBatch(userMachineryList);
+    }
 }

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

@@ -0,0 +1,59 @@
+package com.yunzhi.nanyang.vo;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.yunzhi.nanyang.entity.TaExtendContent;
+import com.yunzhi.nanyang.entity.TaImages;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+@ApiModel(value="MachineSummary", description="农机列表")
+public class MachineSummary {
+
+    @ApiModelProperty(value = "农机Id")
+    @TableId(value = "machinery_id", type = IdType.UUID)
+    private String machineryId;
+
+    @ApiModelProperty(value = "名称")
+    private String name;
+
+    @ApiModelProperty(value = "农机类型")
+    private String typeId;
+
+    @ApiModelProperty(value = "类型名称")
+    private String typeName;
+
+    @ApiModelProperty(value = "农机价格")
+    private Integer price;
+
+    @ApiModelProperty(value = "主图")
+    private String thumb;
+
+    @ApiModelProperty(value = "当前位置")
+    private String location;
+
+    @ApiModelProperty(value = "距离")
+    private Float distance;
+
+    @ApiModelProperty(value = "机构ID")
+    private String orgId;
+
+    @ApiModelProperty(value = "机构名称")
+    private String orgName;
+
+    @ApiModelProperty(value = "工作状态")
+    private String jobStatus;
+
+    @ApiModelProperty(value = "状态")
+    private Integer status;
+
+    @ApiModelProperty(value = "内容详情")
+    List<TaExtendContent> contentList;
+
+    @ApiModelProperty(value = "图片列表")
+    List<TaImages> imagesList;
+}

src/main/resources/application.yml

@@ -41,6 +41,9 @@ yz:
     api: http://sms.njyunzhi.com/sms
     ## 帮助文档
     help: http://sms.njyunzhi.com/help
+  amap:
+    url: https://restapi.amap.com
+    key: 3be0a9567a794d2690d378476f057a6f
 
 ###
 aliyun:

src/main/resources/mapper/TaFeedbackMapper.xml

@@ -2,4 +2,23 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.yunzhi.nanyang.mapper.TaFeedbackMapper">
 
+    <select id="getPageBy" resultType="com.yunzhi.nanyang.entity.TaFeedback">
+        SELECT
+            t.*,
+            s.nick_name,
+            s.phone
+        FROM
+            ta_feedback t
+                INNER JOIN ta_person s ON s.person_id = t.from_person
+        WHERE
+            1 = 1
+          <if test="nickName != null and nickName != ''">
+              AND s.nick_name LIKE CONCAT( '%', #{nickName}, '%' )
+          </if>
+        <if test="phone != null and phone != ''">
+            AND s.phone LIKE CONCAT( '%', #{phone}, '%' )
+        </if>
+        ORDER BY
+            t.create_date DESC
+    </select>
 </mapper>

src/main/resources/mapper/TaMachineryMapper.xml

@@ -2,4 +2,59 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.yunzhi.nanyang.mapper.TaMachineryMapper">
 
+    <select id="getSummaryList" resultType="com.yunzhi.nanyang.vo.MachineSummary">
+        SELECT
+            *
+        FROM
+            ( SELECT
+                     t.*,
+                     fn_distance ( t.location, #{location} ) AS distance
+                FROM ta_machinery t
+                WHERE
+                      t.`status` = 1
+                <if test="orgId != null and orgId != ''">
+                    AND t.org_id = #{orgId}
+                </if>
+                <if test="typeId != null and typeId != ''">
+                    AND t.type_id = #{typeId}
+                </if>
+                ) AS a
+        ORDER BY
+            a.distance DESC
+    </select>
+    <select id="getSummaryDetail" resultType="com.yunzhi.nanyang.vo.MachineSummary">
+        SELECT
+            t.*,
+            s.`name` as org_name,
+            fn_distance(t.location, #{location}) as distance
+        FROM
+            ta_machinery t
+        INNER JOIN ta_org s on t.org_id = s.org_id
+        WHERE
+            t.machinery_id = #{machineryId}
+            AND t.`status` = 1
+    </select>
+    <select id="getOneOfTypes" resultType="com.yunzhi.nanyang.vo.MachineSummary">
+        SELECT
+            t.*,
+            fn_distance ( concat( m.lng, ',', m.lat ), #{location} ) AS distance,
+            count( * ) AS num
+        FROM
+            ta_machinery t
+        INNER JOIN ta_machinery s ON t.org_id = s.org_id
+            AND t.type_id = s.type_id
+        INNER JOIN ta_org m ON m.org_id = t.org_id
+        WHERE
+            t.machinery_id &lt; s.machinery_id
+        <if test="typeId != null and typeId != ''">
+            AND t.type_id = #{typeId}
+        </if>
+         GROUP BY
+            t.org_id,
+            t.machinery_id
+        HAVING
+            num &lt;= 1
+        ORDER BY
+            distance ASC
+    </select>
 </mapper>

src/main/resources/mapper/TaUserMachineryMapper.xml

@@ -2,4 +2,17 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.yunzhi.nanyang.mapper.TaUserMachineryMapper">
 
+    <select id="getByUser" resultType="com.yunzhi.nanyang.entity.TaUserMachinery">
+        SELECT
+            t.*,
+            s.`name` as machinery_name
+        FROM
+            ta_user_machinery t
+                INNER JOIN ta_machinery s ON t.machinery_id = s.machinery_id
+                AND s.`status` &gt; -1
+        WHERE
+            t.user_id = #{userId}
+        ORDER BY
+            t.serial_no
+    </select>
 </mapper>