新增首页统计相关的接口

src/main/java/com/xlht/xlhtproject/controller/FrontController.java

@@ -1,15 +1,19 @@
 package com.xlht.xlhtproject.controller;
 
 
+import com.xlht.xlhtproject.domain.HomeCountInfo;
+import com.xlht.xlhtproject.domain.TShuju1;
 import com.xlht.xlhtproject.domain.TTbDu;
 import com.xlht.xlhtproject.mapper.TTbDuMapper;
 import com.xlht.xlhtproject.respParse.bean.AjaxResult;
 import com.xlht.xlhtproject.respParse.bean.R;
 import com.xlht.xlhtproject.service.IFrontService;
+import com.xlht.xlhtproject.service.ITShuju1Service;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import java.util.List;
 import java.util.Objects;
 
 import static com.xlht.xlhtproject.enums.MyConstants.LONG_1;
@@ -28,6 +32,9 @@ public class FrontController {
     @Autowired
     private TTbDuMapper tTbDuMapper;
 
+    @Autowired
+    private ITShuju1Service tShuju1Service;
+
 
     /**
      *
@@ -98,4 +105,30 @@ public class FrontController {
 
 
 
+    /**
+     *首页-报表信息
+     * @return
+     */
+    @GetMapping("/bigModel/smartAdd/homeList")
+    public R<List<TShuju1>> homeList(@RequestParam(required = false, name = "timeBegin") String timeBegin, @RequestParam(required = false, name = "timeEnd") String timeEnd)
+    {
+        log.info("进入了 修改碳源投加 首页-报表信息 接口");
+        TShuju1 req = TShuju1.builder().timeBegin(timeBegin).timeEnd(timeEnd).build();
+        return R.ok(this.tShuju1Service.selectTShuju1List(req));
+    }
+
+
+    /**
+     *首页-化验统计信息
+     * @return
+     */
+    @GetMapping("/bigModel/smartAdd/homeCountInfo")
+    public R<HomeCountInfo> homeCountInfo()
+    {
+        log.info("进入了 修改碳源投加 首页-化验统计信息 接口");
+        return R.ok(this.frontService.homeCountInfo());
+    }
+
+
+
 }

src/main/java/com/xlht/xlhtproject/domain/HomeCountInfo.java

@@ -0,0 +1,28 @@
+package com.xlht.xlhtproject.domain;
+
+
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.math.BigDecimal;
+
+@Builder
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class HomeCountInfo {
+
+    //化验状态
+    private Integer status;
+
+    //累计运行天数
+    private Integer days;
+
+    //累计化验轮次
+    private Integer counts;
+
+    //累计化验次数
+    private Integer totals;
+}

src/main/java/com/xlht/xlhtproject/domain/TTbXie.java

@@ -26,10 +26,11 @@ public class TTbXie
     private Long ID;
 
     /** 机器人化验状态 */
-    private Long jqrZhuantai;
+    //todo 待确认具体状态
+    private Integer jqrZhuantai;
 
     /** 机器人化验状态 */
-    private Long jqrBaojing;
+    private Integer jqrBaojing;
 
     /** 机器人化验ID */
     private String jqrId;

src/main/java/com/xlht/xlhtproject/mapper/ZAssayMapper.java

@@ -58,4 +58,8 @@ public interface ZAssayMapper
      * @return 结果
      */
     public int deleteZAssayByAssayIds(Long[] assayIds);
+
+    int selectCount();
+
+    int selectDistinctDays();
 }

src/main/java/com/xlht/xlhtproject/mapper/ZAssayResultMapper.java

@@ -58,4 +58,6 @@ public interface ZAssayResultMapper
      * @return 结果
      */
     public int deleteZAssayResultByResultIds(Long[] resultIds);
+
+    int selectCount();
 }

src/main/java/com/xlht/xlhtproject/service/IFrontService.java

@@ -1,6 +1,7 @@
 package com.xlht.xlhtproject.service;
 
 import com.xlht.xlhtproject.domain.ChartBasic;
