Merge branch 'pt' of dd.tall.wiki:ccsens_wiki/ccsenscloud into pt

mt/src/main/resources/application.yml

@@ -1,6 +1,6 @@
 spring:
   profiles:
-    active: prod
+    active: test
-    include: common, util-prod
+    include: common, util-test
 
 

tall/src/main/resources/application.yml

@@ -1,5 +1,5 @@
 spring:
   profiles:
-    active: dev
+    active: test
-    include: util-dev,common
+    include: util-test,common
 

wisdomcar/src/main/java/com/ccsens/wisdomcar/api/ScreenController.java

@@ -13,4 +13,5 @@ import org.springframework.web.bind.annotation.RestController;
 @RestController
 @RequestMapping("/screen")
 public class ScreenController {
+
 }

wisdomcar/src/main/java/com/ccsens/wisdomcar/api/StatisticsController.java

@@ -2,6 +2,7 @@ package com.ccsens.wisdomcar.api;
 
 import com.ccsens.util.JsonResponse;
 import com.ccsens.util.bean.dto.QueryDto;
+import com.ccsens.wisdomcar.bean.dto.RfidDto;
 import com.ccsens.wisdomcar.bean.dto.StatisticsDto;
 import com.ccsens.wisdomcar.bean.vo.StatisticsVo;
 import com.ccsens.wisdomcar.service.IStatisticsService;
@@ -36,4 +37,12 @@ public class StatisticsController {
         log.info("查看测评结果");
         return JsonResponse.newInstance().ok(fastEdResult);
     }
+    @ApiOperation(value = "统计医院中小车得使用情况", notes = "")
+    @RequestMapping(value = "/get/selResult", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"})
+    public JsonResponse<StatisticsVo.UseNumsVo> selResult(@ApiParam @Validated @RequestBody QueryDto<StatisticsDto.UseNum> params) {
+        log.info("查看测评结果：{}",params);
+        StatisticsVo.UseNumsVo selResult = statisticsService.selResult(params.getParam());
+        log.info("查看测评结果");
+        return JsonResponse.newInstance().ok(selResult);
+    }
 }

wisdomcar/src/main/java/com/ccsens/wisdomcar/bean/dto/StatisticsDto.java

