料位总览提交3-调试优化

czt

2026-01-09 2c7f0f8bc83624fa5fc7092b7bdb361b867fbcf2

料位总览提交3-调试优化

 fzzy-igdss-core/src/main/java/com/fzzy/igds/domain/Depot.java

@@ -2,6 +2,7 @@

import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName;
import com.bstek.dorado.annotation.PropertyDef;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.fzzy.igds.constant.*;
import lombok.Data;
@@ -140,4 +141,61 @@
    @TableField("pledge_bank")
    private String pledgeBank;


    // ------------其他属性信息------------//
    @Transient
    @TableField(exist = false)
    private String foodVarietyName;

    @Transient
    @TableField(exist = false)
    private String foodTypeName;

    @Transient
    @TableField(exist = false)
    private String depotTypeName;

    @Transient
    @TableField(exist = false)
    private String depotStatusName;

    @Transient
    @TableField(exist = false)
    private String foodLevelName;


    public String getFoodLevelName() {
        if (null != this.foodLevel) {
            return FoodLevel.getMsg(this.foodLevel);
        }
        return null;
    }

    public String getFoodVarietyName() {
        if (null != this.foodVariety) {
            return FoodVariety.getMsg(this.foodVariety);
        }
        return null;
    }

    public String getFoodTypeName() {
        if (null != this.foodType) {
            return FoodType.getMsg(this.foodType);
        }
        return null;
    }

    public String getDepotTypeName() {
        if (null != this.depotType) {
            return DepotType.getMsg(this.depotType);
        }
        return null;
    }

    public String getDepotStatusName() {
        if (null != this.depotStatus) {
            return DepotStatus.getMsg(this.depotStatus);
        }
        return null;
    }
}

 fzzy-igdss-core/src/main/java/com/fzzy/igds/service/DeviceSerService.java

@@ -63,6 +63,15 @@
     * @return
     */
    public List<DeviceSer> getAllSer() {
        return this.listDeviceSer(ContextUtil.getCompanyId(), null, null);
    }

    /**
     * 查询分机列表
     *
     * @return
     */
    public List<DeviceSer> getSer() {
        SysUser user = ContextUtil.getLoginUser();
        SysDept userDept = iSysDeptService.selectDeptById(user.getDeptId());
        if (Constant.DEPT_TYPE_20.equals(userDept.getType())) {

 fzzy-igdss-io/src/main/java/com/fzzy/igds/iot/analysis/AnalysisService.java

@@ -240,7 +240,7 @@

            Quantity data = new Quantity();

            data.setBatchId(depot + ContextUtil.generateId());
            data.setBatchId(depot.getId() +"_"+ ContextUtil.generateId());
            data.setCompanyId(ser.getCompanyId());
            data.setDeptId(depot.getDeptId());
            data.setDepotId(deviceIot.getDepotId());

 fzzy-igdss-view/src/main/java/com/fzzy/igds/Depot.view.xml

@@ -280,16 +280,6 @@
                <Editor/>
              </AutoFormElement>
              <AutoFormElement layoutConstraint="colSpan:4">
                <Property name="name">pledgeBank</Property>
                <Property name="property">pledgeBank</Property>
                <Editor/>
              </AutoFormElement>
              <AutoFormElement layoutConstraint="colSpan:2">
                <Property name="name">updateBy</Property>
                <Property name="property">updateBy</Property>
                <Editor/>
              </AutoFormElement>
              <AutoFormElement layoutConstraint="colSpan:4">
                <Property name="name">remark</Property>
                <Property name="property">remark</Property>
                <Editor/>

 fzzy-igdss-view/src/main/java/com/fzzy/igds/DeviceSerPR.java

@@ -29,7 +29,7 @@
     */
    @DataProvider
    public List<DeviceSer> getAllSer() {
        return deviceSerService.getAllSer();
        return deviceSerService.getSer();
    }

    /**

 fzzy-igdss-view/src/main/java/models/core.model.xml

@@ -229,15 +229,6 @@
        <Property name="valueProperty">dictLabel</Property>
      </Property>
    </PropertyDef>
    <PropertyDef name="pledgeBank">
      <Property></Property>
      <Property name="label">监管银行</Property>
      <Property name="mapping">
        <Property name="mapValues">${dorado.getDataProvider(&quot;bankPR#listAll&quot;).getResult()}</Property>
        <Property name="keyProperty">id</Property>
        <Property name="valueProperty">name</Property>
      </Property>
    </PropertyDef>
    <PropertyDef name="storageMax">
      <Property name="dataType">Double</Property>
      <Property name="label">设计储量</Property>

 fzzy-igdss-web/src/main/java/com/fzzy/security/SecurityController.java

@@ -324,7 +324,7 @@
        view.put("deptId", deptId);

        // 获取当前部门下所有油罐列表信息
        List<Quantity> heightList = secManager.getHeightList(deptId);
        List<Quantity> heightList = secManager.getHeightList(ContextUtil.subDeptId(user));
        view.put(Constant.MODEL_KEY_DEPOT_LIST, heightList);

        view.put("bizType", "quantity");

 fzzy-igdss-web/src/main/resources/templates/security/height-all.html

@@ -155,6 +155,8 @@
</div>
<script th:src="@{/ajax/libs/layui/layui.js}"></script>
<script th:src="@{/js/jquery.min.js}"></script>
<script th:src="@{/ruoyi/js/ry-ui.js?v=4.7.8}"></script>
<script th:src="@{/ruoyi/js/common.js?v=4.7.8}"></script>
<script th:inline="javascript">
    //料位列表
    var listDepot = [[${listDepot}]];
@@ -171,7 +173,7 @@
                html += '<li><div class="con"><div class="box"><div class="top"><div class="ll">';
                html += '<div class="num">' + (depot.name == null ? "" : depot.name) + '</div>';
                html += '<div class="tit">' + (depot.foodVarietyName == null ? "--" : depot.foodVarietyName) + '</div></div>';
                html += '<a href="../../basic/grain/view-check3?depotId=' + depot.id + '" class="more">详情 &gt;</a></div>';
                html += '<a onclick="toPage()" href="javaScript:;" class="more">详情 &gt;</a></div>';
                html += '<div class="picbox"><div class="pic"><img src="/img/web/grain/height-all.png" alt=""></div>';
                html += '<div class="heat"><div class="line">';
                html += '<div class="sline" style="height: ' + (item.heightPer == null ? "--" : item.heightPer) + '%;">';
@@ -223,6 +225,13 @@
        }
        return fmt;
    }


    /* 用户管理-重置密码 */
    function toPage() {
        var url = '/com.fzzy.igds.QuantityData.d';
        $.modal.openTab("数量检测报表", url);
    }
</script>
</body>