czt
2025-06-09 13b6ad41f0b057f8405f7976a990e9057547443a
提交首页实现
已重命名1个文件
已添加4个文件
已修改10个文件
547 ■■■■■ 文件已修改
igds-dzhwk-core/src/main/java/com/fzzy/igds/dzhwk/data/HwkDepotDto.java 67 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
igds-dzhwk-core/src/main/java/com/fzzy/igds/dzhwk/domain/AiAnalysis.java 76 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
igds-dzhwk-core/src/main/java/com/fzzy/igds/dzhwk/domain/Depot.java 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
igds-dzhwk-core/src/main/java/com/fzzy/igds/dzhwk/domain/DoorRecord.java 107 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
igds-dzhwk-core/src/main/java/com/fzzy/igds/dzhwk/domain/HScreenSer.java 27 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
igds-dzhwk-core/src/main/java/com/fzzy/igds/dzhwk/domain/PatrolTask.java 75 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
igds-dzhwk-core/src/main/java/com/fzzy/igds/dzhwk/service/ScreenSerService.java 24 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
igds-dzhwk-core/src/main/java/com/fzzy/igds/dzhwk/service/repository/ScreenSerRepository.java 17 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
igds-dzhwk-core/src/main/java/com/fzzy/igds/sys/DepotService.java 24 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
igds-dzhwk-view/src/main/java/com/fzzy/igds/dzhwk/ScreenSer.view.xml 6 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
igds-dzhwk-view/src/main/java/com/fzzy/igds/dzhwk/pr/ScreenSerPR.java 12 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
igds-dzhwk-web/src/main/java/com/fzzy/igds/dzhwk/controller/WebController.java 24 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
igds-dzhwk-web/src/main/java/com/fzzy/igds/dzhwk/manager/WebManager.java 36 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
igds-dzhwk-web/src/main/resources/static/dzhwk/common.js 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
igds-dzhwk-web/src/main/resources/templates/dzhwk/index.html 46 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
igds-dzhwk-core/src/main/java/com/fzzy/igds/dzhwk/data/HwkDepotDto.java
¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,67 @@
package com.fzzy.igds.dzhwk.data;
import com.bstek.dorado.annotation.PropertyDef;
import com.fasterxml.jackson.annotation.JsonFormat;
import lombok.Data;
import java.io.Serializable;
import java.util.Date;
/**
 * @Description è´§ä½å¡ä¿¡æ¯-封装
 * @Author CZT
 * @Date 2025/06/06 15:39
 */
@Data
public class HwkDepotDto implements Serializable {
    @PropertyDef(label = "廒间名")
    private String granary;
    @PropertyDef(label = "货位名")
    private String depot;
    @PropertyDef(label = "仓温")
    private Double inTemp;
    @PropertyDef(label = "仓湿")
    private Double inHumidity;
    @PropertyDef(label = "氧气")
    private String perO2;
    @PropertyDef(label = "磷化氢")
    private String perPh3;
    @PropertyDef(label = "仓库类型")
    private String depotType;
    @PropertyDef(label = "仓库状态")
    private String depotStatus;
    @PropertyDef(label = "粮食品种")
    private String foodVariety;
    @PropertyDef(label = "粮食等级")
    private String foodLevel;
    @PropertyDef(label = "粮食性质")
    private String foodType;
    @PropertyDef(label = "入库时间")
    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd", timezone = "GMT+8")
    private Date storeDate;
    @PropertyDef(label = "粮食年份")
    private String foodYear;
    @PropertyDef(label = "保管员", description = "中文名称")
    private String storeKeeperName;
    @PropertyDef(label = "保管员电话")
    private String storeKeeperPhone = "---";
    @PropertyDef(label = "保管员头像路径")
    private String userImgPath;
}
igds-dzhwk-core/src/main/java/com/fzzy/igds/dzhwk/domain/AiAnalysis.java
¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,76 @@
package com.fzzy.igds.dzhwk.domain;
import com.bstek.dorado.annotation.PropertyDef;
import lombok.Data;
import org.apache.commons.lang3.time.DateFormatUtils;
import javax.persistence.*;
import java.io.Serializable;
import java.util.Date;
/**
 * @Description AI决策分析
 * @Author CZT
 * @Date 2025/6/06 10:59
 */
