石湾手机端完善

shiwan/env/src/main/java/com/huimv/env/controller/EnvironmentController.java

@@ -1,10 +1,14 @@
 package com.huimv.env.controller;
 
 import com.huimv.common.utils.Result;
+import com.huimv.env.dao.entity.XtHkQtsb;
+import com.huimv.env.dao.entity.XtHkQtsbInfo;
 import com.huimv.env.service.IEnvironmentService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import java.util.Date;
+
 /**
  * @Project : huimv.shiwan
  * @Package : com.huimv.biosafety.uface.controller
@@ -104,6 +108,23 @@ public class EnvironmentController {
         return environmentService.getEnvDetails();
     }
 
+    @RequestMapping("/findByZSID")
+    public Result findByZSID(String  jqid) {
+        // 获取环保数据
+        return environmentService.findByJqid(jqid);
+    }
+
+    @RequestMapping("/add")
+    public Result add(String JQID, String ZSMC  , String startTime,Long duration) {
+        // 获取环保数据
+        return environmentService.add(JQID,ZSMC,startTime,duration);
+    }
+
+    @RequestMapping("/getZMInfo")
+    public Result getZMInfo() {
+        return environmentService.getZMInfo();
+    }
+
 
 
 }

shiwan/env/src/main/java/com/huimv/env/dao/entity/DaJqda.java

@@ -0,0 +1,141 @@
+package com.huimv.env.dao.entity;
+
+import lombok.Data;
+
+import javax.persistence.*;
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * 档案_机器档案
+ */
+@Entity
+@Table(name = "da_jqda")
+@Data
+public class DaJqda implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * ID
+     */
+    @Id
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    @Column(name = "ID", nullable = false)
+    private Integer ID;
+
+    /**
+     * 机器ID
+     */
+    @Column(name = "JQID")
+    private String JQID;
+
+    /**
+     * 猪舍ID
+     */
+    @Column(name = "ZSID")
+    private Integer ZSID;
+
+    /**
+     * 区划编码
+     */
+    @Column(name = "QHBM")
+    private String QHBM;
+
+    /**
+     * 目标版本
+     */
+    @Column(name = "MBBB")
+    private String MBBB;
+
+    /**
+     * ftp命令
+     */
+    @Column(name = "FTPCMD")
+    private String FTPCMD;
+
+    /**
+     * 修改人
+     */
+    @Column(name = "XGR")
+    private String XGR;
+
+    /**
+     * 修改时间
+     */
+    @Column(name = "XGSJ", nullable = false)
+    private Date XGSJ;
+
+    /**
+     * 作废标志
+     */
+    @Column(name = "ZFBZ")
+    private Integer ZFBZ;
+
+    /**
+     * 当前版本
+     */
+    @Column(name = "DQBB")
+    private String DQBB;
+
+    /**
+     * 环控当前版本
+     */
+    @Column(name = "HKDQBB")
+    private String HKDQBB;
+
+    /**
+     * 环控目标版本
+     */
+    @Column(name = "HKMBBB")
+    private String HKMBBB;
+
+    /**
+     * 环控CMD命令
+     */
+    @Column(name = "HKFTPCMD")
+    private String HKFTPCMD;
+
+    /**
+     * 料槽当前版本
+     */
+    @Column(name = "LCDQBB")
+    private String LCDQBB;
+
+    /**
+     * 料槽目标版本
+     */
+    @Column(name = "LCMBBB")
+    private String LCMBBB;
+
+    /**
+     * 料槽CMD命令
+     */
+    @Column(name = "LCFTPCMD")
+    private String LCFTPCMD;
+
+    /**
+     * 序列号
+     */
+    @Column(name = "XLH")
+    private String XLH;
+
+    /**
+     * 站点号
+     */
+    @Column(name = "ZDH")
+    private String ZDH;
+
+    @Column(name = "IMEI")
+    private String IMEI;
+
+    @Column(name = "IMSI")
+    private String IMSI;
+
+    @Column(name = "CCID")
+    private String CCID;
+
+    @Column(name = "ESIMNAME")
+    private String ESIMNAME;
+
+}

shiwan/env/src/main/java/com/huimv/env/dao/entity/XtDgdskz.java

@@ -0,0 +1,48 @@
+package com.huimv.env.dao.entity;
+
+import lombok.Data;
+
+import javax.persistence.*;
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * 灯光定时控制
+ */
+@Entity
+@Data
+@Table(name = "xt_dgdskz")
+public class XtDgdskz implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @Id
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    @Column(name = "ID", nullable = false)
+    private Integer ID;
+
+    @Column(name = "JQID")
+    private String JQID;
+
+    /**
+     * 开启时间,持续时间(分)
+     */
+    @Column(name = "PZNR")
+    private String PZNR;
+
+    @Column(name = "XGSJ")
+    private Date XGSJ;
+
+    /**
+     * 1-设备上传 2-平台保存
+     */
+    @Column(name = "BZ")
+    private String BZ;
+
+    /**
+     * 结束时间
+     */
+    @Column(name = "JSSJ")
+    private String JSSJ;
+
+}

