czt
2025-06-04 688fd8243286b342bfdeb3ee0b4ee45be4c005cc
增加货位卡设备配置
已添加7个文件
已修改2个文件
782 ■■■■ 文件已修改
igds-dzhwk-core/src/main/java/com/fzzy/igds/dzhwk/domain/Gas.java 144 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
igds-dzhwk-core/src/main/java/com/fzzy/igds/dzhwk/domain/GasKey.java 20 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
igds-dzhwk-core/src/main/java/com/fzzy/igds/dzhwk/domain/ScreenSer.java 57 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
igds-dzhwk-core/src/main/java/com/fzzy/igds/dzhwk/service/ScreenSerService.java 58 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
igds-dzhwk-core/src/main/java/com/fzzy/igds/dzhwk/service/repository/ScreenSerRepository.java 28 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
igds-dzhwk-view/src/main/java/com/fzzy/igds/dzhwk/ScreenSer.view.xml 220 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
igds-dzhwk-view/src/main/java/com/fzzy/igds/dzhwk/pr/ScreenSerPR.java 57 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
igds-dzhwk-view/src/main/java/com/fzzy/igds/sys/DepotConf.view.xml 168 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
igds-dzhwk-web/src/main/java/com/fzzy/igds/dzhwk/controller/WebController.java 30 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
igds-dzhwk-core/src/main/java/com/fzzy/igds/dzhwk/domain/Gas.java
¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,144 @@
package com.fzzy.igds.dzhwk.domain;
import com.bstek.dorado.annotation.PropertyDef;
import lombok.Data;
import javax.persistence.*;
import java.io.Serializable;
import java.util.Date;
/**
 * æ°”体业务数据信息包括浓度,氮气,压力信息 æ°”体模块:包括气体浓度
 *
 * @author Andy
 *
 */
