feats

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

@@ -1,11 +1,9 @@
 package com.yunzhi.nanyang.controller;
 
 import com.yunzhi.nanyang.common.BaseController;
+import com.yunzhi.nanyang.common.Constants;
 import com.yunzhi.nanyang.common.ResponseBean;
-import com.yunzhi.nanyang.service.ITaMachineryService;
-import com.yunzhi.nanyang.service.ITaOrderService;
-import com.yunzhi.nanyang.service.ITaOrgService;
-import com.yunzhi.nanyang.service.ITaPersonService;
+import com.yunzhi.nanyang.service.*;
 import com.yunzhi.nanyang.vo.ChartParam;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -35,9 +33,14 @@ public class StatisController extends BaseController {
     @Autowired
     ITaOrderService iTaOrderService;
 
+    @Autowired
+    ITdDeviceService iTdDeviceService;
+
+    @Autowired
+    ISysUserService iSysUserService;
 
     @GetMapping("/summary")
-    @ApiOperation(value="登录", notes = "登录", httpMethod = "POST", response = ResponseBean.class)
+    @ApiOperation(value="首屏统计", notes = "首屏统计", httpMethod = "GET", response = ResponseBean.class)
     public ResponseBean summary() throws Exception {
 
         List<ChartParam> resp = new ArrayList<>();
@@ -60,4 +63,64 @@ public class StatisController extends BaseController {
 
         return ResponseBean.success(resp);
     }
+
+    @GetMapping("/summary2")
+    @ApiOperation(value="首屏统计2", notes = "首屏统计2", httpMethod = "GET", response = ResponseBean.class)
+    public ResponseBean summary2() throws Exception {
+
+        List<ChartParam> resp = new ArrayList<>();
+
+        // 统计注册用户
+        ChartParam personNum = iSysUserService.statisTotal();
+        resp.add(personNum);
+
+        // 合作社数
+        ChartParam orgNum = iTaOrgService.statisTotal();
+        resp.add(orgNum);
+
+        // 设备数量
+        ChartParam machineryNum = iTdDeviceService.statisTotal("feifang");
+        resp.add(machineryNum);
+
+        // 订单数
+        ChartParam orderNum = iTdDeviceService.statisJob("feifang", "2023-04-10");
+        resp.add(orderNum);
+
+        return ResponseBean.success(resp);
+    }
+
+    @GetMapping("/area-total-org")
+    @ApiOperation(value="合作社作业统计", notes = "合作社作业统计", httpMethod = "GET", response = ResponseBean.class)
+    public ResponseBean totalAreaByOrg() throws Exception {
+        List<ChartParam> resp = iTdDeviceService.statisAreaByOrgJob("feifang", "2023-04-10");
+        return ResponseBean.success(resp);
+    }
+
+    @GetMapping("/device-total-org")
+    @ApiOperation(value="合作社设备统计", notes = "合作社设备统计", httpMethod = "GET", response = ResponseBean.class)
+    public ResponseBean totalNumByOrg() throws Exception {
+        List<ChartParam> resp = iTdDeviceService.statisNumByOrgJob("feifang");
+        return ResponseBean.success(resp);
+    }
+
+    @GetMapping("/area-total-person")
+    @ApiOperation(value="人员作业统计", notes = "人员作业统计", httpMethod = "GET", response = ResponseBean.class)
+    public ResponseBean totalAreaByPerson() throws Exception {
+        List<ChartParam> resp = iTdDeviceService.statisAreaByPerson("feifang", "2023-04-10");
+        return ResponseBean.success(resp);
+    }
+
+    @GetMapping("/device-total-person")
+    @ApiOperation(value="人员设备统计", notes = "人员设备统计", httpMethod = "GET", response = ResponseBean.class)
+    public ResponseBean totalNumByPerson() throws Exception {
+        List<ChartParam> resp = iTdDeviceService.statisNumByPerson("feifang");
+        return ResponseBean.success(resp);
+    }
+
+    @GetMapping("/area-total-town")
+    @ApiOperation(value="乡镇作业统计", notes = "乡镇作业统计", httpMethod = "GET", response = ResponseBean.class)
+    public ResponseBean totalAreaByTown() throws Exception {
+        List<ChartParam> resp = iTdDeviceService.statisAreaByTown("feifang", "2023-04-10");
+        return ResponseBean.success(resp);
+    }
 }

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

@@ -108,4 +108,10 @@ public class TaDeviceJob implements Serializable, Cloneable {
 
     @ApiModelProperty(name = "合作社ID")
     private String orgId;
+
+    @ApiModelProperty(name = "达标率", notes = "")
+    private Double fulfilledRate;
+
+    @ApiModelProperty(name = "达标面积", notes = "")
+    private Double fulfilledArea;
 }

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

@@ -3,6 +3,7 @@ package com.yunzhi.nanyang.mapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.yunzhi.nanyang.entity.SysUser;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.yunzhi.nanyang.vo.ChartParam;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Select;
@@ -29,4 +30,7 @@ public interface SysUserMapper extends BaseMapper<SysUser> {
 
     @Select("select * from sys_user where phone = #{phone} and status > -1")
     SysUser selectByPhone(@Param("phone") String phone);
+
+    @Select("SELECT 'person' as `name`, count(*) as `value`  FROM sys_user t WHERE t.phone is not null AND t.`status` > -1")
+    ChartParam statisTotal();
 }

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

@@ -3,8 +3,10 @@ package com.yunzhi.nanyang.mapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.yunzhi.nanyang.entity.TdDevice;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.yunzhi.nanyang.vo.ChartParam;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Select;
 
 import java.util.List;
 
@@ -24,4 +26,19 @@ public interface TdDeviceMapper extends BaseMapper<TdDevice> {
     TdDevice getExistByDevice(@Param("deviceType") String deviceType,@Param("deviceNo") String deviceNo);
 
     List<TdDevice> getListByTypes(@Param("typeList") List<String> typeList);
+
+    @Select("SELECT 'device' as `name`, count(*) as `value`  FROM td_device t WHERE t.`device_type` = #{deviceType} AND t.`status` = 1")
+    ChartParam statisTotal(@Param("deviceType") String deviceType);
+
+    ChartParam statisJob(@Param("deviceKind") String deviceKind, @Param("jobDate") String jobDate);
+
+    List<ChartParam> statisAreaByOrgJob(@Param("deviceKind") String deviceKind, @Param("jobDate") String jobDate);
+
+    List<ChartParam> statisNumByOrgJob(@Param("deviceType") String deviceType);
+
+    List<ChartParam> statisAreaByPerson(@Param("deviceKind") String deviceKind, @Param("jobDate") String jobDate);
+
+    List<ChartParam> statisNumByPerson(@Param("deviceType") String deviceType);
+
+    List<ChartParam> statisAreaByTown(@Param("deviceKind") String deviceKind, @Param("jobDate") String jobDate);
 }

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

@@ -2,6 +2,7 @@ package com.yunzhi.nanyang.service;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.yunzhi.nanyang.entity.SysUser;
+import com.yunzhi.nanyang.vo.ChartParam;
 
 import java.util.Map;
 
@@ -21,4 +22,5 @@ public interface ISysUserService extends IBaseService<SysUser> {
 
     IPage<SysUser> getPageBy(IPage<SysUser> pg, String userId, String orgId, String name, String phone);
 
+    ChartParam statisTotal();
 }

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

@@ -3,6 +3,7 @@ package com.yunzhi.nanyang.service;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.yunzhi.nanyang.entity.TdDevice;
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.yunzhi.nanyang.vo.ChartParam;
 
 import java.util.List;
 
@@ -21,4 +22,18 @@ public interface ITdDeviceService extends IBaseService<TdDevice> {
     TdDevice getExistByDevice(String deviceType, String deviceNo);
 
     List<TdDevice> getListByTypes(List<String> typeList);
+
+    ChartParam statisTotal(String deviceType);
+
+    ChartParam statisJob(String deviceKind, String jobDate);
+
+    List<ChartParam> statisAreaByOrgJob(String deviceKind, String jobDate);
+
+    List<ChartParam> statisNumByOrgJob(String deviceType);
+
+    List<ChartParam> statisAreaByPerson(String deviceKind, String jobDate);
+
+    List<ChartParam> statisNumByPerson(String deviceType);
+
+    List<ChartParam> statisAreaByTown(String deviceKind, String jobDate);
 }

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

@@ -7,6 +7,7 @@ import com.yunzhi.nanyang.mapper.SysMenuMapper;
 import com.yunzhi.nanyang.mapper.SysUserMapper;
 import com.yunzhi.nanyang.service.ISysUserService;
 import com.yunzhi.nanyang.vo.AccessInfo;
+import com.yunzhi.nanyang.vo.ChartParam;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -62,4 +63,9 @@ public class SysUserServiceImpl extends BaseServiceImpl<SysUserMapper, SysUser>
     public IPage<SysUser> getPageBy(IPage<SysUser> pg, String userId, String orgId, String name, String phone) {
         return baseMapper.getPageBy(pg, Constants.ADMIN_ID, userId, orgId, name, phone);
     }
+
+    @Override
+    public ChartParam statisTotal() {
+        return baseMapper.statisTotal();
+    }
 }

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