shiwan/env/src/main/java/com/huimv/env/dao/entity/XtHkQtsb.java

@@ -0,0 +1,75 @@
+package com.huimv.env.dao.entity;
+
+import lombok.Data;
+
+import javax.persistence.*;
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * 系统_环控_其他设备
+ */
+@Entity
+@Data
+@Table(name = "xt_hk_qtsb")
+public class XtHkQtsb implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @Id
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    @Column(name = "ID", nullable = false)
+    private Integer ID;
+
+    @Column(name = "JQID")
+    private String JQID;
+
+    /**
+     * 水帘 序号-开启温度-开启偏移-关闭偏移#...
+     */
+    @Column(name = "SL")
+    private String SL;
+
+    /**
+     * 水帘修改时间
+     */
+    @Column(name = "SLXGSJ")
+    private Date SLXGSJ;
+
+    /**
+     * 暖灯 序号-开启温度-开启偏移-关闭偏移#...
+     */
+    @Column(name = "ND")
+    private String ND;
+
+    /**
+     * 暖灯修改时间
+     */
+    @Column(name = "NDXGSJ")
+    private Date NDXGSJ;
+
+    /**
+     * 喷淋 序号-开启温度-开启偏移-关闭偏移-开始时间-关闭时间#...
+     */
+    @Column(name = "PL")
+    private String PL;
+
+    /**
+     * 喷淋修改时间
+     */
+    @Column(name = "PLXGSJ")
+    private Date PLXGSJ;
+
+    /**
+     * 照明 序号-开启时间-持续时间#...
+     */
+    @Column(name = "ZM")
+    private String ZM;
+
+    /**
+     * 照明修改时间
+     */
+    @Column(name = "ZMXGSJ")
+    private Date ZMXGSJ;
+
+}

shiwan/env/src/main/java/com/huimv/env/dao/entity/XtHkQtsbInfo.java

@@ -0,0 +1,39 @@
+package com.huimv.env.dao.entity;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+
+import javax.persistence.*;
+import java.io.Serializable;
+import java.util.Date;
+
+@Entity
+@Table(name = "xt_hk_qtsb_info")
+@Data
+public class XtHkQtsbInfo implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @Id
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    @Column(name = "id", nullable = false)
+    private Integer id;
+
+    @Column(name = "ZSMC")
+    private String ZSMC;
+
+    @Column(name = "XGSJ", nullable = false)
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
+    private Date XGSJ;
+
+    @Column(name = "ZMCS")
+    private String ZMCS;
+
+
+    @Column(name = "begin_time")
+    private String beginTime;
+
+    @Column(name = "durations")
+    private Long durations;
+
+}

shiwan/env/src/main/java/com/huimv/env/dao/repo/DaJqdaRepo.java

@@ -0,0 +1,9 @@
+package com.huimv.env.dao.repo;
+
+import com.huimv.env.dao.entity.DaJqda;
+import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
+
+public interface DaJqdaRepo extends JpaRepository<DaJqda, Integer>, JpaSpecificationExecutor<DaJqda> {
+
+}

shiwan/env/src/main/java/com/huimv/env/dao/repo/EnvironmentDataEntityRepository.java

@@ -5,8 +5,14 @@ import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
 import org.springframework.data.jpa.repository.Query;
 
+import java.util.List;
+
 public interface EnvironmentDataEntityRepository extends JpaRepository<EnvironmentDataEntity, Integer>, JpaSpecificationExecutor<EnvironmentDataEntity> {
 
     @Query(nativeQuery = true, value = "select * from environment_data order by id desc limit 1")
     EnvironmentDataEntity getOneLastEnvData();
+
+
+    @Query(nativeQuery = true, value = "select JQID from da_jqda where ZSID = ?1 ")
+    List findByZsid(Integer zsid);
 }

shiwan/env/src/main/java/com/huimv/env/dao/repo/XtDgdskzRepo.java

@@ -0,0 +1,12 @@
+package com.huimv.env.dao.repo;
+
+import com.huimv.env.dao.entity.XtDgdskz;
+import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
+import org.springframework.data.jpa.repository.Query;
+
+public interface XtDgdskzRepo extends JpaRepository<XtDgdskz, Integer>, JpaSpecificationExecutor<XtDgdskz> {
+
+    @Query(nativeQuery = true, value = "select * from xt_dgdskz where JQID = ?1 order by XGSJ desc limit 1")
+    XtDgdskz findByJQIDOrderByXGSJ(String jqid);
+}

