feats

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

@@ -121,7 +121,7 @@ public class TaMachineryController extends BaseController {
 
         IPage<MachineSummary> pg = new Page<>(pageNum, pageSize);
 
-        IPage<MachineSummary> result = iTaMachineryService.getSummaryList(pg, location, typeId, orgId, q);
+        IPage<MachineSummary> result = iTaMachineryService.getSummaryList(pg, location, typeId, orgId, q, clientId);
         return ResponseBean.success(result);
     }
 
@@ -239,6 +239,27 @@ public class TaMachineryController extends BaseController {
         return ResponseBean.success(taOrderList);
     }
 
+
+    /**
+     * 根据id查询对象
+     * @param id  实体ID
+     */
+    @RequestMapping(value="/admin/machinery/{id}/status/{status}",method= RequestMethod.PUT)
+    @ApiOperation(value="更新车辆状态", notes = "更新车辆状态", httpMethod = "PUT", response = ResponseBean.class)
+    public ResponseBean getMachineryDuty(@ApiParam("对象ID") @PathVariable String id,
+                                         @ApiParam("车辆状态") @PathVariable Integer status) throws Exception{
+
+        TaMachinery taMachinery = iTaMachineryService.getById(id);
+        if (taMachinery == null) {
+            return ResponseBean.error("未找到车辆信息");
+        }
+
+        taMachinery.setStatus(status);
+        iTaMachineryService.updateById(taMachinery);
+
+        return ResponseBean.success(taMachinery);
+    }
+
     /**
      * 车辆实时预览
      * @param id  实体ID

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

@@ -9,6 +9,7 @@ import com.yunzhi.nanyang.common.ResponseBean;
 import com.yunzhi.nanyang.entity.SysUser;
 import com.yunzhi.nanyang.service.ISysUserDataScopeService;
 import com.yunzhi.nanyang.service.ISysUserService;
+import com.yunzhi.nanyang.service.ITaMachineryService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
@@ -51,6 +52,9 @@ public class TaOrgController extends BaseController {
     @Autowired
     public ISysUserService iSysUserService;
 
+    @Autowired
+    public ITaMachineryService iTaMachineryService;
+
     @Autowired
     public ISysUserDataScopeService iSysUserDataScopeService;
 
@@ -111,6 +115,11 @@ public class TaOrgController extends BaseController {
             return ResponseBean.error("请先清空机构人员信息");
         }
 
+        cnt = iTaMachineryService.countBy("org_id", id, true);
+        if (cnt > 0) {
+            return ResponseBean.error("请先清空机构机构信息");
+        }
+
         if(iTaOrgService.remvoeWithDataScope(id, currentUser().getUserId())){
             Map<String, Object> filter = new HashMap<>();
             filter.put("org_id", id);

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

@@ -25,7 +25,7 @@ public interface ITaMachineryService extends IBaseService<TaMachinery> {
 
     boolean updateRegionName(String regionId, String regionName);
 
-    IPage<MachineSummary> getSummaryList(IPage<MachineSummary> pg, String location, String typeId, String orgId, String q);
+    IPage<MachineSummary> getSummaryList(IPage<MachineSummary> pg, String location, String typeId, String orgId, String q, String clientId);
 
     MachineSummary getSummaryDetail(String machineryId, String location, Boolean attached);
 

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

@@ -98,10 +98,9 @@ public class TaMachineryServiceImpl extends BaseServiceImpl<TaMachineryMapper, T
     }
 
     @Override
-    public IPage<MachineSummary> getSummaryList(IPage<MachineSummary> pg, String location, String typeId, String orgId, String q) {
+    public IPage<MachineSummary> getSummaryList(IPage<MachineSummary> pg, String location, String typeId, String orgId, String q, String clientId) {
 
-        // 有没有 orgId 实际上用来区分是否农机手端
-        if (StringUtils.isEmpty(orgId)) {
+        if (Constants.CLIENT_FARMER.equals(clientId)) {
             // 农户端, 实际上过滤的是所有组织下的所有分类的其中一个机器
             return baseMapper.getOneOfTypes(pg, location, typeId, q);
         } else {

src/main/resources/mapper/TaMachineryMapper.xml

@@ -59,9 +59,10 @@
         </if>
          GROUP BY
             t.org_id,
-            t.machinery_id
-        HAVING
-            num &lt;= 1
+            t.type_id
+--             t.machinery_id
+--         HAVING
+--             num &lt;= 1
         ORDER BY
             distance ASC
     </select>