@@ -5,6 +5,7 @@ import com.yunzhi.nanyang.entity.TdDevice;
 import com.yunzhi.nanyang.mapper.TdDeviceMapper;
 import com.yunzhi.nanyang.service.ITdDeviceService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.yunzhi.nanyang.vo.ChartParam;
 import org.springframework.stereotype.Service;
 
 import java.util.List;
@@ -34,4 +35,39 @@ public class TdDeviceServiceImpl extends BaseServiceImpl<TdDeviceMapper, TdDevic
     public List<TdDevice> getListByTypes(List<String> typeList) {
         return baseMapper.getListByTypes(typeList);
     }
+
+    @Override
+    public ChartParam statisTotal(String deviceType) {
+        return baseMapper.statisTotal(deviceType);
+    }
+
+    @Override
+    public ChartParam statisJob(String deviceKind, String jobDate) {
+        return baseMapper.statisJob(deviceKind, jobDate);
+    }
+
+    @Override
+    public List<ChartParam> statisAreaByOrgJob(String deviceKind, String jobDate) {
+        return baseMapper.statisAreaByOrgJob(deviceKind, jobDate);
+    }
+
+    @Override
+    public List<ChartParam> statisNumByOrgJob(String deviceType) {
+        return baseMapper.statisNumByOrgJob(deviceType);
+    }
+
+    @Override
+    public List<ChartParam> statisAreaByPerson(String deviceKind, String jobDate) {
+        return baseMapper.statisAreaByPerson(deviceKind, jobDate);
+    }
+
+    @Override
+    public List<ChartParam> statisNumByPerson(String deviceType) {
+        return baseMapper.statisNumByPerson(deviceType);
+    }
+
+    @Override
+    public List<ChartParam> statisAreaByTown(String deviceKind, String jobDate) {
+        return baseMapper.statisAreaByTown(deviceKind, jobDate);
+    }
 }