shiwan/env/src/main/java/com/huimv/env/dao/repo/XtHkQtsbInfoRepo.java

@@ -0,0 +1,15 @@
+package com.huimv.env.dao.repo;
+
+import com.huimv.common.utils.Result;
+import com.huimv.env.dao.entity.XtHkQtsbInfo;
+import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
+import org.springframework.data.jpa.repository.Query;
+
+import java.util.List;
+
+public interface XtHkQtsbInfoRepo extends JpaRepository<XtHkQtsbInfo, Integer>, JpaSpecificationExecutor<XtHkQtsbInfo> {
+
+    @Query(nativeQuery = true,value = "select * from xt_hk_qtsb_info order by XGSJ DESC limit 10")
+    List<XtHkQtsbInfo> getZMInfo();
+}

shiwan/env/src/main/java/com/huimv/env/dao/repo/XtHkQtsbRepo.java

@@ -0,0 +1,13 @@
+package com.huimv.env.dao.repo;
+
+import com.huimv.env.dao.entity.XtHkQtsb;
+import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
+import org.springframework.data.jpa.repository.Query;
+
+public interface XtHkQtsbRepo extends JpaRepository<XtHkQtsb, Integer>, JpaSpecificationExecutor<XtHkQtsb> {
+
+    @Query(nativeQuery = true, value = "select * from xt_hk_qtsb where JQID = ?1 ORDER By ZMXGSJ DESC limit 1")
+    XtHkQtsb findByJQIDOrderByZMXGSJ(String jqid);
+
+}

shiwan/env/src/main/java/com/huimv/env/service/IEnvironmentService.java

@@ -2,6 +2,10 @@ package com.huimv.env.service;
 
 import com.alibaba.fastjson.JSONArray;
 import com.huimv.common.utils.Result;