@Data
@Entity
@Table(name = "D_GAS")
@IdClass(GasKey.class)
public class Gas implements Serializable {
    public static String SORT_PROP = "batchId";
    @Id
    @Column(name = "BATCH_ID_", length = 40)
    @PropertyDef(label = "批次ID")
    private String batchId;
    @Id
    @Column(name = "COMPANY_ID_", length = 10)
    @PropertyDef(label = "组织编码", description = "")
    private String companyId;
    @Id
    @Column(name = "DEPOT_ID_", length = 50)
    @PropertyDef(label = "仓库ID", description = "仓库编号")
    private String depotId;
    @Column(name = "TYPE_", length = 1)
    @PropertyDef(label = "类型", description = "0-常规检测,1-熏蒸检测")
    private String type;
    @Column(name = "PER_CO2_")
    @PropertyDef(label = "二氧化碳浓度", description = "平均二氧化碳浓度(PPM)")
    private Double perCo2 = 0.0;
    @Column(name = "PER_O2_")
    @PropertyDef(label = "氧气浓度", description = "平均氧气浓度(%)")
    private Double perO2 = 0.0;
    @Column(name = "PER_PH3_")
    @PropertyDef(label = "磷化氢浓度", description = "平均磷化氢浓度(PPM)")
    private Double perPh3 = 0.0;
    @Column(name = "PER_N2_")
    @PropertyDef(label = "氮气浓度", description = "氮气浓度(%)")
    private Double perN2 = 0.0;
    @Column(name = "PER_CO2_MAX_")
    @PropertyDef(label = "二氧化碳浓度-最大", description = "二氧化碳浓度(PPM)")
    private Double perCo2Max = 0.0;
    @Column(name = "PER_O2_MAX_")
    @PropertyDef(label = "氧气浓度-最大", description = "氧气浓度(%)")
    private Double perO2Max = 0.0;
    @Column(name = "PER_PH3_MAX_")
    @PropertyDef(label = "磷化氢浓度-最大", description = "磷化氢浓度(PPM)")
    private Double perPh3Max = 0.0;
    @Column(name = "PER_N2_MAX_")
    @PropertyDef(label = "氮气浓度-最大")
    private Double perN2Max = 0.0;
    @Column(name = "PER_CO2_MIN_")
    @PropertyDef(label = "二氧化碳浓度-最小", description = "二氧化碳浓度(PPM)")
    private Double perCo2Min = 0.0;
    @Column(name = "PER_O2_MIN_")
    @PropertyDef(label = "氧气浓度-最小", description = "氧气浓度(%)")
    private Double perO2Min = 0.0;
    @Column(name = "PER_PH3_MIN_")
    @PropertyDef(label = "磷化氢浓度-最小", description = "磷化氢浓度(PPM)")
    private Double perPh3Min = 0.0;
    @Column(name = "PER_N2_MIN_")
    @PropertyDef(label = "氮气浓度-最小")
    private Double perN2Min = 0.0;
    @Column(name = "RECEIVE_DATE_")
    @PropertyDef(label = "检测时间")
    private Date receiveDate;
    @Column(name = "GAS_START_")
    @PropertyDef(label = "气体采集点开始", description = "气体配置信息")
    private int gasStart;
    @Column(name = "GAS_END_")
    @PropertyDef(label = "气体采集点截至", description = "气体配置信息")
    private int gasEnd;
    @Column(name = "CHECK_NUM_")
    @PropertyDef(label = "采集通道个数")
    private int checkNum = 0;
    @Column(name = "POINTS_", length = 2000)
    @PropertyDef(label = "采集点信息", description = "固定为:passCode,co2,o2,ph3,n2;passCode,co2,o2,ph3,n2;")
    private String points;
    @Column(name = "CHECK_USER_", length = 30)
    @PropertyDef(label = "检测人")
    private String checkUser;
    @Column(name = "BATCH_TAG_", length = 2)
    @PropertyDef(label = "生成方式", description = "01-设备采集;02-手动补录")
    private String batchTag = "01";
    @Column(name = "REMARK_", length = 200)
    @PropertyDef(label = "备注信息")
    private String remark;
    public Gas() {
        super();
    }
    public Gas(String batchId, String companyId, String depotId,
               Date receiveDate) {
        super();
        this.batchId = batchId;
        this.companyId = companyId;
        this.depotId = depotId;
        this.perCo2Max = 0.0;
        this.perO2Max = 0.0;
        this.perPh3Max = 0.0;
        this.perCo2Min = 0.0;
        this.perO2Min = 0.0;
        this.perPh3Min = 0.0;
        this.perCo2 = 0.0;
        this.perO2 = 0.0;
        this.perPh3 = 0.0;
        this.receiveDate = receiveDate;
    }
}
igds-dzhwk-core/src/main/java/com/fzzy/igds/dzhwk/domain/GasKey.java
¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,20 @@
package com.fzzy.igds.dzhwk.domain;
import lombok.AllArgsConstructor;
import lombok.Data;
import java.io.Serializable;
@Data
@AllArgsConstructor
public class GasKey implements Serializable {
    private String batchId;
    private String companyId;
    private String depotId;
    public GasKey() {
        super();
    }
}
igds-dzhwk-core/src/main/java/com/fzzy/igds/dzhwk/domain/ScreenSer.java
¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,57 @@
package com.fzzy.igds.dzhwk.domain;
import com.bstek.dorado.annotation.PropertyDef;
import lombok.Data;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Id;
import javax.persistence.Table;
import java.io.Serializable;
import java.util.Date;
/**
 * @Description ç”µå­è´§ä½å¡è®¾å¤‡å®žä½“
 * @Author CZT
 * @Date 2025/06/03 17:24
 */
@Data
@Entity
@Table(name = "H_SCREEN_SER")
public class ScreenSer implements Serializable {
    public static String SORT_PROP = "id";
    @Id
    @PropertyDef(label = "主键ID")
    @Column(name = "ID_", length = 40)
    private String id;
    @Column(name = "COMPANY_ID_", length = 10)
    @PropertyDef(label = "组织编码")
    private String companyId;
    @Column(name = "DEPT_ID_", length = 40)
    @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;
    @PropertyDef(label = "所属廒间")
    @Column(name = "ajdh", length = 25)
    private String ajdh;
    @Column(name = "REMARK_", length = 200)
    @PropertyDef(label = "备注", description = "备注信息")
    private String remark;
    @Column(name = "UPDATE_TIME_")
    @PropertyDef(label = "更新时间")
    private Date updateTime;
}
igds-dzhwk-core/src/main/java/com/fzzy/igds/dzhwk/service/ScreenSerService.java
¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,58 @@
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.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;
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
import java.util.Date;
import java.util.List;
/**
 * @Description
 * @Author CZT
 * @Date 2025/06/03 17:44
 */