src/main/resources/mapper/TdDeviceMapper.xml

@@ -58,4 +58,93 @@
         ORDER BY
             t.create_date DESC
     </select>
+    <select id="statisJob" resultType="com.yunzhi.nanyang.vo.ChartParam">
+        SELECT 'jobArea' as `name`,
+               sum(t.job_area) as `value`
+        FROM ta_device_job t
+        WHERE t.`device_kind` = #{deviceKind}
+          AND t.`job_date` &gt;= #{jobDate}
+    </select>
+    <select id="statisAreaByOrgJob" resultType="com.yunzhi.nanyang.vo.ChartParam">
+        SELECT
+            *
+        FROM
+            (
+                SELECT
+                    a.`name`,
+                    sum( b.job_area ) AS `value`
+                FROM
+                    ta_org a
+                        LEFT JOIN (
+                            SELECT *
+                            FROM ta_device_job t
+                            WHERE t.device_kind = #{deviceKind}
+                              AND t.job_date >= #{jobDate}
+                            ) b ON a.org_id = b.org_id
+                WHERE a.`status` = 1
+                GROUP BY
+                    a.`name`
+            ) m
+        ORDER BY
+            m.`value` DESC;
+    </select>
+    <select id="statisNumByOrgJob" resultType="com.yunzhi.nanyang.vo.ChartParam">
+        SELECT
+            t.`name`,
+            COUNT( DISTINCT m.device_no ) AS `value`
+        FROM
+            ta_org t
+                LEFT JOIN ta_machinery s ON t.org_id = s.org_id
+                LEFT JOIN td_device m ON m.machinery_id = s.machinery_id
+                AND m.device_type = #{deviceType}
+        WHERE
+            t.`status` = 1
+        GROUP BY
+            t.`name`
+    </select>
+    <select id="statisAreaByPerson" resultType="com.yunzhi.nanyang.vo.ChartParam">
+        SELECT
+            *
+        FROM
+            (
+                SELECT
+                    t.user_name AS `name`,
+                    sum( t.job_area ) AS `value`
+                FROM
+                    ta_device_job t
+                WHERE
+                    t.device_kind = #{deviceKind}
+                  AND t.job_date &gt;= #{jobDate}
+                GROUP BY
+                    t.user_name
+            ) a
+        ORDER BY
+            a.`value` DESC
+    </select>
+    <select id="statisNumByPerson" resultType="com.yunzhi.nanyang.vo.ChartParam">
+        SELECT
+            m.user_name as `name`,
+            COUNT( DISTINCT t.device_no ) AS `value`
+        FROM
+            td_device t
+                LEFT JOIN ta_machinery s ON t.machinery_id = s.machinery_id
+                LEFT JOIN sys_user m ON s.owner_id = m.user_id
+        WHERE
+            t.device_type = #{deviceType}
+        GROUP BY
+            m.user_name
+    </select>
+    <select id="statisAreaByTown" resultType="com.yunzhi.nanyang.vo.ChartParam">
+        SELECT
+            s.town as `name`,
+            sum( t.job_area ) AS `value`
+        FROM
+            ta_device_job t
+                LEFT JOIN ta_location s ON t.location = s.location
+        WHERE
+            t.device_kind = #{deviceKind}
+          AND t.job_date &gt;= #{jobDate}
+        GROUP BY
+            s.town
+    </select>
 </mapper>