feats

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

@@ -0,0 +1,112 @@
+package com.yunzhi.nanyang.controller;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.yunzhi.nanyang.common.BaseController;
+import com.yunzhi.nanyang.common.Constants;
+import com.yunzhi.nanyang.common.ResponseBean;
+import com.yunzhi.nanyang.entity.TaMachinery;
+import com.yunzhi.nanyang.entity.TaOrg;
+import com.yunzhi.nanyang.entity.TdMachineryType;
+import com.yunzhi.nanyang.service.ITaMachineryService;
+import com.yunzhi.nanyang.service.ITaOrderService;
+import com.yunzhi.nanyang.service.ITaOrgService;
+import com.yunzhi.nanyang.service.ITdMachineryTypeService;
+import com.yunzhi.nanyang.vo.ChartParam;
+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.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.ArrayList;
+import java.util.List;
+
+
+@Api(tags = "数据大屏")
+@RestController
+@RequestMapping("/admin/screen-data")
+public class ScreenDataController extends BaseController {
+
+    @Autowired
+    ITaMachineryService iTaMachineryService;
+
+    @Autowired
+    ITaOrderService iTaOrderService;
+
+    @Autowired
+    ITdMachineryTypeService iTdMachineryTypeService;
+
+    @Autowired
+    ITaOrgService iTaOrgService;
+
+
+    @GetMapping("/basic")
+    @ApiOperation(value="基本数据统计", notes = "基本数据统计", httpMethod = "GET", response = ResponseBean.class)
+    public ResponseBean getBasicStatis() throws Exception {
+        // 农机总数
+        int totalMachineryNum = iTaMachineryService.countBy("1", 1, true);
+        // 农机使用数
+        int totalMachineryUsed = 0;
+        // 总预约数 == 订单数
+        int totalOrderNum = iTaOrderService.countBy("1", 1, true);
+        // 总服务数
+        int totalServiceNum = 0;
+
+        List<ChartParam> result = new ArrayList<>();
+        result.add(new ChartParam("totalMachineryNum", totalMachineryNum));
+        result.add(new ChartParam("totalMachineryUsed", totalMachineryUsed));
+        result.add(new ChartParam("totalOrderNum", totalOrderNum));
+        result.add(new ChartParam("totalServiceNum", totalServiceNum));
+
+        return ResponseBean.success(result);
+    }
+
+    @GetMapping("/machinery-type")
+    @ApiOperation(value="所有农机类型", notes = "所有农机类型", httpMethod = "GET", response = ResponseBean.class)
+    public ResponseBean getMachineryType() throws Exception {
+        List<TdMachineryType> result = iTdMachineryTypeService.getTypesOfScreen();
+        return ResponseBean.success(result);
+    }
+
+    @GetMapping("/machinery-type/machinery")
+    @ApiOperation(value="农机类型统计", notes = "农机类型统计", httpMethod = "GET", response = ResponseBean.class)
+    public ResponseBean getMachineryTypeStatis() throws Exception {
+        List<ChartParam> result = iTdMachineryTypeService.statisMachineryNum();
+        return ResponseBean.success(result);
+    }
+
+    @GetMapping("/machinery-type/work-job")
+    @ApiOperation(value="农机作业数统计", notes = "农机作业数统计", httpMethod = "GET", response = ResponseBean.class)
+    public ResponseBean getMachineryTypeWorkJobs() throws Exception {
+        List<ChartParam> result = iTdMachineryTypeService.statisWorkJobNum();
+        return ResponseBean.success(result);
+    }
+
+
+    @GetMapping("/machinery-type/area")
+    @ApiOperation(value="农机作业面积统计", notes = "农机作业面积统计", httpMethod = "GET", response = ResponseBean.class)
+    public ResponseBean getMachineryTypeArea() throws Exception {
+        List<ChartParam> result = iTdMachineryTypeService.statisArea();
+        return ResponseBean.success(result);
+    }
+
+    @GetMapping("/org")
+    @ApiOperation(value="所有合作社", notes = "所有合作社", httpMethod = "GET", response = ResponseBean.class)
+    public ResponseBean getAllOrgs() throws Exception {
+        QueryWrapper<TaOrg> queryWrapper = new QueryWrapper<TaOrg>()
+                .gt("status", Constants.STATUS_DELETE);
+        List<TaOrg> result = iTaOrgService.list(queryWrapper);
+        return ResponseBean.success(result);
+    }
+
+
+    @GetMapping("/machinery/all")
+    @ApiOperation(value="依据类型查询农机", notes = "依据类型查询农机", httpMethod = "GET", response = ResponseBean.class)
+    public ResponseBean getMachineryOfType(@ApiParam("农机类型") @RequestParam("typeId") String typeId) throws Exception {
+        List<TaMachinery> result = iTaMachineryService.listByTypeWithLoc(typeId);
+        return ResponseBean.success(result);
+    }
+}

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