@Slf4j
@Service("dzhwk.ScreenSerService")
public class ScreenSerService {
    @Resource
    private ScreenSerRepository screenSerRepository;
    public List<ScreenSer> listData(String companyId, String deptId) {
        if (StringUtils.isEmpty(companyId)) {
            companyId = ContextUtil.getCompanyId();
        }
        if (StringUtils.isEmpty(deptId)) {
            deptId = ContextUtil.subDeptId(null);
        }
        return screenSerRepository.listData(companyId, deptId);
    }
    public void saveOrUpdate(ScreenSer 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())) {
            data.setDeptId(ContextUtil.getUUID());
        }
        data.setUpdateTime(new Date());
        screenSerRepository.save(data);
    }
    public String delData(ScreenSer data) {
        screenSerRepository.delete(data);
        return null;
    }
}
igds-dzhwk-core/src/main/java/com/fzzy/igds/dzhwk/service/repository/ScreenSerRepository.java
¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,28 @@
package com.fzzy.igds.dzhwk.service.repository;
import com.fzzy.igds.dzhwk.domain.ScreenSer;
import org.springframework.data.jpa.repository.JpaRepository;
import org.springframework.data.jpa.repository.Query;
import org.springframework.data.repository.query.Param;
import org.springframework.stereotype.Service;
import java.util.List;
/**
 * @Description
 * @Author CZT
 * @Date 2025/06/03 17:45
 */