+import com.huimv.env.dao.entity.XtHkQtsb;
+import com.huimv.env.dao.entity.XtHkQtsbInfo;
+
+import java.util.Date;
 
 /**
  * @Project : huimv.shiwan
@@ -35,4 +39,11 @@ public interface IEnvironmentService {
     Result getAmmoniaAndHumidityOnToday(Integer lqid);
 
     Result getEnvDetails();
+
+    Result findByJqid(String jqid);
+
+    Result add(String JQID,String ZSMC, String startTime,Long duration);
+
+    Result getZMInfo();
+
 }

shiwan/env/src/main/java/com/huimv/env/service/impl/EnvironmentServiceImpl.java

@@ -1,5 +1,7 @@
 package com.huimv.env.service.impl;
 
+import cn.hutool.core.date.DateTime;
+import cn.hutool.core.date.DateUnit;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.dynamic.datasource.annotation.DS;
@@ -13,9 +15,8 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.math.BigDecimal;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
+import java.time.format.DateTimeFormatter;
+import java.util.*;
 
 /**
  * @Project : huimv.shiwan
@@ -283,6 +284,7 @@ public class EnvironmentServiceImpl implements IEnvironmentService {
             JSONObject zsJo = new JSONObject();
             zsJa.add(zsJo);
             zsJo.put("zsid", zsid);
+            zsJo.put("jqid",environmentDataRepo.findByZsid(zsid));
             zsJo.put("isQuanKong",false);
             if (zsid == 367 || zsid == 378 || zsid == 379){
                 zsJo.put("isQuanKong",true);
@@ -458,4 +460,78 @@ public class EnvironmentServiceImpl implements IEnvironmentService {
     }
 
 
+
+
+
+    @Autowired
+    private XtHkQtsbInfoRepo XtHkQtsbInfoRepo ;
+
+    @Autowired
+    private XtDgdskzRepo dgdskzRepo ;
+
+    @Override
+    @DS("slave")
+    public Result findByJqid(String jqid) {
+       XtDgdskz xtDgdskz =   dgdskzRepo.findByJQIDOrderByXGSJ(jqid);
+        if (xtDgdskz == null){
+            return new Result(10001,"没有数据",false);
+        }
+
+        String zm = xtDgdskz.getPZNR();
+        if (zm == null){
+            return new Result(10001,"没有数据",false);
+        }
+
+        String[] split = zm.split(",");
+        String startTime = split[0];
+        String durations = split[1];
+        String begin = cn.hutool.core.date.DateUtil.format(xtDgdskz.getXGSJ(),"yyyy:MM:dd")
+                + " "  + startTime.substring(0,2) + ":" + startTime.substring(2) + ":00";
+        Date beginDate = cn.hutool.core.date.DateUtil.parse(begin, "yyyy:MM:dd HH:mm:ss");
+        Date endDate = cn.hutool.core.date.DateUtil.offsetMinute(beginDate, Integer.parseInt(durations));
+
+        String beginStr = cn.hutool.core.date.DateUtil.format(beginDate, "HH:mm");
+        String endStr = cn.hutool.core.date.DateUtil.format(endDate, "HH:mm");
+
+
+        JSONObject jsonObject = new JSONObject();
+        jsonObject.put("startTime",beginStr);
+        jsonObject.put("endTime",endStr);
+        return new Result(ResultCode.SUCCESS,jsonObject);
+    }
+
+    @Override
+    @DS("slave")
+    public Result add(String JQID,String ZSMC, String startTime,Long duration) {
+        XtHkQtsbInfo hkQtsbInfo = new XtHkQtsbInfo();
+        XtDgdskz xtDgdskz = new XtDgdskz();
+
+        xtDgdskz.setJQID(JQID);
+        hkQtsbInfo.setZSMC(ZSMC);
+
+//        String format = cn.hutool.core.date.DateUtil.format(starTime, "yyyy-MM-dd HH:mm");
+//        long durations = cn.hutool.core.date.DateUtil.between(starTime, endTime, DateUnit.MINUTE);
+        hkQtsbInfo.setBeginTime(startTime);
+        hkQtsbInfo.setDurations(duration);
+//        String time = format.split(" ")[1].replace(":", "");
+        String replace = startTime.replace(":", "");
+        String zm = replace + "," + duration;
+        xtDgdskz.setPZNR(zm);
+
+        Date date = new Date();
+        xtDgdskz.setXGSJ(date);
+        xtDgdskz.setBZ("2");
+        hkQtsbInfo.setXGSJ(date);
+
+        dgdskzRepo.save(xtDgdskz);
+        XtHkQtsbInfoRepo.save(hkQtsbInfo);
+        return new Result(10000,"修改成功",true);
+    }
+
+    @Override
+    @DS("slave")
+    public Result getZMInfo() {
+        List<XtHkQtsbInfo> zmInfo = XtHkQtsbInfoRepo.getZMInfo();
+        return new Result(ResultCode.SUCCESS,zmInfo);
+    }
 }

shiwan/env/src/main/resources/application-test.yml

@@ -26,6 +26,7 @@ spring:
           max-idle: 5
           min-idle: 3
           initial-size: 3
+
 #        third:
 #          url: jdbc:mysql://121.36.134.218:3306/device_db?useUnicode=true&characterEncoding=UTF-8&useSSL=false&autoReconnect=true&serverTimezone=Asia/Shanghai
 #          username: root

shiwan/env/src/test/java/com/huimv/env/controller/UserTest.java

@@ -1,5 +1,7 @@
 package com.huimv.env.controller;
 
+import cn.hutool.core.date.DateUnit;
+import cn.hutool.core.date.DateUtil;
 import com.huimv.env.service.IEnvService;
 import org.junit.Before;
 import org.junit.Test;
@@ -16,6 +18,9 @@ import org.springframework.test.web.servlet.result.MockMvcResultMatchers;
 import org.springframework.test.web.servlet.setup.MockMvcBuilders;
 import org.springframework.web.context.WebApplicationContext;
 
+import java.util.Calendar;
+import java.util.Date;
+
 import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get;
 import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.content;
 import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
@@ -29,9 +34,7 @@ import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.
  * @Create : 2020-12-25
  **/
 
-@RunWith(SpringRunner.class)
 //@SpringBootTest(classes = GeneratorApp.class, webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT)
-@SpringBootTest
 public class UserTest {
     @Test
     public void contextLoads() {
@@ -77,4 +80,18 @@ public class UserTest {
         envService.getEnv2();
     }
 
+    public static void main(String[] args) {
+//        System.out.println(new Date());
+//        System.out.println(DateUtil.format(new Date(), "HH:mm"));
+//        Calendar calendar = Calendar.getInstance();
+//        Date time = calendar.getTime();
+//        calendar.add(Calendar.DAY_OF_MONTH,1);
+//        calendar.add(Calendar.MINUTE, -5);
+//        Date time1 = calendar.getTime();
+//
+//        long between = DateUtil.between(time, time1, DateUnit.MINUTE);
+//        System.out.println(between);
+//        String str = "00:00";
+        System.out.println((DateUtil.date()+"").substring(0,11)+"00:00"+(DateUtil.date()+"").substring(16));
+    }
 }