@@ -7,6 +7,7 @@ import com.yunzhi.nanyang.common.*;
 import com.yunzhi.nanyang.entity.SysLogin;
 import com.yunzhi.nanyang.service.ISysLoginService;
 import com.yunzhi.nanyang.service.ISysUserDataScopeService;
+import com.yunzhi.nanyang.service.ITaOrgService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
@@ -49,6 +50,9 @@ public class SysUserController extends BaseController {
     @Autowired
     public ISysUserDataScopeService iSysUserDataScopeService;
 
+    @Autowired
+    public ITaOrgService iTaOrgService;
+
     @Value("${yz.default.password}")
     public String defaultPassword;
 
@@ -117,6 +121,7 @@ public class SysUserController extends BaseController {
         }
 
         if (iSysUserService.save(sysUser)){
+            iTaOrgService.updateNum(sysUser.getOrgId(), "worker_num", 1);
             iSysUserDataScopeService.addNew(sysUser.getOrgId(), sysUser.getUserId());
 
             if (!StringUtils.isEmpty(sysUser.getLoginName())) {
@@ -148,6 +153,7 @@ public class SysUserController extends BaseController {
         }
 
         if(iSysUserService.removeLogicById(id)){
+            iTaOrgService.updateNum(sysUser.getOrgId(), "worker_num", -1);
             iSysLoginService.removeLogicByUser(id);
 
             return ResponseBean.success("success");

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

@@ -50,6 +50,9 @@ public class TaMachineryController extends BaseController {
     @Autowired
     public ISysUserService iSysUserService;
 
+    @Autowired
+    public ITaOrgService iTaOrgService;
+
     @Autowired
     public ITaOrderService iTaOrderService;
 
@@ -146,6 +149,7 @@ public class TaMachineryController extends BaseController {
         taMachinery.setCreateUser(sysUser.getUserId());
 
         if (iTaMachineryService.saveAll(taMachinery)){
+            iTaOrgService.updateNum(taMachinery.getOrgId(), "machinery_num", 1);
             return ResponseBean.success(taMachinery);
         }else {
             return ResponseBean.error("保存失败, 请重试", ResponseBean.ERROR_UNAVAILABLE);
@@ -168,6 +172,7 @@ public class TaMachineryController extends BaseController {
         checkOrgAccess(taMachinery.getOrgId());
 
         if(iTaMachineryService.removeLogicById(id)){
+            iTaOrgService.updateNum(taMachinery.getOrgId(), "machinery_num", -1);
             return ResponseBean.success("success");
         }else {
             return ResponseBean.error("删除失败, 请重试", ResponseBean.ERROR_UNAVAILABLE);

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

@@ -191,9 +191,6 @@ public class TaWorkJobController extends BaseController {
         origin.setArea(taWorkJob.getArea());
         origin.setEndDate(LocalDateTime.now());
 
-//        iTaOrderService.updateStatus(taWorkJob.getOrderId(), "work_status", Constants.WORK_DONE);
-        iTaMachineryService.updateStatus(taWorkJob.getMachineryId(), "job_status", Constants.WORK_DONE);
-
         // 更新订单
         TaOrder taOrder = iTaOrderService.getExistBy("order_id", origin.getOrderId(), false, true);
         if (null == taOrder) {
@@ -206,6 +203,10 @@ public class TaWorkJobController extends BaseController {
         taOrder.setCharges(charges);
         taOrder.setWorkStatus(Constants.WORK_DONE);
         iTaOrderService.updateById(taOrder);
+        iTaOrgService.updateNum(taOrder.getOrgId(), "order_num", 1);
+
+//        iTaOrderService.updateStatus(taWorkJob.getOrderId(), "work_status", Constants.WORK_DONE);
+        iTaMachineryService.updateStatus(taWorkJob.getMachineryId(), "job_status", Constants.WORK_DONE);
 
         if (iTaWorkJobService.updateById(origin)){
             return ResponseBean.success(origin);

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

@@ -7,6 +7,7 @@ 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;
 
 /**
  * <p>
@@ -23,4 +24,7 @@ public interface TaOrgMapper extends BaseMapper<TaOrg> {
 
     @Select("SELECT 'org' as `name`, count(*) as `value`  FROM ta_org t WHERE t.`status` > -1")
     ChartParam statisTotal();
+
+    @Update("UPDATE ta_org SET ${fieldName} = ${fieldName} + #{increment} WHERE org_id = #{orgId} ")
+    int updateNum(@Param("orgId") String orgId, @Param("fieldName") String fieldName, @Param("increment") int increment);
 }

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

@@ -2,8 +2,11 @@ package com.yunzhi.nanyang.mapper;
 
 import com.yunzhi.nanyang.entity.TdMachineryType;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.yunzhi.nanyang.vo.ChartParam;
 import org.apache.ibatis.annotations.Mapper;
 
+import java.util.List;
+
 /**
  * <p>
  * 农机类型表 Mapper 接口
@@ -15,4 +18,11 @@ import org.apache.ibatis.annotations.Mapper;
 @Mapper
 public interface TdMachineryTypeMapper extends BaseMapper<TdMachineryType> {
 
+    List<ChartParam> statisMachineryNum();
+
+    List<ChartParam> statisWorkJobNum();
+
+    List<ChartParam> statisArea();
+
+    List<TdMachineryType> getTypesOfScreen();
 }

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

@@ -5,6 +5,8 @@ import com.yunzhi.nanyang.entity.TaMachinery;
 import com.yunzhi.nanyang.vo.ChartParam;
 import com.yunzhi.nanyang.vo.MachineSummary;
 
+import java.util.List;
+
 /**
  * <p>
  * 农机表 服务类
@@ -34,4 +36,6 @@ public interface ITaMachineryService extends IBaseService<TaMachinery> {
     IPage<TaMachinery> getPageBy(IPage<TaMachinery> pg, String name, String typeId, String orgId, Integer status);
 
     ChartParam statisTotal();
+
+    List<TaMachinery> listByTypeWithLoc(String typeId);
 }

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

@@ -2,9 +2,12 @@ package com.yunzhi.nanyang.service;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.yunzhi.nanyang.entity.SysUser;
+import com.yunzhi.nanyang.entity.TaMachinery;
 import com.yunzhi.nanyang.entity.TaOrg;
 import com.yunzhi.nanyang.vo.ChartParam;
 
+import java.util.List;
+
 /**
  * <p>
  * 机构管理 服务类
@@ -20,4 +23,7 @@ public interface ITaOrgService extends IBaseService<TaOrg> {
     boolean saveWithDataScope(TaOrg taOrg) throws Exception;
 
     ChartParam statisTotal();
+
+    int updateNum(String orgId, String fieldName, int increment);
+
 }

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

@@ -2,6 +2,9 @@ package com.yunzhi.nanyang.service;
 
 import com.yunzhi.nanyang.entity.TdMachineryType;
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.yunzhi.nanyang.vo.ChartParam;
+
+import java.util.List;
 
 /**
  * <p>
@@ -13,4 +16,11 @@ import com.baomidou.mybatisplus.extension.service.IService;
  */
 public interface ITdMachineryTypeService extends IBaseService<TdMachineryType> {
 
+    List<ChartParam> statisMachineryNum();
+
+    List<ChartParam> statisWorkJobNum();
+
+    List<ChartParam> statisArea();
+
+    List<TdMachineryType> getTypesOfScreen();
 }

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

@@ -1,5 +1,6 @@
 package com.yunzhi.nanyang.service.impl;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.yunzhi.nanyang.common.Constants;
@@ -144,6 +145,17 @@ public class TaMachineryServiceImpl extends BaseServiceImpl<TaMachineryMapper, T
         return baseMapper.statisTotal();
     }
 
+    @Override
+    public List<TaMachinery> listByTypeWithLoc(String typeId) {
+        QueryWrapper<TaMachinery> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("type_id", typeId);
+//        queryWrapper.eq("online_status", 1);
+        queryWrapper.isNotNull("location");
+        queryWrapper.gt("status", Constants.STATUS_DELETE);
+
+        return list(queryWrapper);
+    }
+
     private void saveImages(TaMachinery taMachinery) {
         String machineryId = taMachinery.getMachineryId();
         // 先删除所有

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

@@ -58,4 +58,9 @@ public class TaOrgServiceImpl extends BaseServiceImpl<TaOrgMapper, TaOrg> implem
     public ChartParam statisTotal() {
         return baseMapper.statisTotal();
     }
+
+    @Override
+    public int updateNum(String orgId, String fieldName, int increment) {
+        return baseMapper.updateNum(orgId, fieldName, increment);
+    }
 }

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

@@ -4,8 +4,11 @@ import com.yunzhi.nanyang.entity.TdMachineryType;
 import com.yunzhi.nanyang.mapper.TdMachineryTypeMapper;
 import com.yunzhi.nanyang.service.ITdMachineryTypeService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.yunzhi.nanyang.vo.ChartParam;
 import org.springframework.stereotype.Service;
 
+import java.util.List;
+
 /**
  * <p>
  * 农机类型表 服务实现类
@@ -17,4 +20,23 @@ import org.springframework.stereotype.Service;
 @Service
 public class TdMachineryTypeServiceImpl extends BaseServiceImpl<TdMachineryTypeMapper, TdMachineryType> implements ITdMachineryTypeService {
 
+    @Override
+    public List<ChartParam> statisMachineryNum() {
+        return baseMapper.statisMachineryNum();
+    }
+
+    @Override
+    public List<ChartParam> statisWorkJobNum() {
+        return baseMapper.statisWorkJobNum();
+    }
+
+    @Override
+    public List<ChartParam> statisArea() {
+        return baseMapper.statisArea();
+    }
+
+    @Override
+    public List<TdMachineryType> getTypesOfScreen() {
+        return baseMapper.getTypesOfScreen();
+    }
 }

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

@@ -2,10 +2,12 @@ package com.yunzhi.nanyang.vo;
 
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
 import lombok.Data;
 
 @ApiModel("二位图标")
 @Data
+@AllArgsConstructor
 public class ChartParam {
 
     @ApiModelProperty("维度")

src/main/resources/mapper/TdMachineryTypeMapper.xml

@@ -2,4 +2,88 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.yunzhi.nanyang.mapper.TdMachineryTypeMapper">
 
+    <select id="statisMachineryNum" resultType="com.yunzhi.nanyang.vo.ChartParam">
+        SELECT
+            t.`name`,
+            ifnull( s.num, 0 ) AS `value`
+        FROM
+            `td_machinery_type` t
+                LEFT JOIN (
+                SELECT
+                    a.type_id,
+                    count( 1 ) AS num
+                FROM
+                    ta_machinery a
+                WHERE
+                    a.`status` &gt; -1
+                GROUP BY
+                    a.type_id
+            ) s ON t.type_id = s.type_id
+        WHERE
+            t.screen_statis = 1
+          AND t.`status` &gt; -1
+        ORDER BY
+            t.`name`
+    </select>
+    <select id="statisWorkJobNum" resultType="com.yunzhi.nanyang.vo.ChartParam">
+        SELECT
+            t.`name`,
+            ifnull( s.num, 0 ) AS `value`
+        FROM
+            `td_machinery_type` t
+                LEFT JOIN (
+                SELECT
+                    a.type_id,
+                    count( 1 ) AS num
+                FROM
+                    ta_machinery a
+                        INNER JOIN ta_work_job b ON a.machinery_id = b.machinery_id
+                WHERE
+                    a.`status` &gt; -1
+                  AND b.`status` &gt; -1
+                GROUP BY
+                    a.type_id
+            ) s ON t.type_id = s.type_id
+        WHERE
+            t.screen_statis = 1
+          AND t.`status` &gt; -1
+        ORDER BY
+            t.`name`
+    </select>
+    <select id="statisArea" resultType="com.yunzhi.nanyang.vo.ChartParam">
+        SELECT
+            t.`name`,
+            ifnull( s.num, 0 ) AS `value`
+        FROM
+            `td_machinery_type` t
+                LEFT JOIN (
+                SELECT
+                    a.type_id,
+                    SUM( b.area ) AS num
+                FROM
+                    ta_machinery a
+                        INNER JOIN ta_work_job b ON a.machinery_id = b.machinery_id
+                WHERE
+                    a.`status` &gt; -1
+                  AND b.`status` &gt; -1
+                GROUP BY
+                    a.type_id
+            ) s ON t.type_id = s.type_id
+        WHERE
+            t.screen_statis = 1
+          AND t.`status` &gt; -1
+        ORDER BY
+            t.`name`
+    </select>
+    <select id="getTypesOfScreen" resultType="com.yunzhi.nanyang.entity.TdMachineryType">
+        SELECT
+            t.*
+        FROM
+            `td_machinery_type` t
+        WHERE
+            t.screen_statis = 1
+          AND t.`status` &gt; -1
+        ORDER BY
+            t.`name`
+    </select>
 </mapper>