@Data
@Entity
@Table(name = "H_AI_ANALYSIS")
public class AiAnalysis implements Serializable {
    /**
     *
     */
    private static final long serialVersionUID = 1L;
    public static String SORT_PROP = "id";
    @Id
    @Column(name = "ID_")
    private String id;
    @Column(name = "COMPANY_ID_", length = 10)
    @PropertyDef(label = "组织编码")
    private String companyId;
    @Column(name = "DEPT_ID_", length = 30)
    @PropertyDef(label = "所属分库")
    private String deptId;
    @Column(name = "DEPOT_ID_", length = 50)
    @PropertyDef(label = "所属仓库")
    private String depotId;
    @Column(name = "TYPE_", length = 50)
    @PropertyDef(label = "分析类型", description = "01-粮情分析,02-作业分析,03-其他")
    private String type;
    @Column(name = "MODE_", length = 50)
    @PropertyDef(label = "分析方式", description = "01-粮情大数据对比,02-作业数据对比,03-其他")
    private String mode;
    @Column(name = "TIME_")
    @PropertyDef(label = "分析时间")
    private Date time;
    @Column(name = "RESULT_", length = 50)
    @PropertyDef(label = "分析结果")
    private String result;
    @Column(name = "INFO_", length = 254)
    @PropertyDef(label = "分析详情")
    private String info;
    @Column(name = "UPDATE_TIME_")
    @PropertyDef(label = "更新时间")
    private Date updateTime;
    @Transient
    private String timeStr;
    public String getTimeStr() {
        if(null == this.time){
            return "";
        }
        return DateFormatUtils.format(this.time, "yy-MM-dd HH:mm");
    }
}
igds-dzhwk-core/src/main/java/com/fzzy/igds/dzhwk/domain/Depot.java
@@ -182,6 +182,10 @@
    @PropertyDef(label = "保管员等级")
    private String storeKeeperPhone = "####";
    @Transient
    @PropertyDef(label = "保管员头像路径")
    private String userImgPath;
    public String getFoodLevelName() {
        if (null != this.foodLevel) {
            return FoodLevel.getMsg(this.foodLevel);
igds-dzhwk-core/src/main/java/com/fzzy/igds/dzhwk/domain/DoorRecord.java
¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,107 @@
package com.fzzy.igds.dzhwk.domain;
import com.bstek.dorado.annotation.PropertyDef;
import com.ruoyi.common.utils.StringUtils;
import lombok.Data;
import org.apache.commons.lang3.time.DateFormatUtils;
import javax.persistence.*;
import java.io.Serializable;
import java.util.Date;
/**
 * @Description é—¨ç¦è®°å½•
 * @Author CZT
 * @Date 2025/6/06 09:23
 */
@Data
@Entity
@Table(name = "H_DOOR_RECORD")
public class DoorRecord implements Serializable {
    /**
     *
     */
    private static final long serialVersionUID = 1L;
    public static String SORT_PROP = "id";
    @Id
    @Column(name = "ID_")
    private String id;
    @Column(name = "COMPANY_ID_", length = 10)
    @PropertyDef(label = "组织编码")
    private String companyId;
    @Column(name = "DEPT_ID_", length = 30)
    @PropertyDef(label = "所属分库")
    private String deptId;
    @Column(name = "DEPOT_ID_", length = 50)
    @PropertyDef(label = "所属仓库", description = "仓库编号")
    private String depotId;
    @Column(name = "DOOR_ID_", length = 50)
    @PropertyDef(label = "门禁设备ID")
    private String doorId;
    @Column(name = "USER_NAME_", length = 30)
    @PropertyDef(label = "开门人")
    private String userName;
    @Column(name = "DOOR_TYPE_", length = 10)
    @PropertyDef(label = "开门方式", description = "01-刷卡,02-指纹识别,03-人脸识别,04-密码输入,05-远程授权,09-其他")
    private String doorType;
    @Column(name = "TIME_")
    @PropertyDef(label = "开门时间")
    private Date time;
    @Column(name = "INFO_", length = 100)
    @PropertyDef(label = "开门说明")
    private String info;
    @Column(name = "IS_NORMAL", length = 10)
    @PropertyDef(label = "是否正常开门", description = "01-正常,02-警告")
    private String isNormal;
    @Column(name = "UPDATE_TIME_")
    @PropertyDef(label = "更新时间")
    private Date updateTime;
    @Transient
    private String doorTypeName;
    @Transient
    private String timeStr;
    public String getTimeStr() {
        if(null == this.time){
            return "";
        }
        return DateFormatUtils.format(this.time, "MM/dd HH:mm");
    }
    public String getDoorTypeName() {
        if(StringUtils.isEmpty(doorType)){
            return "其他";
        }
        if("01".equals(doorType)){
            return "刷卡";
        }
        if("02".equals(doorType)){
            return "指纹识别";
        }
        if("03".equals(doorType)){
            return "人脸识别";
        }
        if("04".equals(doorType)){
            return "密码输入";
        }
        if("05".equals(doorType)){
            return "远程授权";
        }
        return "其他";
    }
}
igds-dzhwk-core/src/main/java/com/fzzy/igds/dzhwk/domain/HScreenSer.java
ÎļþÃû´Ó igds-dzhwk-core/src/main/java/com/fzzy/igds/dzhwk/domain/ScreenSer.java ÐÞ¸Ä
@@ -1,6 +1,7 @@
package com.fzzy.igds.dzhwk.domain;
import com.bstek.dorado.annotation.PropertyDef;
import com.fzzy.igds.dzhwk.constant.Constant;
import lombok.Data;
import javax.persistence.Column;
import javax.persistence.Entity;
@@ -17,14 +18,14 @@
@Data
@Entity
@Table(name = "H_SCREEN_SER")
public class ScreenSer implements Serializable {
public class HScreenSer implements Serializable {
    public static String SORT_PROP = "id";
    public static String SORT_PROP = "sn";
    @Id
    @PropertyDef(label = "主键ID")
    @Column(name = "ID_", length = 40)
    private String id;
    @PropertyDef(label = "货位卡SN")
    @Column(name = "SN_", length = 100)
    private String sn;
    @Column(name = "COMPANY_ID_", length = 10)
    @PropertyDef(label = "组织编码")
@@ -34,10 +35,6 @@
    @PropertyDef(label = "所属分库")
    private String deptId;
    @PropertyDef(label = "货位卡SN")
    @Column(name = "SN_", length = 100)
    private String sn;
    @PropertyDef(label = "设备名称")
    @Column(name = "NAME_", length = 100)
    private String name;
@@ -46,6 +43,18 @@
    @Column(name = "ajdh", length = 25)
    private String ajdh;
    @PropertyDef(label = "是否开启", description = "门开灯亮")
    @Column(name = "IS_OPEN1_", length = 25)
    private String isOpen1 = Constant.YN_Y;
    @PropertyDef(label = "是否开启", description = "门关等灭")
    @Column(name = "IS_OPEN2_", length = 25)
    private String isOPen2 = Constant.YN_Y;
    @PropertyDef(label = "是否开启", description = "安全进仓提醒")
    @Column(name = "IS_OPEN3", length = 25)
    private String isOpen3 = Constant.YN_Y;
    @Column(name = "REMARK_", length = 200)
    @PropertyDef(label = "备注", description = "备注信息")
    private String remark;
igds-dzhwk-core/src/main/java/com/fzzy/igds/dzhwk/domain/PatrolTask.java
¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,75 @@
package com.fzzy.igds.dzhwk.domain;
import com.bstek.dorado.annotation.PropertyDef;
import lombok.Data;
import org.apache.commons.lang3.time.DateFormatUtils;
import javax.persistence.*;
import java.util.Date;
/**
 * @Description å·¡æ£€ä»»åŠ¡
 */
@Data
@Entity
@Table(name = "H_PATROL_TASK")
public class PatrolTask {
    public static String SORT_PROP = "id";
    @Id
    @Column(name = "ID_", length = 40)
    @PropertyDef(label = "主键ID")
    private String id;
    @Column(name = "COMPANY_ID_", length = 20)
    @PropertyDef(label = "组织编码", description = "")
    private String companyId;
    @Column(name = "DEPT_ID_", length = 50)
    @PropertyDef(label = "所属库区")
    private String deptId;
    @Column(name = "TYPE_", length = 50)
    @PropertyDef(label = "巡检类型")
    private String type;
    @Column(name = "CHECK_USER_", length = 50)
    @PropertyDef(label = "巡检人")
    private String checkUser;
    @Column(name = "CHECK_TIME_")
    @PropertyDef(label = "巡检时间")
    private Date checkTime;
    @Column(name = "LOCATION_", length = 50)
    @PropertyDef(label = "巡检位置")
    private String location;
    @Column(name = "FILE_ID_", length = 30)
    @PropertyDef(label = "巡检人照片id")
    private String fileId;
    @Column(name = "FILE_NAME_", length = 50)
    @PropertyDef(label = "巡检人照片")
    private String fileName;
    @Column(name = "INFO_", length = 200)
    @PropertyDef(label = "巡检说明")
    private String info;
    @Column(name = "REMARK_", length = 250)
    @PropertyDef(label = "备注", description = "备注信息")
    private String remark;
    @Transient
    @PropertyDef(label = "巡检时间", description = "更新时间:yyyy-MM-dd HH:mm")
    private String checkTimeStr;
    public String getCheckTimeStr() {
        if(null == this.checkTime){
            return "";
        }
        return DateFormatUtils.format(this.checkTime, "yy/MM/dd HH:mm");
    }
}
igds-dzhwk-core/src/main/java/com/fzzy/igds/dzhwk/service/ScreenSerService.java
@@ -1,9 +1,7 @@
package com.fzzy.igds.dzhwk.service;
import com.fzzy.igds.dzhwk.domain.Granary;
import com.fzzy.igds.dzhwk.domain.ScreenSer;
import com.fzzy.igds.dzhwk.domain.HScreenSer;
import com.fzzy.igds.dzhwk.service.repository.ScreenSerRepository;
import com.fzzy.igds.sys.repository.GranaryRepository;
import com.fzzy.igds.util.ContextUtil;
import com.ruoyi.common.utils.StringUtils;
import lombok.extern.slf4j.Slf4j;
@@ -25,7 +23,7 @@
    @Resource
    private ScreenSerRepository screenSerRepository;
    public List<ScreenSer> listData(String companyId, String deptId) {
    public List<HScreenSer> listData(String companyId, String deptId) {
        if (StringUtils.isEmpty(companyId)) {
            companyId = ContextUtil.getCompanyId();
@@ -36,21 +34,33 @@
        return screenSerRepository.listData(companyId, deptId);
    }
    public void saveOrUpdate(ScreenSer data) {
    /**
     *
     * @param sn
     * @return
     */
    public HScreenSer getDataBySn(String sn) {
        if(StringUtils.isEmpty(sn)){
            return null;
        }
        return screenSerRepository.getDataBySn(sn);
    }
    public void saveOrUpdate(HScreenSer data) {
        if (StringUtils.isEmpty(data.getCompanyId())) {
            data.setCompanyId(ContextUtil.getCompanyId());
        }
        if (StringUtils.isEmpty(data.getDeptId())) {
            data.setDeptId(ContextUtil.subDeptId(null));
        }
        if (StringUtils.isEmpty(data.getId())) {
        if (StringUtils.isEmpty(data.getSn())) {
            data.setDeptId(ContextUtil.getUUID());
        }
        data.setUpdateTime(new Date());
        screenSerRepository.save(data);
    }
    public String delData(ScreenSer data) {
    public String delData(HScreenSer data) {
        screenSerRepository.delete(data);
        return null;
    }
igds-dzhwk-core/src/main/java/com/fzzy/igds/dzhwk/service/repository/ScreenSerRepository.java
@@ -1,6 +1,6 @@
package com.fzzy.igds.dzhwk.service.repository;
import com.fzzy.igds.dzhwk.domain.ScreenSer;
import com.fzzy.igds.dzhwk.domain.HScreenSer;
import org.springframework.data.jpa.repository.JpaRepository;
import org.springframework.data.jpa.repository.Query;
import org.springframework.data.repository.query.Param;
@@ -13,7 +13,7 @@
 * @Date 2025/06/03 17:45
 */
@Service
public interface ScreenSerRepository extends JpaRepository<ScreenSer, String> {
public interface ScreenSerRepository extends JpaRepository<HScreenSer, String> {
    /**
     * æ ¹æ®ç»„织编码和库区编码获取廒间信息
@@ -22,7 +22,16 @@
     * @param deptId
     * @return
     */
    @Query("from ScreenSer where companyId =:companyId and deptId =:deptId order by ajdh")
    List<ScreenSer> listData(@Param("companyId") String companyId, @Param("deptId") String deptId);
    @Query("from HScreenSer where companyId =:companyId and deptId =:deptId order by ajdh")
    List<HScreenSer> listData(@Param("companyId") String companyId, @Param("deptId") String deptId);
    /**
     * æ ¹æ®ç»„织编码和库区编码获取廒间信息
     *
     * @param sn
     * @return
     */
    @Query("from HScreenSer where sn =:sn")
    HScreenSer getDataBySn(@Param("sn") String sn);
}
igds-dzhwk-core/src/main/java/com/fzzy/igds/sys/DepotService.java
@@ -261,6 +261,30 @@
    }
    /**
     * æ ¹æ®å½“前廒间编码获取下属所有仓库信息
     * @param companyId
     * @param ajdh
     * @return
     */
    public List<Depot> getCacheByAjdn(String companyId, String ajdh) {
        //若仓库未配置仓房编码,则直接返回对应仓库
        List<Depot> list = getCacheDepotList(companyId);
        if(null == list || list.isEmpty()){
            return null;
        }
        List<Depot> result = new ArrayList<>();
        for (Depot depot : list) {
            if (StringUtils.isNotEmpty(depot.getGranaryId()) && ajdh.equals(depot.getGranaryId())) {
                result.add(depot);
            }
        }
        //重新排序
        Collections.sort(result, (p1, p2) -> p1.getOrderNum() - p2.getOrderNum());
        return result;
    }
    /**
     * æ ¹æ®åº“存信息更新仓库信息
     * @param data
     */
igds-dzhwk-view/src/main/java/com/fzzy/igds/dzhwk/ScreenSer.view.xml
@@ -4,11 +4,7 @@
  <Context/>
  <Model>
    <DataType name="dtMain">
      <Property name="creationType">com.fzzy.igds.dzhwk.domain.ScreenSer</Property>
      <PropertyDef name="id">
        <Property></Property>
        <Property name="label">主键ID</Property>
      </PropertyDef>
      <Property name="creationType">com.fzzy.igds.dzhwk.domain.HScreenSer</Property>
      <PropertyDef name="companyId">
        <Property></Property>
        <Property name="label">组织编码</Property>
igds-dzhwk-view/src/main/java/com/fzzy/igds/dzhwk/pr/ScreenSerPR.java
@@ -3,7 +3,7 @@
import com.bstek.dorado.annotation.DataProvider;
import com.bstek.dorado.annotation.DataResolver;
import com.bstek.dorado.annotation.Expose;
import com.fzzy.igds.dzhwk.domain.ScreenSer;
import com.fzzy.igds.dzhwk.domain.HScreenSer;
import com.fzzy.igds.dzhwk.service.ScreenSerService;
import org.springframework.beans.BeanUtils;
import org.springframework.stereotype.Component;
@@ -26,7 +26,7 @@
     * @return
     */
    @DataProvider
    public List<ScreenSer> listData() {
    public List<HScreenSer> listData() {
        return screenSerService.listData(null, null);
    }
@@ -36,8 +36,8 @@
     * @param data
     */
    @DataResolver
    public void saveData(ScreenSer data) {
        ScreenSer item = new ScreenSer();
    public void saveData(HScreenSer data) {
        HScreenSer item = new HScreenSer();
        BeanUtils.copyProperties(data, item);
        screenSerService.saveOrUpdate(item);
    }
@@ -48,8 +48,8 @@
     * @param data
     */
    @Expose
    public String delData(ScreenSer data){
        ScreenSer item = new ScreenSer();
    public String delData(HScreenSer data){
        HScreenSer item = new HScreenSer();
        BeanUtils.copyProperties(data, item);
        return screenSerService.delData(item);
    }
igds-dzhwk-web/src/main/java/com/fzzy/igds/dzhwk/controller/WebController.java
@@ -1,6 +1,6 @@
package com.fzzy.igds.dzhwk.controller;
import com.fzzy.igds.dzhwk.data.DzhwkConfigData;
import com.fzzy.igds.dzhwk.domain.Depot;
import com.fzzy.igds.dzhwk.domain.Dept;
import com.fzzy.igds.dzhwk.manager.WebManager;
import com.ruoyi.common.utils.StringUtils;
@@ -10,6 +10,7 @@
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam;
import javax.annotation.Resource;
import java.util.List;
/**
 * @Description
@@ -22,21 +23,30 @@
    private static final String prefix = "dzhwk/";
    @Resource
    private DzhwkConfigData dzhwkConfigData;
    @Resource
    private WebManager webManager;
    /**
     * é¦–页
     * @param gid å»’é—´id
     * @param sid è´§ä½å¡è®¾å¤‡SN
     * @param view
     * @return
     */
    @RequestMapping("/index")
    public String index(@RequestParam(value = "gid", required = false) String gid, ModelMap view) {
    public String index(@RequestParam(value = "sid", required = false) String sid, ModelMap view) {
        String videoUrl = dzhwkConfigData.getDzhwkVideo().replace(dzhwkConfigData.getProfile(),"/profile/");
        view.put("videoUrl", videoUrl);
        //获取库区信息,查看视频路径和鸟瞰图路径
        Dept dept = webManager.getDeptFile("1000001001");
        view.put("videoUrl", dept.getVideoFilePath());
        view.put("imgUrl", dept.getImgFilePath());
        //根据货位卡SN,获取对应廒间下的货位列表信息
        if(StringUtils.isEmpty(sid)){
            sid = "FZZY0001";
        }
        List<Depot> list = webManager.getDepotsByGid(sid);
        view.put("depotList", list);
        view.put("flag", "index");
        return prefix + "index";
    }
igds-dzhwk-web/src/main/java/com/fzzy/igds/dzhwk/manager/WebManager.java
@@ -1,9 +1,14 @@
package com.fzzy.igds.dzhwk.manager;
import com.fzzy.igds.dzhwk.data.DzhwkConfigData;
import com.fzzy.igds.dzhwk.data.HwkDepotDto;
import com.fzzy.igds.dzhwk.domain.Depot;
import com.fzzy.igds.dzhwk.domain.Dept;
import com.fzzy.igds.dzhwk.domain.HScreenSer;
import com.fzzy.igds.dzhwk.service.ScreenSerService;
import com.fzzy.igds.file.FileService;
import com.fzzy.igds.sys.CoreDeptService;
import com.fzzy.igds.sys.DepotService;
import com.ruoyi.common.config.FrameworkConfig;
import com.ruoyi.common.utils.StringUtils;
import lombok.extern.slf4j.Slf4j;
@@ -11,6 +16,7 @@
import javax.annotation.Resource;
import java.io.File;
import java.util.List;
/**
 * @Description
@@ -27,6 +33,12 @@
    private FileService fileService;
    @Resource
    private DzhwkConfigData dzhwkConfigData;
    @Resource
    private ScreenSerService screenSerService;
    @Resource
    private DepotService depotService;
    /**
     * æ ¹æ®å•位ID获取单位信息
     *
@@ -59,4 +71,28 @@
        }
        return dept;
    }
    /**
     *
     * @param sid
     * @return
     */
    public List<Depot> getDepotsByGid(String sid) {
        if(StringUtils.isEmpty(sid)){
            return null;
        }
        //获取sid对应的廒间信息;
        HScreenSer screenSer = screenSerService.getDataBySn(sid);
        if(null == screenSer || StringUtils.isEmpty(screenSer.getAjdh())){
            return null;
        }
        List<Depot> list = depotService.getCacheByAjdn(screenSer.getCompanyId(), screenSer.getAjdh());
        if(null == list || list.isEmpty()){
            return null;
        }
        return list;
    }
}
igds-dzhwk-web/src/main/resources/static/dzhwk/common.js
@@ -8,7 +8,7 @@
        console.log('用户没有操作');
        // å¦‚果没有操作超过1分钟,跳转到锁屏页面
        window.location.href = "../dzhwk/lock?flag=" + flag;
    }, 1000*60); // 1分钟
    }, 1000*60*60); // 1分钟
}
/**
igds-dzhwk-web/src/main/resources/templates/dzhwk/index.html
@@ -110,7 +110,7 @@
                                    <div class="videobox">
<!--                                        <video src="http://player.alicdn.com/video/aliyunmedia.mp4" class="img"-->
                                        <video th:src="${videoUrl}" style="width: 100%;height: 100%;"
                                               poster="/img/dzhwk/imgl4.jpg" muted preload controls
                                               th:poster="${imgUrl}" muted preload controls
                                               webkit-playsinline="true" playsinline="true">您的浏览器不支持video标签
                                        </video>
                                    </div>
@@ -176,7 +176,7 @@
                <div class="col-r g-boxl1">
                    <div class="m-swiperl1">
                        <div class="swiper">
                            <div class="swiper-wrapper">
                            <div class="swiper-wrapper" id="depotList">
                                <div class="swiper-slide">
                                    <div class="top">
                                        <div class="tit">货位名称 <em>P01-01</em></div>
@@ -1122,6 +1122,44 @@
<script th:src="@{/dzhwk/common.js}"></script>
<script th:inline="javascript">
    var flag = [[${flag}]];
    var depotList = [[${depotList}]];
    var html = "";
    if(depotList){
        $.each(depotList, function (index, item) {
            html += '<div class="swiper-slide"><div class="top"><div class="tit">货位名称 <em>'+item.name+'</em></div><div class="store">仓廒--</div></div><ul class="ul-listl3">';
            html += '<li><div class="con" style="background-color: rgba(3,77,146,.3);"><div class="icon"><img src="/img/dzhwk/iconl18.png" alt=""></div><div class="txt"><div class="num"><em>--</em>°C</div><div class="tt">仓温</div></div></div></li>';
            html += '<li><div class="con" style="background-color: rgba(91,104,225,.25);"><div class="icon"><img src="/img/dzhwk/iconl19.png" alt=""></div><div class="txt"><div class="num"><em>--</em>%</div><div class="tt">仓湿</div></div></div></li>';
            html += '<li><div class="con" style="background-color: rgba(31,133,78,.15);"><div class="icon"><img src="/img/dzhwk/iconl20.png" alt=""></div><div class="txt"><div class="num"><em>--</em>%</div><div class="tt">氧气</div></div></div></li>';
            html += '<li><div class="con" style="background-color: rgba(2,175,255,.15);"><div class="icon"><img src="/img/dzhwk/iconl21.png" alt=""></div><div class="txt"><div class="num"><em>--</em>ppm</div><div class="tt">磷化氢</div></div></div></li></ul>';
            html += '<div class="m-infol"><div class="item"><div class="box" style="background-color: rgba(79,158,254,.23);"><ul class="ul-listl4">';
            html += '<li><div class="con"><div class="ll">货位名称</div><div class="rr">'+item.name+'</div></div></li><li><div class="con"><div class="ll">仓房类型</div><div class="rr">--</div></div></li>';
            html += '<li><div class="con"><div class="ll">货位状态</div><div class="rr"><div class="btn g-statel"><div class="icon"><img src="/img/dzhwk/iconl22.png" alt=""></div>'+item.depotStatusName+'</div></div></div> </li>';
            html += '<li><div class="con"><div class="ll">粮食储量</div><div class="rr">'+item.storageReal+'吨</div></div></li><li><div class="con"><div class="ll">粮食品种</div><div class="rr">'+item.foodVarietyName+'</div></div></li>';
            html += '<li><div class="con"><div class="ll">粮食等级</div><div class="rr">'+item.foodLevelName+'</div></div></li><li><div class="con"><div class="ll">仓储性质</div><div class="rr">'+item.foodTypeName+'</div> </div></li>';
            html += '<li><div class="con"><div class="ll">入仓时间</div><div class="rr">'+item.storeDate+'</div></div></li><li><div class="con"><div class="ll">粮食年份</div><div class="rr">'+item.foodYear+'</div></div></li></ul>';
            html += '</div></div><div class="item"><div class="box" style="background-color: rgba(3,129,255,.23);"><div class="bgpic" style="background-image: url(/img/dzhwk/imgl5.jpg);"></div><div class="pic"><img src="/img/dzhwk/imgl6.jpg" alt=""></div>';
            html += '<ul class="ul-intel"><li><div class="con"><div class="ll"><div class="ico"><img src="/img/dzhwk/iconl23.png" alt=""></div>保管员</div><div class="rr">'+item.storeKeeperName+'</div></div></li>';
            html += '<li><div class="con"><div class="ll"><div class="ico"><img src="/img/dzhwk/iconl24.png" alt=""></div>电话</div><div class="rr">--</div></div></li></ul></div></div></div></div>';
        })
    }else{
        html += '<div class="swiper-slide"><div class="top"><div class="tit">货位名称 <em>--</em></div><div class="store">仓廒--</div></div><ul class="ul-listl3">';
        html += '<li><div class="con" style="background-color: rgba(3,77,146,.3);"><div class="icon"><img src="/img/dzhwk/iconl18.png" alt=""></div><div class="txt"><div class="num"><em>--</em>°C</div><div class="tt">仓温</div></div></div></li>';
        html += '<li><div class="con" style="background-color: rgba(91,104,225,.25);"><div class="icon"><img src="/img/dzhwk/iconl19.png" alt=""></div><div class="txt"><div class="num"><em>--</em>%</div><div class="tt">仓湿</div></div></div></li>';
        html += '<li><div class="con" style="background-color: rgba(31,133,78,.15);"><div class="icon"><img src="/img/dzhwk/iconl20.png" alt=""></div><div class="txt"><div class="num"><em>--</em>%</div><div class="tt">氧气</div></div></div></li>';
        html += '<li><div class="con" style="background-color: rgba(2,175,255,.15);"><div class="icon"><img src="/img/dzhwk/iconl21.png" alt=""></div><div class="txt"><div class="num"><em>--</em>ppm</div><div class="tt">磷化氢</div></div></div></li></ul>';
        html += '<div class="m-infol"><div class="item"><div class="box" style="background-color: rgba(79,158,254,.23);"><ul class="ul-listl4">';
        html += '<li><div class="con"><div class="ll">货位名称</div><div class="rr">--</div></div></li><li><div class="con"><div class="ll">仓房类型</div><div class="rr">--</div></div></li>';
        html += '<li><div class="con"><div class="ll">货位状态</div><div class="rr"><div class="btn g-statel"><div class="icon"><img src="/img/dzhwk/iconl22.png" alt=""></div>--</div></div></div> </li>';
        html += '<li><div class="con"><div class="ll">粮食储量</div><div class="rr">--吨</div></div></li><li><div class="con"><div class="ll">粮食品种</div><div class="rr">--</div></div></li>';
        html += '<li><div class="con"><div class="ll">粮食等级</div><div class="rr">--</div></div></li><li><div class="con"><div class="ll">仓储性质</div><div class="rr">--</div> </div></li>';
        html += '<li><div class="con"><div class="ll">入仓时间</div><div class="rr">--</div></div></li><li><div class="con"><div class="ll">粮食年份</div><div class="rr">--</div></div></li></ul>';
        html += '</div></div><div class="item"><div class="box" style="background-color: rgba(3,129,255,.23);"><div class="bgpic" style="background-image: url(/img/dzhwk/imgl5.jpg);"></div><div class="pic"><img src="/img/dzhwk/imgl6.jpg" alt=""></div>';
        html += '<ul class="ul-intel"><li><div class="con"><div class="ll"><div class="ico"><img src="/img/dzhwk/iconl23.png" alt=""></div>保管员</div><div class="rr">--</div></div></li>';
        html += '<li><div class="con"><div class="ll"><div class="ico"><img src="/img/dzhwk/iconl24.png" alt=""></div>电话</div><div class="rr">--</div></div></li></ul></div></div></div></div>';
    }
    $("#depotList").html(html);
    var swiper = new Swiper('.m-swiperl1 .swiper', {
        slidesPerView: 1,
        // autoplay: {
@@ -1129,6 +1167,10 @@
        //     disableOnInteraction: false,
        // },
        loop: true,
        autoplay:{
            delay: 3000,
            disableOnInteraction: false
        },
        pagination: {
            el: '.m-swiperl1 .swiper-pagination',
            type: 'fraction',