@@ -4,11 +4,24 @@ import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+
 /**
- * @author 逗
+ * 1007
  */
 @Data
 public class StatisticsDto {
+    @Data
+    @ApiModel("查询小车本年和往年使用次数")
+    public static class UseNum{
+        @NotBlank
+        @ApiModelProperty("year,比如直接传入 2020 即可")
+        private String year;
+        @NotNull
+        @ApiModelProperty("医院id")
+        private Long hospitalId;
+    }
 
     @Data
     @ApiModel("医院id")

wisdomcar/src/main/java/com/ccsens/wisdomcar/bean/vo/StatisticsVo.java

@@ -3,12 +3,25 @@ package com.ccsens.wisdomcar.bean.vo;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
+import java.util.List;
 
 /**
- * @author 逗
+ * 1007
  */
 @Data
 public class StatisticsVo {
+    @Data
+    @ApiModel("查询小车本年和往年使用次数")
+    public static class UseNumsVo {
+        @ApiModelProperty("本年单月")
+        private List<Integer> sigleNow;
+        @ApiModelProperty("本年和")
+        private List<Integer> sumNow;
+        @ApiModelProperty("去年单月")
+        private List<Integer> sigleLast;
+        @ApiModelProperty("去年年和")
+        private List<Integer> sumLast;
+    }
 
 
     @Data

wisdomcar/src/main/java/com/ccsens/wisdomcar/persist/dao/StatisticsDao.java

@@ -0,0 +1,12 @@
+package com.ccsens.wisdomcar.persist.dao;
+
+import com.ccsens.wisdomcar.bean.dto.StatisticsDto;
+import com.ccsens.wisdomcar.bean.vo.StatisticsVo;
+import com.ccsens.wisdomcar.persist.mapper.FirstAidMapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+public interface StatisticsDao  extends FirstAidMapper {
+    public List<Integer> selResult(@Param("param")StatisticsDto.UseNum param);
+}

wisdomcar/src/main/java/com/ccsens/wisdomcar/service/IStatisticsService.java

@@ -10,4 +10,11 @@ public interface IStatisticsService {
      * @return
      */
     StatisticsVo.FastEdResult getResult(StatisticsDto.Hospital param);
+
+    /**
+     * 查询医院得小车使用情况
+     * @param param
+     * @return
+     */
+    StatisticsVo.UseNumsVo selResult(StatisticsDto.UseNum param);
 }

wisdomcar/src/main/java/com/ccsens/wisdomcar/service/StatisticsService.java

@@ -2,17 +2,52 @@ package com.ccsens.wisdomcar.service;
 
 import com.ccsens.wisdomcar.bean.dto.StatisticsDto;
 import com.ccsens.wisdomcar.bean.vo.StatisticsVo;
+import com.ccsens.wisdomcar.persist.dao.StatisticsDao;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Propagation;
 import org.springframework.transaction.annotation.Transactional;
 
+import javax.annotation.Resource;
+import java.security.PrivateKey;
+import java.util.ArrayList;
+import java.util.List;
+
 @Slf4j
 @Service
 @Transactional(propagation = Propagation.REQUIRED, rollbackFor = Exception.class)
 public class StatisticsService implements IStatisticsService{
+    @Resource
+    private StatisticsDao statisticsDao;
     @Override
     public StatisticsVo.FastEdResult getResult(StatisticsDto.Hospital param) {
         return null;
     }
+
+    @Override
+    public StatisticsVo.UseNumsVo selResult(StatisticsDto.UseNum param) {
+        StatisticsVo.UseNumsVo useNumsVo=new StatisticsVo.UseNumsVo();
+        List<Integer> useNumVoNow = statisticsDao.selResult(param);
+        List<Integer> sumNow=new ArrayList<Integer>();
+        sumNow.add(useNumVoNow.get(0));
+        for (int i = 1; i < useNumVoNow.size(); i++) {
+            sumNow.add(useNumVoNow.get(i)+sumNow.get(i-1));
+        }
+        useNumsVo.setSigleNow(useNumVoNow);
+        useNumsVo.setSumNow(sumNow);
+
+        //往年得
+        Integer yaer=Integer.valueOf(param.getYear());
+        yaer=yaer-1;
+        param.setYear(String.valueOf(yaer));
+        List<Integer> useNumVosLast = statisticsDao.selResult(param);
+        List<Integer> sumLast = new ArrayList<Integer>();
+        sumLast.add(useNumVosLast.get(0));
+        for (int i = 1; i < useNumVosLast.size(); i++) {
+            sumLast.add(useNumVosLast.get(i)+sumLast.get(i-1));
+        }
+        useNumsVo.setSigleLast(useNumVosLast);
+        useNumsVo.setSumLast(sumLast);
+        return useNumsVo;
+    }
 }

wisdomcar/src/main/resources/mapper_dao/StatisticsDao.xml

@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.ccsens.wisdomcar.persist.dao.StatisticsDao">
+
+    <select id="selResult" resultType="Integer" parameterType="com.ccsens.wisdomcar.bean.dto.StatisticsDto$UseNum">
+       select if(tfa.num is NULL,0,tfa.num) as num FROM
+(SELECT
+	concat( #{param.year}, `name` ) AS `name`
+FROM
+	t_statistics_month ) tsm
+	LEFT JOIN (
+					SELECT
+						tfa.da,
+						count( tfa.da ) AS num
+					FROM
+						(
+					SELECT
+						*,
+						FROM_UNIXTIME( begin_time / 1000, '%Y-%m' ) AS da
+					FROM
+						`t_first_aid`
+					WHERE
+						`t_first_aid`.rec_status = 0
+						AND `t_first_aid`.hospital_id =#{param.hospitalId}
+						AND FROM_UNIXTIME( begin_time / 1000, '%Y-%m' ) LIKE  concat(#{param.year},'-%')
+						) tfa
+					GROUP BY
+						tfa.da
+					ORDER BY
+						tfa.da
+	) tfa on tsm.`name`=tfa.`da`
+    </select>
+
+</mapper>