+import com.xlht.xlhtproject.domain.HomeCountInfo;
 import com.xlht.xlhtproject.domain.SmartAdd;
 
 import java.util.List;
@@ -12,4 +13,6 @@ public interface IFrontService {
     SmartAdd smartAddDataInfo();
 
     Map<String, List<ChartBasic>> smartAddCharList(int type, String timeBegin, String timeEnd);
+
+    HomeCountInfo homeCountInfo();
 }

src/main/java/com/xlht/xlhtproject/service/impl/FrontServiceImpl.java

@@ -1,10 +1,11 @@
 package com.xlht.xlhtproject.service.impl;
 
-import com.xlht.xlhtproject.domain.ChartBasic;
-import com.xlht.xlhtproject.domain.SmartAdd;
-import com.xlht.xlhtproject.domain.TShuju1;
+import com.xlht.xlhtproject.domain.*;
 import com.xlht.xlhtproject.enums.BusinessEnum;
 import com.xlht.xlhtproject.mapper.TShuju1Mapper;
+import com.xlht.xlhtproject.mapper.TTbXieMapper;
+import com.xlht.xlhtproject.mapper.ZAssayMapper;
+import com.xlht.xlhtproject.mapper.ZAssayResultMapper;
 import com.xlht.xlhtproject.service.IFrontService;
 import com.xlht.xlhtproject.utils.DateUtils;
 import com.xlht.xlhtproject.utils.StringUtils;
@@ -15,6 +16,8 @@ import org.springframework.stereotype.Service;
 import java.util.*;
 import java.util.stream.Collectors;
 
+import static com.xlht.xlhtproject.enums.MyConstants.LONG_1;
+
 @Service
 @Slf4j
 public class FrontServiceImpl implements IFrontService {
@@ -22,6 +25,14 @@ public class FrontServiceImpl implements IFrontService {
     @Autowired
     private TShuju1Mapper shuju1Mapper;
 
+    @Autowired
+    private TTbXieMapper xieMapper;
+
+    @Autowired
+    private ZAssayMapper zAssayMapper;
+
+    @Autowired
+    private ZAssayResultMapper zAssayResultMapper;
 
     @Override
     public SmartAdd smartAddDataInfo() {
@@ -107,4 +118,20 @@ public class FrontServiceImpl implements IFrontService {
         }
         return result;
     }
+
+    @Override
+    public HomeCountInfo homeCountInfo() {
+        HomeCountInfo build = HomeCountInfo.builder().build();
+        //获取化验状态
+        TTbXie tTbXie = this.xieMapper.selectTTbXieByID(LONG_1);
+        if(!Objects.isNull(tTbXie))
+            build.setStatus(tTbXie.getJqrZhuantai());
+        //获取累计运行天数  定义：只要某天有化验，那么就算累计加一天
+        build.setDays(this.zAssayMapper.selectDistinctDays());
+        //获取累计化验轮次
+        build.setCounts(this.zAssayMapper.selectCount());
+        //获取累计化验次数
+        build.setTotals(this.zAssayResultMapper.selectCount());
+        return build;
+    }
 }

src/main/resources/mapper/ZAssayMapper.xml

@@ -160,4 +160,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             #{assayId}
         </foreach>
     </delete>
+
+    <!-- 下面是新增的 -->
+    <select id="selectCount" resultType="int">
+        SELECT COUNT(*) FROM z_assay
+    </select>
+
+
+    <select id="selectDistinctDays" resultType="int">
+        SELECT COUNT(distinct SUBSTRING (create_time, 1, 10 )) FROM z_assay
+    </select>
 </mapper>

src/main/resources/mapper/ZAssayResultMapper.xml

@@ -235,4 +235,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             #{resultId}
         </foreach>
     </delete>
+
+    <!-- 下面是新增的 -->
+    <select id="selectCount" resultType="int">
+        SELECT COUNT(*) FROM z_assay_result
+    </select>
 </mapper>