feats

src/main/java/com/yunzhi/inte/common/DateUtils.java

@@ -39,6 +39,12 @@ public class DateUtils {
         return d.format(formatter);
     }
 
+    public static LocalDateTime fromString(String str, String formatter) {
+        DateTimeFormatter df = DateTimeFormatter.ofPattern(formatter);
+
+        return LocalDateTime.parse(str, df);
+    }
+
     public static LocalDateTime day2LocalDateime(String day) {
         DateTimeFormatter df = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
         return LocalDateTime.parse(day + " 00:00:00", df);

src/main/java/com/yunzhi/inte/controller/PostsController.java

@@ -10,6 +10,7 @@ import com.yunzhi.inte.common.ResponseBean;
 import java.time.LocalDateTime;
 import java.util.List;
 
+import com.yunzhi.inte.common.StringUtils;
 import com.yunzhi.inte.entity.PostsFiles;
 import com.yunzhi.inte.service.PostsFilesService;
 import io.swagger.annotations.Api;
@@ -67,10 +68,14 @@ public class PostsController extends BaseController {
     @ApiOperation("分页查询")
     @GetMapping("/posts")
     public ResponseBean list(@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 = "title", required = false) String title,
+                             @ApiParam("状态") @RequestParam(value = "status", required = false) Integer status) throws Exception {
 
         IPage<Posts> pg = new Page<>(pageNum, pageSize);
         QueryWrapper<Posts> queryWrapper = new QueryWrapper<>();
+        queryWrapper.like(!StringUtils.isEmpty(title), "title", title);
+        queryWrapper.eq(null != status, "status", status);
         queryWrapper.gt("status", Constants.STATUS_DELETE);
 
         queryWrapper.orderByDesc("create_date");

src/main/java/com/yunzhi/inte/controller/PostsFilesController.java

@@ -5,7 +5,10 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.yunzhi.inte.common.BaseController;
 import com.yunzhi.inte.common.ResponseBean;
+
 import java.util.List;
+
+import com.yunzhi.inte.common.StringUtils;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
@@ -14,8 +17,9 @@ import org.springframework.web.bind.annotation.*;
 import com.yunzhi.inte.entity.PostsFiles;
 import com.yunzhi.inte.service.PostsFilesService;
 
- /**
+/**
  * 关联文件;(posts_files)表控制层
+ *
  * @author : http://njyunzhi.com
  * @date : 2022-10-13
  */
@@ -23,12 +27,12 @@ import com.yunzhi.inte.service.PostsFilesService;
 @RestController
 @RequestMapping("/")
 public class PostsFilesController extends BaseController {
-    
+
     @Autowired
     private PostsFilesService postsFilesService;
-    
-    /** 
-     * 通过ID查询单条数据 
+
+    /**
+     * 通过ID查询单条数据
      *
      * @param id 主键
      * @return 实例对象
@@ -38,28 +42,30 @@ public class PostsFilesController extends BaseController {
     public ResponseBean queryById(@ApiParam("对象ID") @PathVariable Integer id) throws Exception {
         return ResponseBean.success(postsFilesService.getById(id));
     }
-    
-    /** 
+
+    /**
      * 分页查询
      *
-     * @param pageNum 当前页码
+     * @param pageNum  当前页码
      * @param pageSize 每页条数
      * @return 查询结果
      */
     @ApiOperation("分页查询")
     @GetMapping("/postsFiles")
-    public ResponseBean list(@ApiParam("页码") @RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
-                            @ApiParam("单页数据量") @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize) throws Exception {
-        
+    public ResponseBean list(@ApiParam("页码") @RequestParam(value = "pageNum", defaultValue = "1") Integer pageNum,
+                             @ApiParam("单页数据量") @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize,
+                             @ApiParam("文件名称") @RequestParam(value = "fileName", required = false) String fileName) throws Exception {
+
         IPage<PostsFiles> pg = new Page<>(pageNum, pageSize);
-        // QueryWrapper<PostsFiles> queryWrapper = new QueryWrapper<>();
-        // queryWrapper.orderByDesc("create_date");
-        IPage<PostsFiles> result = postsFilesService.page(pg);
-        
+        QueryWrapper<PostsFiles> queryWrapper = new QueryWrapper<>();
+        queryWrapper.like(!StringUtils.isEmpty(fileName), "file_name", fileName);
+        queryWrapper.orderByDesc("id");
+        IPage<PostsFiles> result = postsFilesService.page(pg, queryWrapper);
+
         return ResponseBean.success(result);
     }
-    
-    /** 
+
+    /**
      * 新增数据
      *
      * @param postsFiles 实例对象
@@ -71,8 +77,8 @@ public class PostsFilesController extends BaseController {
         postsFilesService.save(postsFiles);
         return ResponseBean.success(postsFiles);
     }
-    
-    /** 
+
+    /**
      * 更新数据
      *
      * @param postsFiles 实例对象
@@ -81,12 +87,12 @@ public class PostsFilesController extends BaseController {
     @ApiOperation("更新数据")
     @PutMapping("/postsFiles/{id}")
     public ResponseBean edit(@ApiParam("对象实体") @RequestBody PostsFiles postsFiles,
-                            @ApiParam("对象ID") @PathVariable Integer id ) throws Exception {
+                             @ApiParam("对象ID") @PathVariable Integer id) throws Exception {
         postsFilesService.updateById(postsFiles);
         return ResponseBean.success(postsFiles);
     }
-    
-    /** 
+
+    /**
      * 通过主键删除数据
      *
      * @param id 主键
@@ -94,8 +100,8 @@ public class PostsFilesController extends BaseController {
      */
     @ApiOperation("通过主键删除数据")
     @DeleteMapping("/postsFiles/{id}")
-    public ResponseBean deleteById(@ApiParam("对象ID") @PathVariable Integer id){
-        postsFilesService.removeLogicById(id);
+    public ResponseBean deleteById(@ApiParam("对象ID") @PathVariable Integer id) {
+        postsFilesService.removeById(id);
         return ResponseBean.success("success");
     }
 }

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

@@ -1,13 +1,75 @@
 package com.yunzhi.inte.controller;
 
 import com.yunzhi.inte.common.BaseController;
+import com.yunzhi.inte.common.DateUtils;
+import com.yunzhi.inte.common.ResponseBean;
+import com.yunzhi.inte.service.GuaranteeTaskService;
+import com.yunzhi.inte.service.StoreService;
 import io.swagger.annotations.Api;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiParam;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.time.Duration;
+import java.time.LocalDateTime;
+import java.time.temporal.ChronoUnit;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
 
 @Api(tags = "统计功能接口")
 @RestController
-@RequestMapping("/")
+@RequestMapping("/statis")
 public class StatisController extends BaseController {
 
+    @Autowired
+    GuaranteeTaskService guaranteeTaskService;
+
+    @Autowired
+    StoreService storeService;
+
+    @ApiOperation("汇总统计")
+    @GetMapping("/summary")
+    public ResponseBean getSummary() {
+
+        // 任务总数
+        Integer taskCount = guaranteeTaskService.total();
+        // 接待军人总数
+        Integer personNum = guaranteeTaskService.sumPerson();
+        // 总体评价
+        String evaValue = "良";
+        // 设备数量
+        Integer deviceNum = storeService.countDevice();
+
+        return ResponseBean.success(new HashMap<String, Object>(){{
+            put("taskCount", taskCount);
+            put("personNum", personNum);
+            put("evaValue", evaValue);
+            put("deviceNum", deviceNum);
+        }});
+    }
+
+
+    @ApiOperation("任务汇总")
+    @GetMapping("/taskInfo")
+    public ResponseBean getTaskInfo(@ApiParam("起始日期") @RequestParam(value ="startDate") String startDate,
+                                    @ApiParam("起始日期") @RequestParam(value ="endDate") String endDate) {
+
+        LocalDateTime dt1 = DateUtils.day2LocalDateime(startDate);
+        LocalDateTime dt2 = DateUtils.day2LocalDateime(endDate);
+
+        Long days = ChronoUnit.DAYS.between(dt1, dt2) + 1;
+
+        List<Map<String, Object>> result;
+        if (days < 180) {
+            result = guaranteeTaskService.countByDays(startDate, endDate, days);
+        } else {
+            long months = ChronoUnit.MONTHS.between(dt1, dt2) + 1;
+            result = guaranteeTaskService.countByMonths(startDate, endDate, months);
+        }
+
+        return ResponseBean.success(result);
+    }
 }

src/main/java/com/yunzhi/inte/mapper/GuaranteeTaskMapper.java

@@ -5,6 +5,9 @@ import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 import com.yunzhi.inte.entity.GuaranteeTask;
 
+import java.util.List;
+import java.util.Map;
+
 /**
  * 供给保障;(guarantee_task)表数据库访问层
  * @author : http://njyunzhi.com
@@ -13,4 +16,9 @@ import com.yunzhi.inte.entity.GuaranteeTask;
 @Mapper
 public interface GuaranteeTaskMapper  extends BaseMapper<GuaranteeTask>{
 
+    int sumPerson(@Param("status") int status);
+
+    List<Map<String, Object>> countByDays(@Param("startDate") String startDate,@Param("endDate") String endDate,@Param("days") Long days);
+
+    List<Map<String, Object>> countByMonths(@Param("startDate") String startDate,@Param("endDate") String endDate,@Param("months") Long months);
 }

src/main/java/com/yunzhi/inte/service/GuaranteeTaskService.java

@@ -3,6 +3,9 @@ package com.yunzhi.inte.service;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.yunzhi.inte.entity.GuaranteeTask;
 
+import java.util.List;
+import java.util.Map;
+
 /**
  * 供给保障;(guarantee_task)表服务接口
  * @author : http://njyunzhi.com
@@ -10,4 +13,11 @@ import com.yunzhi.inte.entity.GuaranteeTask;
  */
 public interface GuaranteeTaskService extends IBaseService<GuaranteeTask> {
 
+    Integer total();
+
+    Integer sumPerson();
+
+    List<Map<String, Object>> countByDays(String startDate, String endDate, Long days);
+
+    List<Map<String, Object>> countByMonths(String startDate, String endDate, Long months);
 }

src/main/java/com/yunzhi/inte/service/StoreService.java

@@ -15,4 +15,6 @@ public interface StoreService extends IBaseService<Store> {
     IPage<Store> getPageBy(IPage<Store> pg, Integer id, String name, String typeId, Integer isDish);
 
     List<Store> getListBy(String name, String typeId, Integer isDish);
+
+    Integer countDevice();
 }

src/main/java/com/yunzhi/inte/service/UsersService.java

@@ -6,12 +6,13 @@ import com.yunzhi.inte.vo.LoginParm;
 
 /**
  * 用户表;(users)表服务接口
+ *
  * @author : http://njyunzhi.com
  * @date : 2022-10-12
  */
 public interface UsersService extends IBaseService<Users> {
 
-     Users login(LoginParm loginParm) throws Exception;
+    Users login(LoginParm loginParm) throws Exception;
 
     boolean mergeData(Users users) throws Exception;
 }

src/main/java/com/yunzhi/inte/service/impl/GuaranteeTaskServiceImpl.java

@@ -1,10 +1,16 @@
 package com.yunzhi.inte.service.impl;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.yunzhi.inte.common.Constants;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import com.yunzhi.inte.entity.GuaranteeTask;
 import com.yunzhi.inte.mapper.GuaranteeTaskMapper;
 import com.yunzhi.inte.service.GuaranteeTaskService;
+
+import java.util.List;
+import java.util.Map;
+
 /**
  * 供给保障;(guarantee_task)表服务实现类
  * @author : http://www.chiner.pro
@@ -13,4 +19,26 @@ import com.yunzhi.inte.service.GuaranteeTaskService;
 @Service
 public class GuaranteeTaskServiceImpl extends BaseServiceImpl<GuaranteeTaskMapper, GuaranteeTask> implements GuaranteeTaskService {
 
+    @Override
+    public Integer total() {
+        QueryWrapper<GuaranteeTask> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("status", Constants.STATUS_NORMAL);
+
+        return count(queryWrapper);
+    }
+
+    @Override
+    public Integer sumPerson() {
+        return baseMapper.sumPerson(Constants.STATUS_NORMAL);
+    }
+
+    @Override
+    public List<Map<String, Object>> countByDays(String startDate, String endDate, Long days) {
+        return baseMapper.countByDays(startDate, endDate, days);
+    }
+
+    @Override
+    public List<Map<String, Object>> countByMonths(String startDate, String endDate, Long months) {
+        return baseMapper.countByMonths(startDate, endDate, months);
+    }
 }

src/main/java/com/yunzhi/inte/service/impl/StoreServiceImpl.java

@@ -1,6 +1,8 @@
 package com.yunzhi.inte.service.impl;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.yunzhi.inte.common.Constants;
 import com.yunzhi.inte.common.StringUtils;
 import org.springframework.stereotype.Service;
 import com.yunzhi.inte.entity.Store;
@@ -38,4 +40,13 @@ public class StoreServiceImpl extends BaseServiceImpl<StoreMapper, Store> implem
 
         return baseMapper.getListBy(name, typeId, isDish);
     }
+
+    @Override
+    public Integer countDevice() {
+        QueryWrapper<Store> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("is_device", 1);
+        queryWrapper.eq("status", Constants.STATUS_NORMAL);
+
+        return count(queryWrapper);
+    }
 }

src/main/resources/mapper/GuaranteeTaskMapper.xml

@@ -3,4 +3,56 @@
 
 <mapper namespace="com.yunzhi.inte.mapper.GuaranteeTaskMapper">
 
+    <select id="sumPerson" resultType="java.lang.Integer">
+        SELECT
+            sum( t.total_person_num )
+        FROM
+            guarantee_task t
+        WHERE
+            t.`status` = #{status}
+    </select>
+    <select id="countByDays" resultType="java.util.Map">
+        SELECT
+            ADDDATE( #{startDate}, INTERVAL t.rownum DAY ) AS dt,
+            IFNULL( s.cnt, 0 ) AS cnt
+        FROM
+            sequence t
+            LEFT JOIN (
+                SELECT
+                    DATE( a.start_date ) AS dt,
+                    COUNT( * ) AS cnt
+                FROM
+                    guarantee_task a
+                WHERE
+                    a.`status` = 1
+                    AND DATE( a.start_date ) &gt;= #{startDate}
+                    AND DATE( a.start_date ) &lt;= #{endDate}
+                GROUP BY
+                    DATE( a.start_date )
+            ) s ON s.dt = ADDDATE(#{startDate}, INTERVAL t.rownum DAY )
+        WHERE
+            t.rownum &lt; #{days}
+    </select>
+    <select id="countByMonths" resultType="java.util.Map">
+        SELECT
+            DATE_FORMAT(ADDDATE(#{startDate}, INTERVAL rownum MONTH), '%Y-%m') AS dt,
+            IFNULL( s.cnt, 0 ) AS cnt
+        FROM
+            sequence t
+            LEFT JOIN (
+                SELECT
+                    DATE_FORMAT( a.start_date, '%Y-%m') AS dt,
+                    count( * ) AS cnt
+                FROM
+                    guarantee_task a
+                WHERE
+                    a.`status` = 1
+                    AND DATE( a.start_date ) &gt;= #{startDate}
+                    AND DATE( a.start_date ) &lt;= #{endDate}
+                    GROUP BY
+                        DATE_FORMAT( a.start_date, '%Y-%m')
+            ) s ON s.dt = DATE_FORMAT(ADDDATE(#{startDate}, INTERVAL rownum MONTH), '%Y-%m')
+        WHERE
+            t.rownum &lt; #{months}
+    </select>
 </mapper>