@Service
public interface ScreenSerRepository extends JpaRepository<ScreenSer, String> {
    /**
     * æ ¹æ®ç»„织编码和库区编码获取廒间信息
     *
     * @param companyId
     * @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);
}
igds-dzhwk-view/src/main/java/com/fzzy/igds/dzhwk/ScreenSer.view.xml
¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,220 @@
<?xml version="1.0" encoding="UTF-8"?>
<ViewConfig>
  <Arguments/>
  <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>
      <PropertyDef name="companyId">
        <Property></Property>
        <Property name="label">组织编码</Property>
      </PropertyDef>
      <PropertyDef name="deptId">
        <Property></Property>
        <Property name="label">所属分库</Property>
        <Property name="mapping">
          <Property name="mapValues">${dorado.getDataProvider(&quot;deptPR#loadParents&quot;).getResult()}</Property>
          <Property name="keyProperty">deptId</Property>
          <Property name="valueProperty">deptName</Property>
        </Property>
        <Property name="required">true</Property>
      </PropertyDef>
      <PropertyDef name="sn">
        <Property></Property>
        <Property name="label">设备SN</Property>
        <Property name="required">true</Property>
      </PropertyDef>
      <PropertyDef name="name">
        <Property></Property>
        <Property name="label">设备名称</Property>
        <Property name="required">true</Property>
      </PropertyDef>
      <PropertyDef name="ajdh">
        <Property></Property>
        <Property name="label">所属廒间</Property>
        <Property name="mapping">
          <Property name="mapValues">${dorado.getDataProvider(&quot;granaryPR#getGranary&quot;).getResult()}</Property>
          <Property name="keyProperty">ajdh</Property>
          <Property name="valueProperty">ajmc</Property>
        </Property>
        <Property name="required">true</Property>
      </PropertyDef>
      <PropertyDef name="remark">
        <Property></Property>
        <Property name="label">备注</Property>
      </PropertyDef>
      <PropertyDef name="updateTime">
        <Property name="dataType">DateTime</Property>
        <Property name="label">更新时间</Property>
      </PropertyDef>
    </DataType>
  </Model>
  <View>
    <Property name="packages">font-awesome,css-common</Property>
    <DataSet id="dsMain">
      <Property name="dataProvider">screenSerPR#listData</Property>
      <Property name="dataType">[dtMain]</Property>
    </DataSet>
    <Container>
      <Property name="exClassName">c-data</Property>
      <ToolBar>
        <ToolBarLabel>
          <Property name="text">菜单栏:</Property>
          <Property name="exClassName">menu-bar-caption</Property>
        </ToolBarLabel>
        <ToolBarButton>
          <ClientEvent name="onClick">view.get(&quot;#dsMain&quot;).insert();&#xD;
view.get(&quot;#dialogMain&quot;).show();</ClientEvent>
          <Property name="caption">新增</Property>
          <Property name="exClassName">btn1</Property>
          <Property name="iconClass">fa fa-plus</Property>
        </ToolBarButton>
        <ToolBarButton>
          <ClientEvent name="onClick">var select = view.get(&quot;#dgMain&quot;).get(&quot;selection&quot;);&#xD;
if(select){&#xD;
    view.get(&quot;#dialogMain&quot;).show();;&#xD;
}else{&#xD;
    $notify(&quot;请选择需要修改的数据……&quot;);&#xD;
}</ClientEvent>
          <Property name="caption">编辑</Property>
          <Property name="exClassName">btn2</Property>
          <Property name="iconClass">fa fa-pencil</Property>
        </ToolBarButton>
        <ToolBarButton>
          <ClientEvent name="onClick">var select = view.get(&quot;#dgMain&quot;).get(&quot;selection&quot;);&#xD;
if(select){&#xD;
    view.get(&quot;#ajaxDel&quot;).set(&quot;parameter&quot;,select).execute(function(){&#xD;
        select.remove();&#xD;
    });&#xD;
}else{&#xD;
    $notify(&quot;请选择需要删除的数据……&quot;);&#xD;
}</ClientEvent>
          <Property name="caption">删除</Property>
          <Property name="exClassName">btn3</Property>
          <Property name="iconClass">fa fa-trash-o</Property>
        </ToolBarButton>
      </ToolBar>
      <DataGrid id="dgMain" layoutConstraint="padding:15px 0px 0px 0px">
        <ClientEvent name="onDataRowClick">view.get(&quot;#dgMain&quot;).set(&quot;selection&quot;,arg.data);</ClientEvent>
        <Property name="dataSet">dsMain</Property>
        <Property name="readOnly">true</Property>
        <Property name="selectionMode">singleRow</Property>
        <RowSelectorColumn/>
        <RowNumColumn/>
        <DataColumn name="name">
          <Property name="property">name</Property>
          <Property name="align">center</Property>
        </DataColumn>
        <DataColumn name="sn">
          <Property name="property">sn</Property>
          <Property name="align">center</Property>
        </DataColumn>
        <DataColumn name="ajdh">
          <Property name="property">ajdh</Property>
          <Property name="align">center</Property>
        </DataColumn>
        <DataColumn name="remark">
          <Property name="property">remark</Property>
          <Property name="align">center</Property>
        </DataColumn>
        <DataColumn name="updateTime">
          <Property name="property">updateTime</Property>
          <Property name="align">center</Property>
        </DataColumn>
      </DataGrid>
    </Container>
    <Dialog id="dialogMain" layout="regionPadding:10">
      <Property name="iconClass">fa fa-pencil-square-o</Property>
      <Property name="closeable">false</Property>
      <Property name="caption">电子货位卡设备信息</Property>
      <Property name="width">60%</Property>
      <Property name="iconClass">fa fa-tasks</Property>
      <Buttons>
        <Button id="btnOk">
          <ClientEvent name="onClick">view.get(&quot;#uaSave&quot;).execute(function(result){&#xD;
    if(result){&#xD;
        $alert(result);&#xD;
    }else{&#xD;
        $notify(&quot;保存成功!!&quot;);&#xD;
        view.get(&quot;#dialogMain&quot;).hide();&#xD;
    }&#xD;
});</ClientEvent>
          <Property name="caption">确定</Property>
          <Property name="exClassName">btn1</Property>
          <Property name="iconClass">fa fa-check</Property>
        </Button>
        <Button>
          <ClientEvent name="onClick">view.get(&quot;#dsMain.data:#&quot;).cancel();&#xD;
self.get(&quot;parent&quot;).hide();</ClientEvent>
          <Property name="caption">取消</Property>
          <Property name="exClassName">btn3</Property>
          <Property name="iconClass">fa fa-times</Property>
        </Button>
      </Buttons>
      <Children>
        <FieldSet layout="padding:5">
          <Property name="caption">基本信息</Property>
          <Buttons/>
          <Children>
            <AutoForm>
              <Property name="dataSet">dsMain</Property>
              <Property name="cols">*,*</Property>
              <Property name="labelAlign">right</Property>
              <Property name="labelSeparator">:</Property>
              <Property name="labelWidth">150</Property>
              <AutoFormElement>
                <Property name="name">name</Property>
                <Property name="property">name</Property>
                <Editor/>
              </AutoFormElement>
              <AutoFormElement>
                <Property name="name">deptId</Property>
                <Property name="property">deptId</Property>
                <Editor/>
              </AutoFormElement>
              <AutoFormElement>
                <Property name="name">sn</Property>
                <Property name="property">sn</Property>
                <Editor/>
              </AutoFormElement>
              <AutoFormElement>
                <Property name="name">ajdh</Property>
                <Property name="property">ajdh</Property>
                <Editor/>
              </AutoFormElement>
              <AutoFormElement layoutConstraint="colSpan:2">
                <Property name="name">remark</Property>
                <Property name="property">remark</Property>
                <Editor/>
              </AutoFormElement>
              <AutoFormElement>
                <Property name="name">updateTime</Property>
                <Property name="property">updateTime</Property>
                <Property name="readOnly">true</Property>
                <Editor/>
              </AutoFormElement>
            </AutoForm>
          </Children>
        </FieldSet>
      </Children>
      <Tools/>
    </Dialog>
    <UpdateAction id="uaSave">
      <Property name="dataResolver">screenSerPR#saveData</Property>
      <Property name="successMessage">数据保存完成!</Property>
      <UpdateItem>
        <Property name="dataSet">dsMain</Property>
        <Property name="dataPath">[#current]</Property>
        <Property name="validateData">false</Property>
      </UpdateItem>
    </UpdateAction>
    <AjaxAction id="ajaxDel">
      <Property name="service">screenSerPR#delData</Property>
      <Property name="confirmMessage">确定要执行删除么?</Property>
    </AjaxAction>
  </View>
</ViewConfig>
igds-dzhwk-view/src/main/java/com/fzzy/igds/dzhwk/pr/ScreenSerPR.java
¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,57 @@
package com.fzzy.igds.dzhwk.pr;
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.service.ScreenSerService;
import org.springframework.beans.BeanUtils;
import org.springframework.stereotype.Component;
import javax.annotation.Resource;
import java.util.List;
/**
 * @Description
 * @Author CZT
 * @Date 2025/06/03 17:42
 */
@Component
public class ScreenSerPR {
    @Resource
    private ScreenSerService screenSerService;
    /**
     * screenSerPR#listData
     * @return
     */
    @DataProvider
    public List<ScreenSer> listData() {
        return screenSerService.listData(null, null);
    }
    /**
     * screenSerPR#saveData æ–°å¢žæˆ–者修改
     *
     * @param data
     */
    @DataResolver
    public void saveData(ScreenSer data) {
        ScreenSer item = new ScreenSer();
        BeanUtils.copyProperties(data, item);
        screenSerService.saveOrUpdate(item);
    }
    /**
     * granaryPR#delData
     *
     * @param data
     */
    @Expose
    public String delData(ScreenSer data){
        ScreenSer item = new ScreenSer();
        BeanUtils.copyProperties(data, item);
        return screenSerService.delData(item);
    }
}
igds-dzhwk-view/src/main/java/com/fzzy/igds/sys/DepotConf.view.xml
@@ -3,7 +3,7 @@
  <Arguments/>
  <Context/>
  <Model/>
  <View layout="padding:5;regionPadding:5">
  <View>
    <ClientEvent name="onReady">var depotList = null;&#xD;
</ClientEvent>
    <Property name="packages">font-awesome,css-common</Property>
@@ -11,106 +11,104 @@
      <Property name="dataProvider">depotConfPR#getConfList</Property>
      <Property name="dataType">[dtDepotConf]</Property>
    </DataSet>
    <Container layout="regionPadding:10" layoutConstraint="top">
      <Property name="exClassName">bg-color</Property>
      <Property name="height">55</Property>
      <Property name="contentOverflow">hidden</Property>
      <Label layoutConstraint="left">
        <Property name="text">菜单栏:</Property>
      </Label>
      <Button layoutConstraint="left">
        <ClientEvent name="onClick">view.get(&quot;#dsMain&quot;).insert();&#xD;
    <Container>
      <Property name="exClassName">c-data</Property>
      <ToolBar>
        <ToolBarLabel>
          <Property name="text">菜单栏:</Property>
          <Property name="exClassName">menu-bar-caption</Property>
        </ToolBarLabel>
        <ToolBarButton layoutConstraint="left">
          <ClientEvent name="onClick">view.get(&quot;#dsMain&quot;).insert();&#xD;
view.get(&quot;#depotId&quot;).set(&quot;readOnly&quot;,false);&#xD;
view.get(&quot;#dgMain&quot;).show();</ClientEvent>
        <Property name="caption">新增</Property>
        <Property name="exClassName">btn1</Property>
        <Property name="iconClass">fa fa-plus</Property>
      </Button>
      <Button layoutConstraint="left">
        <ClientEvent name="onClick">var select = view.get(&quot;#dataGridMain&quot;).get(&quot;selection&quot;);&#xD;
          <Property name="caption">新增</Property>
          <Property name="exClassName">btn1</Property>
          <Property name="iconClass">fa fa-plus</Property>
        </ToolBarButton>
        <ToolBarButton layoutConstraint="left">
          <ClientEvent name="onClick">var select = view.get(&quot;#dataGridMain&quot;).get(&quot;selection&quot;);&#xD;
if(select){&#xD;
    view.get(&quot;#dgMain&quot;).show();&#xD;
    view.get(&quot;#depotId&quot;).set(&quot;readOnly&quot;,true);&#xD;
}else{&#xD;
    $notify(&quot;请选择需要修改的数据……&quot;);&#xD;
}</ClientEvent>
        <Property name="caption">修改</Property>
        <Property name="exClassName">btn2</Property>
        <Property name="iconClass">fa fa-pencil</Property>
      </Button>
      <Button layoutConstraint="left">
        <ClientEvent name="onClick">&#xD;
          <Property name="caption">修改</Property>
          <Property name="exClassName">btn2</Property>
          <Property name="iconClass">fa fa-pencil</Property>
        </ToolBarButton>
        <ToolBarButton layoutConstraint="left">
          <ClientEvent name="onClick">&#xD;
&#xD;
var select = view.get(&quot;#dataGridMain&quot;).get(&quot;selection&quot;);&#xD;
if(select){&#xD;
    view.get(&quot;#ajaxDel2&quot;).set(&quot;parameter&quot;,select).execute(function(result){&#xD;
        if(result){&#xD;
            $alert(result);&#xD;
        }else{&#xD;
            entity.remove();&#xD;
        }&#xD;
    });&#xD;
        if(result){&#xD;
            $alert(result);&#xD;
        }else{&#xD;
            entity.remove();&#xD;
        }&#xD;
    });&#xD;
}else{&#xD;
    $notify(&quot;请选择需要删除的数据……&quot;);&#xD;
}</ClientEvent>
        <Property name="caption">删除</Property>
        <Property name="exClassName">btn3</Property>
        <Property name="iconClass">fa fa-trash-o</Property>
      </Button>
      <Button layoutConstraint="left">
        <Property name="caption">刷新缓存</Property>
        <Property name="exClassName">btn-flush</Property>
        <Property name="iconClass">fa fa-refresh</Property>
        <Property name="action">ajaxRefreshCache</Property>
      </Button>
          <Property name="caption">删除</Property>
          <Property name="exClassName">btn3</Property>
          <Property name="iconClass">fa fa-trash-o</Property>
        </ToolBarButton>
        <ToolBarButton layoutConstraint="left">
          <Property name="caption">刷新缓存</Property>
          <Property name="exClassName">btn-flush</Property>
          <Property name="iconClass">fa fa-refresh</Property>
          <Property name="action">ajaxRefreshCache</Property>
        </ToolBarButton>
      </ToolBar>
      <DataGrid id="dataGridMain" layoutConstraint="padding:15px 0px 0px 0px">
        <ClientEvent name="onDataRowClick">view.get(&quot;#dataGridMain&quot;).set(&quot;selection&quot;,arg.data);</ClientEvent>
        <Property name="dataSet">dsMain</Property>
        <Property name="readOnly">true</Property>
        <Property name="selectionMode">singleRow</Property>
        <RowSelectorColumn/>
        <RowNumColumn/>
        <DataColumn name="depotId">
          <Property name="property">depotId</Property>
          <Property name="align">center</Property>
        </DataColumn>
        <DataColumn name="grainSer">
          <Property name="property">grainSer</Property>
          <Property name="align">center</Property>
        </DataColumn>
        <DataColumn>
          <Property name="property">cableRule</Property>
          <Property name="align">center</Property>
          <Property name="name">cableRule</Property>
        </DataColumn>
        <DataColumn name="cableCir">
          <Property name="property">cableCir</Property>
          <Property name="align">center</Property>
        </DataColumn>
        <DataColumn name="tempMax">
          <Property name="property">tempMax</Property>
          <Property name="align">center</Property>
        </DataColumn>
        <DataColumn name="grainFreq">
          <Property name="property">grainFreq</Property>
        </DataColumn>
        <DataColumn name="n2Max">
          <Property name="property">n2Max</Property>
        </DataColumn>
        <DataColumn name="co2Max">
          <Property name="property">co2Max</Property>
        </DataColumn>
        <DataColumn name="o2Max">
          <Property name="property">o2Max</Property>
        </DataColumn>
        <DataColumn name="ph3Max">
          <Property name="property">ph3Max</Property>
        </DataColumn>
      </DataGrid>
    </Container>
    <DataGrid id="dataGridMain" layoutConstraint="center ">
      <ClientEvent name="onDataRowDoubleClick">var cur = view.get(&quot;#dsMain.data:#&quot;);&#xD;
if(!cur) return ;&#xD;
view.get(&quot;#depotId&quot;).set(&quot;readOnly&quot;,true);&#xD;
view.get(&quot;#dgMain&quot;).show();</ClientEvent>
      <Property name="dataSet">dsMain</Property>
      <Property name="readOnly">true</Property>
      <Property name="selectionMode">singleRow</Property>
      <RowSelectorColumn/>
      <RowNumColumn/>
      <DataColumn name="depotId">
        <Property name="property">depotId</Property>
        <Property name="align">center</Property>
      </DataColumn>
      <DataColumn name="grainSer">
        <Property name="property">grainSer</Property>
        <Property name="align">center</Property>
      </DataColumn>
      <DataColumn>
        <Property name="property">cableRule</Property>
        <Property name="align">center</Property>
        <Property name="name">cableRule</Property>
      </DataColumn>
      <DataColumn name="cableCir">
        <Property name="property">cableCir</Property>
        <Property name="align">center</Property>
      </DataColumn>
      <DataColumn name="tempMax">
        <Property name="property">tempMax</Property>
        <Property name="align">center</Property>
      </DataColumn>
      <DataColumn name="grainFreq">
        <Property name="property">grainFreq</Property>
      </DataColumn>
      <DataColumn name="n2Max">
        <Property name="property">n2Max</Property>
      </DataColumn>
      <DataColumn name="co2Max">
        <Property name="property">co2Max</Property>
      </DataColumn>
      <DataColumn name="o2Max">
        <Property name="property">o2Max</Property>
      </DataColumn>
      <DataColumn name="ph3Max">
        <Property name="property">ph3Max</Property>
      </DataColumn>
    </DataGrid>
    <UpdateAction id="uaMain">
      <Property name="dataResolver">depotConfPR#saveConf</Property>
      <UpdateItem>
igds-dzhwk-web/src/main/java/com/fzzy/igds/dzhwk/controller/WebController.java
@@ -7,12 +7,9 @@
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Controller;
import org.springframework.ui.ModelMap;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam;
import javax.annotation.Resource;
import java.util.List;
/**
 * @Description
@@ -30,24 +27,13 @@
    private WebManager webManager;
    /**
     * é”å±
     * @param view
     * @return
     */
    @RequestMapping("/lock")
    public String lock(@RequestParam(value = "flag", required = true) String flag, ModelMap view) {
        view.put("flag", flag);
        return prefix + "lock";
    }
    /**
     * é¦–页
     * @param gid å»’é—´id
     * @param view
     * @return
     */
    @RequestMapping("/index")
    public String index(ModelMap view) {
        view.put("flag", "index");
    public String index(@RequestParam(value = "gid", required = false) String gid, ModelMap view) {
        String videoUrl = dzhwkConfigData.getDzhwkVideo().replace(dzhwkConfigData.getProfile(),"/profile/");
        view.put("videoUrl", videoUrl);
@@ -267,8 +253,16 @@
        return prefix + "sys";
    }
    /**
     * é”å±
     * @param view
     * @return
     */
    @RequestMapping("/lock")
    public String lock(@RequestParam(value = "flag", required = true) String flag, ModelMap view) {
        view.put("flag", flag);
        return prefix + "lock";
    }
    /**
     * è§†é¢‘预览页面