调整基础配置信息查询方式，取消jpa

czt

2025-12-01 096296cd7485c5583c8194d88cca700e3c4d84a0

调整基础配置信息查询方式，取消jpa

 fzzy-igdss-core/src/main/java/com/fzzy/igds/data/DeviceIotParam.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,25 @@
package com.fzzy.igds.data;

import lombok.Data;

/**
 * @Description
 * @Author CZT
 * @Date 2025/11/28 14:45
 */
@Data
public class DeviceIotParam {

    private String id;

    private String companyId;

    private String deptId;

    private String serId;

    private String depotId;

    private String type;

}

 fzzy-igdss-core/src/main/java/com/fzzy/igds/data/IgdsBaseParam.java

@@ -9,8 +9,14 @@

    private String id;

    private String companyId;

    private String deptId;

    private String name;

    private String depotId;

    private String key;//自定义关键字

    private Date start;

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

@@ -136,12 +136,4 @@
    @TableField("remark")
    private String remark;

    @Transient
    private String playAddr;//视频播放地址，根据不同的播放方式生成不同的播放地址

    @Transient
    private String playIframe;//流媒体Iframe播放地址

    @Transient
    private String msg;
}

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

@@ -73,8 +73,8 @@
    @TableField("food_level")
    private String foodLevel;

    @Column(name = "food_locationId", columnDefinition = "varchar(40) COMMENT '粮食产地'")
    @TableField("food_locationId")
    @Column(name = "food_location_id", columnDefinition = "varchar(40) COMMENT '粮食产地'")
    @TableField("food_location_id")
    private String foodLocationId;

    @Column(name = "food_location", columnDefinition = "varchar(40) COMMENT '粮食产地'")
@@ -123,60 +123,4 @@
    @TableField("order_num")
    private Integer orderNum = 1;

    // ------------其他属性信息------------//
    @Transient
    private String foodVarietyName;

    @Transient
    private String foodTypeName;

    @Transient
    private String depotTypeName;

    @Transient
    private String depotStatusName;

    @Transient
    private String foodLevelName;

    @Transient
    private String storeKeeperLevel = "高级保管员";

    @Transient
    private String storeKeeperPhone = "####";

    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/domain/DepotConf.java

@@ -107,12 +107,4 @@
    @TableField("is_only_th")
    private String isOnlyTH = Constant.YN_N;

    // ä»“库名称
    @Transient
    private String depotName;

    //仓库类型
    @Transient
    private String depotType;

}

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

@@ -80,8 +80,4 @@
    @TableField("file_name")
    private String imgName;

    //鸟瞰图全路径
    @Transient
    private String imgPath;

}

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

@@ -117,11 +117,6 @@
    @TableField("remark")
    private String remark;

    //异常信息
    @Transient
    private String errorMsg;


    public InoutConf() {
        super();
    }
@@ -147,7 +142,6 @@
        this.snapType = conf.getSnapType();
        this.mediaAddr = conf.getMediaAddr();
        this.remark = conf.getRemark();
        this.errorMsg = conf.getErrorMsg();
    }

    public InoutConf(String sort) {

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

@@ -148,9 +148,4 @@
    @TableField("remark")
    private String remark;

    @Transient
    private String playAddr;//视频播放地址，根据不同的播放方式生成不同的播放地址

    @Transient
    private String msg;
}

 fzzy-igdss-core/src/main/java/com/fzzy/igds/mapper/CameraMapper.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,16 @@
package com.fzzy.igds.mapper;

import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.fzzy.igds.domain.Camera;
import com.fzzy.igds.domain.InoutNoticeIn;
import org.apache.ibatis.annotations.Mapper;

/**
 * @Description
 * @Author CZT
 * @Date 2025/11/28 10:48
 */
@Mapper
public interface CameraMapper extends BaseMapper<Camera> {

}

 fzzy-igdss-core/src/main/java/com/fzzy/igds/mapper/CoreCompanyMapper.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,16 @@
package com.fzzy.igds.mapper;

import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.fzzy.igds.domain.Camera;
import com.fzzy.igds.domain.Company;
import org.apache.ibatis.annotations.Mapper;

/**
 * @Description
 * @Author CZT
 * @Date 2025/11/28 10:48
 */
@Mapper
public interface CoreCompanyMapper extends BaseMapper<Company> {

}

 fzzy-igdss-core/src/main/java/com/fzzy/igds/mapper/CoreDeptMapper.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,15 @@
package com.fzzy.igds.mapper;

import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.fzzy.igds.domain.Dept;
import org.apache.ibatis.annotations.Mapper;

/**
 * @Description
 * @Author CZT
 * @Date 2025/11/28 10:48
 */
@Mapper
public interface CoreDeptMapper extends BaseMapper<Dept> {

}

 fzzy-igdss-core/src/main/java/com/fzzy/igds/mapper/DepotConfMapper.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,15 @@
package com.fzzy.igds.mapper;

import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.fzzy.igds.domain.DepotConf;
import org.apache.ibatis.annotations.Mapper;

/**
 * @Description
 * @Author CZT
 * @Date 2025/11/28 10:48
 */
@Mapper
public interface DepotConfMapper extends BaseMapper<DepotConf> {

}

 fzzy-igdss-core/src/main/java/com/fzzy/igds/mapper/DepotMapper.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,15 @@
package com.fzzy.igds.mapper;

import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.fzzy.igds.domain.Depot;
import org.apache.ibatis.annotations.Mapper;

/**
 * @Description
 * @Author CZT
 * @Date 2025/11/28 10:48
 */
@Mapper
public interface DepotMapper extends BaseMapper<Depot> {

}

 fzzy-igdss-core/src/main/java/com/fzzy/igds/mapper/DepotStoreMapper.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,15 @@
package com.fzzy.igds.mapper;

import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.fzzy.igds.domain.DepotStore;
import org.apache.ibatis.annotations.Mapper;

/**
 * @Description
 * @Author CZT
 * @Date 2025/11/28 10:48
 */
@Mapper
public interface DepotStoreMapper extends BaseMapper<DepotStore> {

}

 fzzy-igdss-core/src/main/java/com/fzzy/igds/mapper/DeviceIotMapper.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,15 @@
package com.fzzy.igds.mapper;

import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.fzzy.igds.domain.DeviceIot;
import org.apache.ibatis.annotations.Mapper;

/**
 * @Description
 * @Author CZT
 * @Date 2025/11/28 10:48
 */
@Mapper
public interface DeviceIotMapper extends BaseMapper<DeviceIot> {

}

 fzzy-igdss-core/src/main/java/com/fzzy/igds/mapper/DeviceSerMapper.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,15 @@
package com.fzzy.igds.mapper;

import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.fzzy.igds.domain.DeviceSer;
import org.apache.ibatis.annotations.Mapper;

/**
 * @Description
 * @Author CZT
 * @Date 2025/11/29 10:48
 */
@Mapper
public interface DeviceSerMapper extends BaseMapper<DeviceSer> {

}

 fzzy-igdss-core/src/main/java/com/fzzy/igds/mapper/InoutConfMapper.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,15 @@
package com.fzzy.igds.mapper;

import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.fzzy.igds.domain.InoutConf;
import org.apache.ibatis.annotations.Mapper;

/**
 * @Description
 * @Author CZT
 * @Date 2025/11/25 16:24
 */
@Mapper
public interface InoutConfMapper extends BaseMapper<InoutConf> {

}

 fzzy-igdss-core/src/main/java/com/fzzy/igds/mapper/InoutSysConfMapper.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,15 @@
package com.fzzy.igds.mapper;

import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.fzzy.igds.domain.InoutSysConf;
import org.apache.ibatis.annotations.Mapper;

/**
 * @Description
 * @Author CZT
 * @Date 2025/11/25 16:24
 */
@Mapper
public interface InoutSysConfMapper extends BaseMapper<InoutSysConf> {

}

 fzzy-igdss-core/src/main/java/com/fzzy/igds/mapper/QuantityConfMapper.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,15 @@
package com.fzzy.igds.mapper;

import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.fzzy.igds.domain.QuantityConf;
import org.apache.ibatis.annotations.Mapper;

/**
 * @Description
 * @Author CZT
 * @Date 2025/11/29 10:48
 */
@Mapper
public interface QuantityConfMapper extends BaseMapper<QuantityConf> {

}

 fzzy-igdss-core/src/main/java/com/fzzy/igds/repository/CompanyRepository.java

ÎļþÒÑɾ³ý

 fzzy-igdss-core/src/main/java/com/fzzy/igds/repository/DepotConfRepository.java

ÎļþÒÑɾ³ý

 fzzy-igdss-core/src/main/java/com/fzzy/igds/repository/DepotRepository.java

ÎļþÒÑɾ³ý

 fzzy-igdss-core/src/main/java/com/fzzy/igds/repository/DepotStoreRepository.java

ÎļþÒÑɾ³ý

 fzzy-igdss-core/src/main/java/com/fzzy/igds/repository/DeptRepository.java

ÎļþÒÑɾ³ý

 fzzy-igdss-core/src/main/java/com/fzzy/igds/repository/DeviceIotRepository.java

ÎļþÒÑɾ³ý

 fzzy-igdss-core/src/main/java/com/fzzy/igds/repository/DeviceSerRepository.java

ÎļþÒÑɾ³ý

 fzzy-igdss-core/src/main/java/com/fzzy/igds/repository/DicAreaRepository.java

ÎļþÒÑɾ³ý

 fzzy-igdss-core/src/main/java/com/fzzy/igds/repository/InoutConfRepository.java

ÎļþÒÑɾ³ý

 fzzy-igdss-core/src/main/java/com/fzzy/igds/repository/InoutSysConfRepository.java

ÎļþÒÑɾ³ý

 fzzy-igdss-core/src/main/java/com/fzzy/igds/repository/QuantityConfRepository.java

ÎļþÒÑɾ³ý

 fzzy-igdss-core/src/main/java/com/fzzy/igds/repository/SecCameraRepository.java

ÎļþÒÑɾ³ý

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

@@ -1,10 +1,10 @@
package com.fzzy.igds.service;

import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.fzzy.igds.domain.Company;
import com.fzzy.igds.repository.CompanyRepository;
import com.fzzy.igds.mapper.CoreCompanyMapper;
import com.fzzy.igds.utils.ContextUtil;
import com.ruoyi.common.core.domain.entity.SysDept;
import com.ruoyi.common.core.domain.entity.SysUser;
import com.ruoyi.common.utils.StringUtils;
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
@@ -20,46 +20,39 @@
public class CoreCompanyService {

    @Resource
    private CompanyRepository companyRepository;
    private CoreCompanyMapper coreCompanyMapper;

    /**
     * jpa查询公司信息
     * æ ¹æ®æ¡ä»¶æŸ¥è¯¢å…¬å¸ä¿¡æ¯
     * @param id
     * @param companyId
     * @param parentId
     * @return
     */
    public List<Company> getDataById(String id) {
    public List<Company> listCompany(String id, String companyId, String parentId) {

        return companyRepository.getDataById(id);
        QueryWrapper<Company> queryWrapper = new QueryWrapper<>();

        if(StringUtils.isNotBlank(id)){
            queryWrapper.eq("id", id);
        }
        if(StringUtils.isNotBlank(companyId)){
            queryWrapper.eq("company_id", companyId);
        }
        if(StringUtils.isNotBlank(parentId)){
            queryWrapper.likeRight("id", parentId);
        }

        return coreCompanyMapper.selectList(queryWrapper);
    }

    /**
     * jpa查询公司信息
     * @return
     */
    public List<Company> getAllData(String companyId) {

        if (StringUtils.isEmpty(companyId)) {
            companyId = ContextUtil.getCompanyId();
        }
        return companyRepository.getAllData(companyId);
    }

    /**
     * jpa查询公司信息
     * @return
     */
    public List<Company> getDataByParentId() {

        SysUser user = ContextUtil.getLoginUser();
        return companyRepository.getDataByParentId(user.getDeptId() + "%");
    }

    /**
     * jpa新增公司信息
     * æ›´æ–°æˆ–保存公司信息
     * @param sysDept
     * @param isAdd
     * @return
     */
    public void saveOrUpdate(SysDept sysDept) {
    public void saveOrUpdate(SysDept sysDept, Boolean isAdd) {
        if (null == sysDept) {
            return;
        }
@@ -72,15 +65,30 @@
        company.setDwzt(sysDept.getStatus());
        company.setCompanyId(sysDept.getCompanyId());

        //创建信息
        company.setCreateBy(ContextUtil.getLoginUserName());
        company.setCreateTime(new Date());

        if (isAdd) {
            this.save(company);
        }else {
        this.update(company);
        }
    }

    /**
     * jpa更新公司信息
     * æ–°å¢žå…¬å¸ä¿¡æ¯
     * @param data
     */
    public void save(Company data) {
        if (StringUtils.isEmpty(data.getCompanyId())) {
            data.setCompanyId(ContextUtil.getCompanyId());
        }
        //新增信息
        data.setCreateBy(ContextUtil.getLoginUserName());
        data.setCreateTime(new Date());

        coreCompanyMapper.insert(data);
    }

    /**
     * æ›´æ–°å…¬å¸ä¿¡æ¯
     * @param data
     */
    public void update(Company data) {
@@ -91,7 +99,7 @@
        data.setUpdateBy(ContextUtil.getLoginUserName());
        data.setUpdateTime(new Date());

        companyRepository.save(data);
        coreCompanyMapper.updateById( data);
    }

    /**
@@ -100,6 +108,6 @@
     * @return
     */
    public void delData(String deptId) {
        companyRepository.deleteById(deptId);
        coreCompanyMapper.deleteById(deptId);
    }
}

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

@@ -1,8 +1,9 @@
package com.fzzy.igds.service;

import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.fzzy.igds.constant.Constant;
import com.fzzy.igds.domain.Dept;
import com.fzzy.igds.repository.DeptRepository;
import com.fzzy.igds.mapper.CoreDeptMapper;
import com.fzzy.igds.utils.ContextUtil;
import com.ruoyi.common.core.domain.entity.SysDept;
import com.ruoyi.common.core.domain.entity.SysUser;
@@ -24,49 +25,55 @@
    @Resource
    private ISysDeptService iSysDeptService;
    @Resource
    private DeptRepository deptRepository;
    private CoreDeptMapper coreDeptMapper;
    @Resource
    private InoutConfService inoutConfService;


    /**
     * jpa查询信息
     * æ ¹æ®æ¡ä»¶æŸ¥è¯¢åº“区信息
     * @param id
     * @param companyId
     * @param parentId
     * @return
     */
    public List<Dept> getDataByParentId(String parentId) {
        return deptRepository.getDataByParentId(parentId + "%");
    public List<Dept> listDept(String id, String companyId, String parentId) {

        QueryWrapper<Dept> queryWrapper = new QueryWrapper<>();

        if(StringUtils.isNotBlank(id)){
            queryWrapper.eq("id", id);
        }
        if(StringUtils.isNotBlank(companyId)){
            queryWrapper.eq("company_id", companyId);
        }
        if(StringUtils.isNotBlank(parentId)){
            queryWrapper.likeRight("id", parentId);
    }


    /**
     * jpa查询信息
     * @return
     */
    public List<Dept> getAllDeptData() {
        return deptRepository.getAllData(ContextUtil.getCompanyId());
        return coreDeptMapper.selectList(queryWrapper);
    }

    /**
     * jpa查询信息
     * æŸ¥è¯¢ä¿¡æ¯
     * @return
     */
    public List<Dept> getDeptData() {
        SysUser user = ContextUtil.getLoginUser();
        SysDept userDept = iSysDeptService.selectDeptById(user.getDeptId());
        if (Constant.DEPT_TYPE_20.equals(userDept.getType())) {
            return deptRepository.getDataById(ContextUtil.subDeptId(user));
            return this.listDept(ContextUtil.subDeptId(user),null,null);
        }else {
            return deptRepository.getDataByParentId(user.getDeptId() + "%");
            return this.listDept(null,null,user.getDeptId() + "%");
        }
    }

    /**
     * jpa新增库区信息
     * æ–°å¢žæˆ–更新库区信息
     * @param sysDept
     * @param isAdd
     * @return
     */
    public void saveOrUpdate(SysDept sysDept) {
    public void saveOrUpdate(SysDept sysDept, Boolean isAdd) {
        if (null == sysDept) {
            return;
        }
@@ -75,29 +82,45 @@
        dept.setKqmc(sysDept.getDeptName());
        dept.setCompanyId(sysDept.getCompanyId());

        //创建信息
        dept.setCreateBy(ContextUtil.getLoginUserName());
        dept.setCreateTime(new Date());

        if (isAdd) {
            this.save(dept);
        }else {
        this.update(dept);

        //生成出入库流程配置信息
        inoutConfService.initSysConfData(sysDept.getCompanyId(), dept.getId());
        }
    }

    /**
     * jpa更新库区信息
     * ä¿å­˜åº“区信息
     * @param data
     */
    public void save(Dept data) {
        if (StringUtils.isEmpty(data.getCompanyId())) {
            data.setCompanyId(ContextUtil.getCompanyId());
        }
        //创建信息
        data.setCreateBy(ContextUtil.getLoginUserName());
        data.setCreateTime(new Date());

        coreDeptMapper.insert(data);

        //初始化出入库流程配置信息
        inoutConfService.initSysConfData(data.getCompanyId(), data.getId());
    }

    /**
     * æ›´æ–°åº“区信息
     * @param data
     */
    public void update(Dept data) {
        if (StringUtils.isEmpty(data.getCompanyId())) {
            data.setCompanyId(ContextUtil.getCompanyId());
        }

        //更新信息
        data.setUpdateBy(ContextUtil.getLoginUserName());
        data.setUpdateTime(new Date());

        deptRepository.save(data);
        coreDeptMapper.updateById(data);
    }

    /**
@@ -107,7 +130,7 @@
     */
    public void delData(String deptId) {
        //删除库区信息
        deptRepository.deleteById(deptId);
        coreDeptMapper.deleteById(deptId);

        //删除流程配置信息
        inoutConfService.delSysConfData(deptId);

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

@@ -1,9 +1,11 @@
package com.fzzy.igds.service;

import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import com.fzzy.igds.constant.RedisConst;
import com.fzzy.igds.domain.Depot;
import com.fzzy.igds.domain.DepotConf;
import com.fzzy.igds.repository.DepotConfRepository;
import com.fzzy.igds.mapper.DepotConfMapper;
import com.fzzy.igds.utils.ContextUtil;
import com.ruoyi.common.core.redis.RedisCache;
import com.ruoyi.common.utils.StringUtils;
@@ -26,14 +28,14 @@
public class DepotConfService {

    @Resource
    private DepotConfRepository depotConfRepository;
    private DepotConfMapper depotConfMapper;
    @Resource
    private DepotService depotService;
    @Resource
    private RedisCache redisCache;

    /**
     * jpa查询配置信息
     * æŸ¥è¯¢é…ç½®ä¿¡æ¯
     *
     * @param companyId
     * @param deptId
@@ -44,14 +46,17 @@
        if (StringUtils.isEmpty(companyId)) {
            companyId = ContextUtil.getCompanyId();
        }
        if (StringUtils.isEmpty(deptId)) {
            deptId = ContextUtil.subDeptId(null);
        QueryWrapper<DepotConf> queryWrapper = new QueryWrapper<>();
        queryWrapper.eq("company_id", companyId);

        if(StringUtils.isNotBlank(deptId)){
            queryWrapper.eq("dept_id", deptId);
        }
        return depotConfRepository.getDepotConf(companyId, deptId);
        return depotConfMapper.selectList(queryWrapper);
    }

    /**
     * jpa更新保存配置信息
     * æ›´æ–°ä¿å­˜é…ç½®ä¿¡æ¯
     *
     * @param conf
     */
@@ -61,23 +66,31 @@
        }
        if (StringUtils.isEmpty(conf.getDeptId())) {
            conf.setDeptId(ContextUtil.subDeptId(null));
        }

        if (null == conf.getUpdateBy()) {
            conf.setCreateBy(ContextUtil.getLoginUserName());
            conf.setCreateTime(new Date());
        }

        conf.setUpdateBy(ContextUtil.getLoginUserName());
        conf.setUpdateTime(new Date());
        depotConfRepository.save(conf);
            depotConfMapper.insert(conf);
        }else {
            conf.setUpdateBy(ContextUtil.getLoginUserName());
            conf.setUpdateTime(new Date());
            depotConfMapper.updateById(conf);
        }
        flushConfCache(conf.getCompanyId());
    }

    /**
     * jpa删除配置信息
     * åˆ é™¤é…ç½®ä¿¡æ¯
     *
     * @param conf
     * @return
     */
    public void deleteDepotConf(DepotConf conf) {
        depotConfRepository.delete(conf);
        depotConfMapper.deleteById( conf);

        //删除配置缓存
        this.delCacheDepotConf(conf, conf.getCompanyId());
@@ -91,14 +104,8 @@
     */
    public void setCacheDepotConf(List<DepotConf> list, String companyId) {
        if (null != list) {
            Depot depot;
            String key;
            for (DepotConf depotConf : list) {
                depot = depotService.getCacheDepot(companyId, depotConf.getDepotId());
                if (null != depot) {
                    depotConf.setDepotName(depot.getName());
                    depotConf.setDepotType(depot.getDepotType());
                }
                key = RedisConst.buildKey(companyId, RedisConst.KEY_DEPOT_CONF, depotConf.getDepotId());
                redisCache.setCacheObject(key, depotConf);
            }
@@ -199,30 +206,11 @@
        String key = RedisConst.buildKey(companyId, RedisConst.KEY_DEPOT_CONF, depotId);
        DepotConf depotConf = redisCache.getCacheObject(key);
        if (null == depotConf) {
            depotConf = depotConfRepository.getDepotConfByDepotId(companyId, depotId);
            depotConf = depotConfMapper.selectById(depotId);
            redisCache.setCacheObject(key, depotConf);
        }

        return depotConf;
    }

    /**
     * æ ¹æ®ä»“库列表，自动生成仓库配置信息
     * @param companyId
     */
    private void addConfByDepot(String companyId) {
        List<Depot> list = depotService.getCacheDepotList(companyId);
        if (null == list || list.isEmpty()) {
            return;
        }
        DepotConf conf;
        for (Depot depot : list) {
            conf = new DepotConf();
            conf.setDepotId(depot.getId());
            conf.setCompanyId(depot.getCompanyId());
            conf.setDeptId(depot.getDeptId());
            this.saveConf(conf);
        }
    }

    /**
@@ -234,7 +222,7 @@
            companyId = ContextUtil.getCompanyId();
        }

        List<DepotConf> list = depotConfRepository.getDepotConfByCompanyId(companyId);
        List<DepotConf> list = this.getConfList(companyId, null);

        this.setCacheDepotConf(list, companyId);
    }
@@ -244,6 +232,8 @@
     * @param freq
     */
    public void updateFreq(String freq) {
        depotConfRepository.updateGrainFreq(ContextUtil.getCompanyId(), ContextUtil.subDeptId(null), freq);
        UpdateWrapper<DepotConf> updateWrapper = new UpdateWrapper<>();
        updateWrapper.eq("dept_id", ContextUtil.subDeptId(null)).set("pos_x", freq);
        depotConfMapper.update(null, updateWrapper);
    }
}

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

@@ -1,13 +1,13 @@
package com.fzzy.igds.service;

import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import com.fzzy.igds.constant.RedisConst;
import com.fzzy.igds.domain.Depot;
import com.fzzy.igds.domain.DepotStore;
import com.fzzy.igds.repository.DepotRepository;
import com.fzzy.igds.mapper.DepotMapper;
import com.fzzy.igds.utils.ContextUtil;
import com.ruoyi.common.core.redis.RedisCache;
import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.system.mapper.SysDeptMapper;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
@@ -23,41 +23,43 @@
public class DepotService {

    @Resource
    private DepotRepository depotRepository;
    private DepotMapper depotMapper;
    @Resource
    private RedisCache redisCache;

    /**
     * jpa查询仓库列表
     * æŸ¥è¯¢åº“区下仓库列表
     *
     * @param companyId
     * @param deptId
     * @param idDesc æ˜¯å¦ID倒序排列
     * @return
     */
    public List<Depot> getData(String companyId, String deptId) {

    public List<Depot> getData(String companyId, String deptId, boolean idDesc) {
        if (StringUtils.isEmpty(companyId)) {
            companyId = ContextUtil.getCompanyId();
        }
        if (StringUtils.isEmpty(deptId)) {
            deptId = ContextUtil.subDeptId(null);
        
        QueryWrapper<Depot> queryWrapper = new QueryWrapper<>();
        queryWrapper.eq("company_id", companyId);
        if(StringUtils.isNotBlank(deptId)){
            queryWrapper.eq("dept_id", deptId);
        }
        return depotRepository.getDepot(companyId, deptId);
        
        if(idDesc){
            //ID倒序
            queryWrapper.orderByDesc("id");
        }else {
            //序号正序
            queryWrapper.orderByAsc("order_num");
        }

        return depotMapper.selectList(queryWrapper);
    }

    /**
     * jpa查询仓库列表
     * @param ids
     * @return
     */
    public List<Depot> getDepotByIds(List<String> ids) {
        if (null == ids ||ids.isEmpty()) {
            return null;
        }
        return depotRepository.getDepotByIds(ids);
    }

    /**
     * jpa保存更新仓库信息
     * ä¿å­˜æ›´æ–°ä»“库信息
     *
     * @param depot
     */
    public void saveDepot(Depot depot) {
@@ -67,29 +69,32 @@
        if (StringUtils.isEmpty(depot.getDeptId())) {
            depot.setDeptId(ContextUtil.subDeptId(null));
        }
        //默认顺序号
        if (null == depot.getOrderNum()) {
            depot.setOrderNum(1);
        }
        //主键ID
        if (StringUtils.isEmpty(depot.getId())) {
            depot.setId(getStrId(depot.getDeptId()));
            depot.setCreateBy(ContextUtil.getLoginUserName());
            depot.setCreateTime(new Date());
        }
        //默认顺序号
        if(null == depot.getOrderNum()){
            depot.setOrderNum(1);
        }
            depotMapper.insert(depot);
        }else {
        depot.setUpdateBy(ContextUtil.getLoginUserName());
        depot.setUpdateTime(new Date());
        depotRepository.save(depot);
            depotMapper.updateById(depot);
        }
        flushCache(depot.getCompanyId());
    }

    /**
     * èŽ·å–主键ID
     *
     * @param deptId
     * @param deptId
     */
    public String getStrId(String deptId) {
        List<Depot> depots = depotRepository.getDepotMaxId(deptId);
        List<Depot> depots = this.getData(null, deptId, true);
        String oldOrderId = null;
        if(null != depots && depots.size() > 0){
            oldOrderId = depots.get(0).getId().substring(deptId.length());
@@ -98,7 +103,8 @@
    }

    /**
     * jpa更新仓库状态
     * æ›´æ–°ä»“库状态
     *
     * @param depotId
     * @param status
     */
@@ -106,15 +112,19 @@
        if (StringUtils.isEmpty(depotId)) {
            return;
        }
        depotRepository.updateDepotStatus(status, depotId);
        
        UpdateWrapper<Depot> updateWrapper = new UpdateWrapper<>();
        updateWrapper.eq("id", depotId).set("depot_status", status);
        depotMapper.update(null, updateWrapper);
    }

    /**
     * jpa删除仓库货位信息
     * åˆ é™¤ä»“库货位信息
     *
     * @param depot
     */
    public void deleteDepot(Depot depot) {
        depotRepository.delete(depot);
        depotMapper.deleteById(depot);

        //删除配置缓存
        this.delCacheDepot(depot, depot.getCompanyId());
@@ -122,6 +132,7 @@

    /**
     * åˆ·æ–°ä»“库货位缓存
     *
     * @param companyId
     */
    public void flushCache(String companyId) {
@@ -129,13 +140,14 @@
            companyId = ContextUtil.getCompanyId();
        }

        List<Depot> list = depotRepository.getDepotByCompanyId(companyId);
        List<Depot> list = this.getData(companyId,null, false);

        this.setCacheDepotList(list, companyId);
    }

    /**
     * è®¾ç½®ç¼“å­˜
     *
     * @param list
     * @param companyId
     */
@@ -150,6 +162,7 @@

    /**
     * åˆ é™¤ç¼“存信息
     *
     * @param depot
     * @param companyId
     */
@@ -166,6 +179,7 @@

    /**
     * èŽ·å–缓存-根据组织编码获取仓库集合
     *
     * @param companyId
     * @return
     */
@@ -186,7 +200,7 @@
        }
        //缓存获取为空，则查询数据库
        if(list.size() < 1){
            list = depotRepository.getDepotByCompanyId(companyId);
            list = this.getData(companyId,null, false);
            setCacheDepotList(list, companyId);
        }

@@ -197,6 +211,7 @@

    /**
     * èŽ·å–缓存-根据组织编码和库区编码获取仓库集合
     *
     * @param companyId
     * @param deptId
     * @return
@@ -222,6 +237,7 @@

    /**
     * èŽ·å–仓库信息-根据仓库编码获取缓存信息
     *
     * @param companyId
     * @param depotId
     * @return
@@ -236,34 +252,9 @@
        String key = RedisConst.buildKey(companyId, RedisConst.KEY_DEPOT, depotId);
        Depot depot = redisCache.getCacheObject(key);
        if(null == depot){
            depot = depotRepository.getDepotById(companyId, depotId);
            depot =  depotMapper.selectById(depotId);
            redisCache.setCacheObject(key, depot);
        }
        return depot;
    }

    /**
     * æ ¹æ®åº“存信息更新仓库信息
     * @param data
     */
    public void updateByStore(DepotStore data) {

        Depot depot = this.getCacheDepot(data.getCompanyId(), data.getDepotId());
        if (null == depot) {
            return;
        }

        depot.setStorageReal(data.getStorageReal());
        depot.setDepotStatus(data.getDepotStatus());
        depot.setFoodLevel(data.getFoodLevel());
        depot.setFoodLocation(data.getFoodLocation());
        depot.setFoodVariety(data.getFoodVariety());
        depot.setFoodType(data.getFoodType());
        depot.setFoodYear(data.getFoodYear());
        if (null != data.getStoreDate()) {
            depot.setStoreDate(data.getStoreDate());
        }

        this.saveDepot(depot);
    }
}

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

@@ -1,15 +1,17 @@
package com.fzzy.igds.service;

import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.fzzy.igds.data.IgdsBaseParam;
import com.fzzy.igds.domain.Depot;
import com.fzzy.igds.domain.DepotStore;
import com.fzzy.igds.repository.DepotRepository;
import com.fzzy.igds.repository.DepotStoreRepository;
import com.fzzy.igds.mapper.DepotMapper;
import com.fzzy.igds.mapper.DepotStoreMapper;
import com.fzzy.igds.utils.ContextUtil;
import com.ruoyi.common.utils.StringUtils;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.time.DateFormatUtils;
import org.springframework.data.domain.Page;
import org.springframework.data.domain.Pageable;
import org.springframework.data.jpa.domain.Specification;
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
import java.util.Date;
@@ -25,23 +27,33 @@
public class DepotStoreService {

    @Resource
    private DepotStoreRepository depotStoreRepository;
    private DepotStoreMapper depotStoreMapper;
    @Resource
    private DepotRepository depotRepository;
    private DepotMapper depotMapper;

    /**
     * JPA分页查询数据
     *
     * @param specification
     * @param pageable
     * @return
     */
    public Page<DepotStore> findAll(Specification<DepotStore> specification, Pageable pageable) {
        return depotStoreRepository.findAll(specification, pageable);
    public void listPageData(Page<DepotStore> page, IgdsBaseParam param) {
        QueryWrapper<DepotStore> queryWrapper = new QueryWrapper<>();

        param.setCompanyId(ContextUtil.getCompanyId());
        param.setDeptId(ContextUtil.subDeptId(null));
        queryWrapper.eq("company_id", param.getCompanyId());
        queryWrapper.eq("dept_id", param.getDeptId());

        if (StringUtils.isNotBlank(param.getName())) {
            queryWrapper.eq("depot_id", param.getName());
        }
        if (null != param.getStart()) {
            queryWrapper.ge("update_time", param.getStart());
        }
        if (null != param.getEnd()) {
            queryWrapper.le("update_time", param.getEnd());
        }

        depotStoreMapper.selectPage(page, queryWrapper);
    }

    /**
     * JPA更新保存数据
     * æ›´æ–°ä¿å­˜æ•°æ®
     *
     * @param data
     */
@@ -52,36 +64,48 @@
        if (StringUtils.isEmpty(data.getDeptId())) {
            data.setDeptId(ContextUtil.subDeptId(null));
        }
        data.setUpdateBy(ContextUtil.getLoginUserName());
        data.setUpdateTime(new Date());

        if (StringUtils.isEmpty(data.getId())) {
        data.setId(data.getDepotId() + "_" + DateFormatUtils.format(data.getStoreDate(), "yyyyMMddHHmmss") + "_" + DateFormatUtils.format(data.getUpdateTime(), "yyyyMMddHHmmss"));
        data.setCreateTime(new Date());
        data.setRemark("系统生成");

        depotStoreRepository.save(data);
            data.setUpdateBy(ContextUtil.getLoginUserName());
            data.setUpdateTime(new Date());
            depotStoreMapper.insert(data);
        }else{
            data.setUpdateBy(ContextUtil.getLoginUserName());
            data.setUpdateTime(new Date());
            depotStoreMapper.updateById(data);
        }
    }

    /**
     * JPA删除数据
     * åˆ é™¤æ•°æ®
     *
     * @param data
     * @return
     */
    public String delDepotStore(DepotStore data) {
        depotStoreRepository.delete(data);
        depotStoreMapper.deleteById(data);
        return null;
    }

    /**
     * JPA获取仓库最后一条库存数据
     * èŽ·å–仓库最后一条库存数据
     *
     * @param depotId
     * @param time
     * @return
     */
    public DepotStore getLastData(String depotId, Date time) {
        List<DepotStore> list = depotStoreRepository.getDataByDepotId(depotId, time);

        QueryWrapper<DepotStore> queryWrapper = new QueryWrapper<>();
        queryWrapper.eq("depot_id", depotId);
        queryWrapper.ge("create_time", time);
        queryWrapper.le("create_time", time);
        queryWrapper.orderByDesc("create_time");

        List<DepotStore> list = depotStoreMapper.selectList(queryWrapper);

        if (null == list || list.isEmpty()) {
            return null;
        }
@@ -92,12 +116,13 @@
        if (null == store.getUpdateTime()) store.setUpdateTime(new Date());
        if (null == store.getId()) store.setId(ContextUtil.generateId());

        depotStoreRepository.save(store);
        depotStoreMapper.insert(store);

        if (updateDepot) {
            depotRepository.updateDepotStorage(store.getStorageReal(), store.getDepotId());
            UpdateWrapper<Depot> updateWrapper = new UpdateWrapper<>();
            updateWrapper.eq("id", store.getDepotId()).set("storage_real", store.getStorageReal());
            depotMapper.update(null, updateWrapper);
        }
    }


}

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

@@ -1,15 +1,16 @@
package com.fzzy.igds.service;

import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import com.fzzy.igds.constant.RedisConst;
import com.fzzy.igds.data.DeviceIotParam;
import com.fzzy.igds.domain.DeviceIot;
import com.fzzy.igds.repository.DeviceIotRepository;
import com.fzzy.igds.mapper.DeviceIotMapper;
import com.fzzy.igds.utils.ContextUtil;
import com.ruoyi.common.core.redis.RedisCache;
import com.ruoyi.common.utils.StringUtils;
import lombok.extern.slf4j.Slf4j;
import org.springframework.data.domain.Page;
import org.springframework.data.domain.Pageable;
import org.springframework.data.jpa.domain.Specification;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
import java.util.*;
@@ -27,17 +28,46 @@
    @Resource
    private RedisCache redisCache;
    @Resource
    private DeviceIotRepository deviceIotRepository;
    private DeviceIotMapper deviceIotMapper;

    /**
     * JPA分页查询数据
     *
     * @param specification
     * @param pageable
     * @return
     * åˆ†é¡µæŸ¥è¯¢æ•°æ®
     * @param page
     * @param param
     */
    public Page<DeviceIot> findAll(Specification<DeviceIot> specification, Pageable pageable) {
        return deviceIotRepository.findAll(specification, pageable);
    public void listPageData(Page<DeviceIot> page, DeviceIotParam param) {
        QueryWrapper<DeviceIot> queryWrapper = new QueryWrapper<>();

        param.setCompanyId(ContextUtil.getCompanyId());
        param.setDeptId(ContextUtil.subDeptId(null));
        queryWrapper.eq("company_id", param.getCompanyId());
        queryWrapper.eq("dept_id", param.getDeptId());

        if (StringUtils.isNotBlank(param.getDepotId())) {
            queryWrapper.eq("depot_id", param.getDepotId());
        }
        if (StringUtils.isNotBlank(param.getType())) {
            queryWrapper.eq("type", param.getType());
        }
        if (StringUtils.isNotBlank(param.getSerId())) {
            queryWrapper.eq("ser_id", param.getSerId());
        }

        deviceIotMapper.selectPage(page, queryWrapper);
    }

    /**
     * æ ¹æ®æ¡ä»¶æŸ¥è¯¢
     * @param companyId
     */
    public List<DeviceIot> listData(String companyId) {
        QueryWrapper<DeviceIot> queryWrapper = new QueryWrapper<>();
        if (StringUtils.isEmpty(companyId)) {
            companyId = ContextUtil.getCompanyId();
        }
        queryWrapper.eq("company_id", companyId);

        return deviceIotMapper.selectList(queryWrapper);
    }

    /**
@@ -55,10 +85,14 @@
            deviceIot.setId(ContextUtil.generateId());
            deviceIot.setCreateBy(ContextUtil.getLoginUserName());
            deviceIot.setCreateTime(new Date());
        }
        deviceIot.setUpdateBy(ContextUtil.getLoginUserName());
        deviceIot.setUpdateTime(new Date());
        deviceIotRepository.save(deviceIot);
            deviceIotMapper.insert(deviceIot);
        }else {
            deviceIot.setUpdateBy(ContextUtil.getLoginUserName());
            deviceIot.setUpdateTime(new Date());
            deviceIotMapper.updateById(deviceIot);
        }
    }

    /**
@@ -66,7 +100,7 @@
     * @param deviceIot
     */
    public void delDepotDeviceIot(DeviceIot deviceIot) {
        deviceIotRepository.delete(deviceIot);
        deviceIotMapper.deleteById(deviceIot);
    }

    /**
@@ -77,7 +111,9 @@
     * @param posY
     */
    public void updatePos(String deviceId, Double posX, Double posY) {
        deviceIotRepository.updatePos(deviceId, posX, posY);
        UpdateWrapper<DeviceIot> updateWrapper = new UpdateWrapper<>();
        updateWrapper.eq("id", deviceId).set("pos_x", posX).set("pos_y", posY);
        deviceIotMapper.update(null, updateWrapper);
    }

    /**
@@ -89,7 +125,7 @@
            companyId = ContextUtil.getCompanyId();
        }
        // èŽ·å–所有的设备信息
        List<DeviceIot> listAll =deviceIotRepository.getDeviceIotByCompanyId(companyId);
        List<DeviceIot> listAll =this.listData(companyId);

        if (null != listAll) {
            this.setCacheAllDeviceIot(listAll, companyId);

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

@@ -1,9 +1,11 @@
package com.fzzy.igds.service;

import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import com.fzzy.igds.constant.Constant;
import com.fzzy.igds.constant.RedisConst;
import com.fzzy.igds.domain.DeviceSer;
import com.fzzy.igds.repository.DeviceSerRepository;
import com.fzzy.igds.mapper.DeviceSerMapper;
import com.fzzy.igds.utils.ContextUtil;
import com.ruoyi.common.core.domain.entity.SysDept;
import com.ruoyi.common.core.domain.entity.SysUser;
@@ -26,21 +28,37 @@
    @Resource
    private ISysDeptService iSysDeptService;
    @Resource
    private DeviceSerRepository deviceSerRepository;
    private DeviceSerMapper deviceSerMapper;
    @Resource
    private RedisCache redisCache;

    /**
     * JPA æŸ¥è¯¢åˆ†æœºåˆ—表
     * æ ¹æ®æ¡ä»¶æŸ¥è¯¢åˆ†æœºä¿¡æ¯
     *
     * @param companyId
     * @param deptId
     * @param parentId
     * @return
     */
    public List<DeviceSer> getAllSerByCompanyId(String companyId) {
        return deviceSerRepository.getAllSerByCompanyId(companyId);
    public List<DeviceSer> listDeviceSer(String companyId, String deptId, String parentId) {

        QueryWrapper<DeviceSer> queryWrapper = new QueryWrapper<>();

        if (StringUtils.isNotBlank(companyId)) {
            queryWrapper.eq("company_id", companyId);
        }
        if (StringUtils.isNotBlank(deptId)) {
            queryWrapper.eq("dept_id", deptId);
        }
        if (StringUtils.isNotBlank(parentId)) {
            queryWrapper.likeRight("dept_id", parentId);
        }

        return deviceSerMapper.selectList(queryWrapper);
    }

    /**
     * JPA æŸ¥è¯¢åˆ†æœºåˆ—表
     * æŸ¥è¯¢åˆ†æœºåˆ—表
     *
     * @return
     */
@@ -48,14 +66,15 @@
        SysUser user = ContextUtil.getLoginUser();
        SysDept userDept = iSysDeptService.selectDeptById(user.getDeptId());
        if (Constant.DEPT_TYPE_20.equals(userDept.getType())) {
            return deviceSerRepository.getDataByDeptId(user.getDeptId() + "");
            return this.listDeviceSer(null, user.getDeptId() + "", null);
        }else {
            return deviceSerRepository.getDataByParentId(user.getDeptId() + "%");
            return this.listDeviceSer(null, null, user.getDeptId() + "");
        }
    }


    /**
     * JPA æŸ¥è¯¢åˆ†æœº
     * æŸ¥è¯¢åˆ†æœº
     *
     * @param companyId
     * @param id
@@ -69,11 +88,16 @@
        if (StringUtils.isEmpty(companyId)) {
            companyId = ContextUtil.getCompanyId();
        }
        return deviceSerRepository.getDataById(companyId, id);

        QueryWrapper<DeviceSer> queryWrapper = new QueryWrapper<>();
        queryWrapper.eq("company_id", companyId);
        queryWrapper.eq("id", id);

        return deviceSerMapper.selectOne(queryWrapper);
    }

    /**
     * JPA æ›´æ–°ä¿å­˜åˆ†æœº
     * æ›´æ–°ä¿å­˜åˆ†æœº
     *
     * @param ser
     */
@@ -86,23 +110,32 @@
        }
        if (StringUtils.isEmpty(ser.getCompanyId())) {
            ser.setCompanyId(ContextUtil.getCompanyId());
        }
        if (StringUtils.isEmpty(ser.getDeptId())) {
            ser.setDeptId(ContextUtil.subDeptId(null));
        }
        if (StringUtils.isBlank(ser.getUpdateBy())) {
            ser.setCreateBy(ContextUtil.getLoginUserName());
            ser.setCreateTime(new Date());
        }

        ser.setUpdateBy(ContextUtil.getLoginUserName());
        ser.setUpdateTime(new Date());
        deviceSerRepository.save(ser);
            deviceSerMapper.insert(ser);
        } else {
            ser.setUpdateBy(ContextUtil.getLoginUserName());
            ser.setUpdateTime(new Date());
            deviceSerMapper.updateById(ser);
        }

        refreshCache(ser.getCompanyId());
    }

    /**
     * JPA æ›´æ–°ä¿å­˜åˆ†æœº
     * æ›´æ–°ä¿å­˜åˆ†æœº
     *
     * @param ser
     */
    public void delSer(DeviceSer ser) {
        deviceSerRepository.delete(ser);
        deviceSerMapper.deleteById(ser);

        //删除缓存
        delCache(ser.getCompanyId(), ser.getId());
@@ -111,6 +144,7 @@

    /**
     * æ›´æ–°åˆ†æœºä¿¡æ¯
     *
     * @param status
     * @param ip
     * @param port
@@ -124,12 +158,13 @@
        ser.setPort(port);
        ser.setUpdateTime(new Date());

        deviceSerRepository.save(ser);
        deviceSerMapper.updateById(ser);
        setCacheSer(ser);
    }

    /**
     * æ›´æ–°åˆ†æœºä¿¡æ¯
     *
     * @param data
     */
    public void updateByData(DeviceSer data) {
@@ -145,13 +180,14 @@
        ser.setPort(data.getPort());
        ser.setUpdateTime(new Date());
        ser.setSn(data.getSn());
        deviceSerRepository.save(ser);
        deviceSerMapper.updateById(ser);

        setCacheSer(ser);
    }

    /**
     * æ›´æ–°åˆ†æœºä¿¡æ¯
     *
     * @param companyId
     * @param serId
     * @param controlModel
@@ -166,7 +202,7 @@
        ser.setStatus(Constant.YN_Y);
        ser.setControlModel(controlModel);
        ser.setUpdateTime(new Date());
        deviceSerRepository.save(ser);
        deviceSerMapper.updateById(ser);

        setCacheSer(ser);
    }
@@ -180,7 +216,7 @@
        if (StringUtils.isEmpty(companyId)) {
            companyId = ContextUtil.getCompanyId();
        }
        List<DeviceSer> list = this.getAllSerByCompanyId(companyId);
        List<DeviceSer> list = this.listDeviceSer(companyId, null, null);
        this.setCacheSer(list, companyId);
    }

@@ -270,6 +306,7 @@

    /**
     * æ ¹æ®ç±»åž‹èŽ·å–分机信息
     *
     * @param companyId
     * @param type
     * @return
@@ -391,25 +428,33 @@
    }

    /**
     * JPA-更新设备全部离线
     * -更新设备全部离线
     *
     * @param companyId
     */
    public void allOffLine(String companyId) {
        if (StringUtils.isEmpty(companyId)) {
            companyId = ContextUtil.getCompanyId();
        }
        deviceSerRepository.updateSerStatus(companyId, Constant.YN_N);

        UpdateWrapper<DeviceSer> updateWrapper = new UpdateWrapper<>();
        updateWrapper.eq("company_id", companyId).set("status", Constant.YN_N);
        deviceSerMapper.update(null, updateWrapper);
    }

    /**
     * JPA-根据SN更新状态
     * -根据SN更新状态
     *
     * @param ip
     * @param port
     * @param sn
     * @param status
     */
    public void onlineBySn(String ip, Integer port, String sn, String status) {
        deviceSerRepository.updateBySn(ip, port, status, sn, new Date());

        UpdateWrapper<DeviceSer> updateWrapper = new UpdateWrapper<>();
        updateWrapper.eq("sn", sn).set("ip", ip).set("port", port).set("update_time", new Date());
        deviceSerMapper.update(null, updateWrapper);
    }

}

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

@@ -3,11 +3,8 @@
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.fzzy.igds.domain.DicArea;
import com.fzzy.igds.mapper.DicAreaMapper;
import com.fzzy.igds.repository.DicAreaRepository;
import com.ruoyi.common.utils.StringUtils;
import org.springframework.data.domain.Page;
import org.springframework.data.domain.Pageable;
import org.springframework.data.jpa.domain.Specification;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
import java.util.List;
@@ -17,67 +14,62 @@
 * @Author CZT
 * @Date 2025/11/25 16:23
 */
@Service("sys.dicAreaService")
@Service
public class DicAreaService {

    @Resource
    private DicAreaRepository dicAreaRepository;
    @Resource
    private DicAreaMapper dicAreaMapper;

    /**
     * JPA分页查询数据
     *
     * @param pageable
     */
    public Page<DicArea> findAll(Pageable pageable) {
        return dicAreaRepository.findAll(pageable);
    public void listPageData(Page<DicArea> page, String key) {

        QueryWrapper<DicArea> queryWrapper = new QueryWrapper<>();
        if (StringUtils.isNotBlank(key)) {
            queryWrapper.like("name", key);
        }

        dicAreaMapper.selectPage(page, queryWrapper);
    }

    /**
     * JPA分页查询数据
     *
     * @param specification
     * @param pageable
     * @return
     */
    public Page<DicArea> findAll(Specification<DicArea> specification, Pageable pageable) {
        return dicAreaRepository.findAll(specification, pageable);
    }

    /**
     * JPA根据父编码查询区域信息
     * æ ¹æ®çˆ¶ç¼–码查询区域信息
     *
     * @param parentCode
     * @return
     */
    public List<DicArea> getDicAreaByParentCode(String parentCode) {
        if(StringUtils.isEmpty(parentCode)){
            return dicAreaRepository.findAll();
    public List<DicArea> listData(String parentCode, String name, String code) {

        QueryWrapper<DicArea> queryWrapper = new QueryWrapper<>();
        if (StringUtils.isNotBlank(parentCode)) {
            queryWrapper.like("parent_code", parentCode);
        }
        return dicAreaRepository.getDicAreaByParentCode(parentCode);
        if (StringUtils.isNotBlank(name)) {
            queryWrapper.like("name", name);
        }
        if (StringUtils.isNotBlank(code)) {
            queryWrapper.like("code", code);
        }
        return dicAreaMapper.selectList(queryWrapper);
    }

    /**
     * JPA保存数据
     * ä¿å­˜æ•°æ®
     *
     * @param data
     * @return
     */
    public String saveDicArea(DicArea data) {
        dicAreaRepository.save(data);
        dicAreaMapper.insert( data);
        return null;
    }


    /**
     * JPA删除数据
     * åˆ é™¤æ•°æ®
     *
     * @param data
     * @return
     */
    public String delDicArea(DicArea data) {
        dicAreaRepository.delete(data);
        dicAreaMapper.deleteById(data);
        return null;
    }

@@ -88,7 +80,11 @@
     * @return
     */
    public DicArea listDicAreaByName(String name) {
        return dicAreaRepository.listDicAreaByName(name);
        List<DicArea> list = this.listData(null, name, null);
        if(null == list || list.isEmpty()){
            return null;
        }
        return list.get(0);
    }

    /**
@@ -98,9 +94,12 @@
     * @return
     */
    public DicArea listDicAreaByCode(String code) {
        return dicAreaRepository.listDicAreaByCode(code);
        List<DicArea> list = this.listData(null, null, code);
        if(null == list || list.isEmpty()){
            return null;
    }

        return list.get(0);
    }

    /**
     * æ¨¡ç³ŠæŸ¥è¯¢
@@ -109,16 +108,18 @@
     * @return
     */
    public List<DicArea> listDicArea(String key) {
        if(null == key){
            return dicAreaMapper.selectList(null);
        }


        QueryWrapper<DicArea> queryWrapper = new QueryWrapper<>();
        if(StringUtils.isNotEmpty(key)){
        if (StringUtils.isNotBlank(key)) {
            queryWrapper.like("name", key);
            queryWrapper.like("code", key);
        }
        return dicAreaMapper.selectList(queryWrapper);
        List<DicArea> dicAreas = dicAreaMapper.selectList(queryWrapper);

        if (null == dicAreas || dicAreas.isEmpty()) {
            queryWrapper = new QueryWrapper<>();
            queryWrapper.like("code", key);
            dicAreas = dicAreaMapper.selectList(queryWrapper);
        }
        return dicAreas;
    }
}

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

@@ -1,9 +1,11 @@
package com.fzzy.igds.service;

import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import com.fzzy.igds.constant.Constant;
import com.fzzy.igds.constant.RedisConst;
import com.fzzy.igds.repository.InoutConfRepository;
import com.fzzy.igds.repository.InoutSysConfRepository;
import com.fzzy.igds.mapper.InoutConfMapper;
import com.fzzy.igds.mapper.InoutSysConfMapper;
import com.fzzy.igds.domain.InoutConf;
import com.fzzy.igds.domain.InoutSysConf;
import com.fzzy.igds.utils.ContextUtil;
@@ -29,15 +31,38 @@
    @Resource
    private ISysDeptService iSysDeptService;
    @Resource
    private InoutSysConfRepository inoutSysConfRepository;
    private InoutConfMapper inoutConfMapper;
    @Resource
    private InoutConfRepository inoutConfRepository;
    private InoutSysConfMapper inoutSysConfMapper;
    @Resource
    private RedisCache redisCache;

    /*--------------- å‡ºå…¥åº“流程 ---------------*/

    /**
     * JPA-查询流程配置
     * æ ¹æ®æ¡ä»¶æŸ¥è¯¢æµç¨‹ä¿¡æ¯
     *
     * @param deptId
     * @param parentId
     * @return
     */
    public List<InoutSysConf> listInoutSysConf(String deptId, String parentId) {

        QueryWrapper<InoutSysConf> queryWrapper = new QueryWrapper<>();

        if (StringUtils.isNotBlank(deptId)) {
            queryWrapper.eq("dept_id", deptId);
        }

        if (StringUtils.isNotBlank(parentId)) {
            queryWrapper.likeRight("dept_id", parentId);
        }

        return inoutSysConfMapper.selectList(queryWrapper);
    }

    /**
     * æŸ¥è¯¢æµç¨‹é…ç½®
     *
     * @return
     */
@@ -46,15 +71,13 @@
        SysUser user = ContextUtil.getLoginUser();
        SysDept userDept = iSysDeptService.selectDeptById(user.getDeptId());
        if (Constant.DEPT_TYPE_20.equals(userDept.getType())) {
            return inoutSysConfRepository.getDataById(ContextUtil.subDeptId(user));
            return this.listInoutSysConf(ContextUtil.subDeptId(user), null);
        }else {
            return inoutSysConfRepository.getDataByParentId(user.getDeptId() + "%");
            return this.listInoutSysConf(null, user.getDeptId() + "%");
        }
    }

    /**
     *
     *
     * @param companyId
     * @param deptId
     */
@@ -70,15 +93,14 @@
    }

    /**
     *
     * @param deptId
     */
    public void delSysConfData(String deptId) {
        inoutSysConfRepository.deleteById(deptId);
        inoutSysConfMapper.deleteById(deptId);
    }

    /**
     * JPA-保存流程配置
     * ä¿å­˜æµç¨‹é…ç½®
     *
     * @param data
     * @return
@@ -87,9 +109,18 @@
        if (StringUtils.isEmpty(data.getCompanyId())) {
            data.setCompanyId(ContextUtil.getCompanyId());
        }
        if (StringUtils.isEmpty(data.getUpdateBy())) {
            data.setCreateBy(ContextUtil.getLoginUserName());
            data.setCreateTime(new Date());
        data.setUpdateBy(ContextUtil.getLoginUserName());
        data.setUpdateTime(new Date());
        inoutSysConfRepository.save(data);
            inoutSysConfMapper.insert(data);
        } else {
            data.setUpdateBy(ContextUtil.getLoginUserName());
            data.setUpdateTime(new Date());
            inoutSysConfMapper.updateById(data);
        }

        this.flushInoutSysConfCache(data);
    }

@@ -116,8 +147,9 @@
    }

    /*--------------- å‡ºå…¥åº“设备 ---------------*/

    /**
     * JPA-查询设备配置
     * æŸ¥è¯¢è®¾å¤‡é…ç½®
     *
     * @return
     */
@@ -128,50 +160,62 @@
        if (StringUtils.isEmpty(deptId)) {
            deptId = ContextUtil.subDeptId(null);
        }
        return inoutConfRepository.getInoutConfList(companyId, deptId);
        QueryWrapper<InoutConf> queryWrapper = new QueryWrapper<>();

        queryWrapper.eq("dept_id", deptId);
        queryWrapper.eq("company_id", companyId);

        return inoutConfMapper.selectList(queryWrapper);
    }

    /**
     * JPA-保存设备配置
     * ä¿å­˜è®¾å¤‡é…ç½®
     *
     * @param data
     * @return
     */
    public String saveData(InoutConf data) {
        if (0 == data.getInOrder()) {
            data.setInOrder(1);
        }
        if (StringUtils.isEmpty(data.getSort())) {
            data.setSort("1");
        }
        if (StringUtils.isEmpty(data.getId())) {
            data.setId(ContextUtil.generateId());
            data.setCreateBy(ContextUtil.getLoginUserName());
            data.setCreateTime(new Date());
        }
        if (StringUtils.isEmpty(data.getCompanyId())) {
            data.setCompanyId(ContextUtil.getCompanyId());
        }
        if (StringUtils.isEmpty(data.getDeptId())) {
            data.setDeptId(ContextUtil.subDeptId(null));
        }
        if (0 == data.getInOrder()) {
            data.setInOrder(1);
        }
        if (StringUtils.isEmpty(data.getSort())) {
            data.setSort("1");
        }
        if (StringUtils.isBlank(data.getId())) {
            data.setId(ContextUtil.generateId());
            data.setCreateBy(ContextUtil.getLoginUserName());
            data.setCreateTime(new Date());
        data.setUpdateBy(ContextUtil.getLoginUserName());
        data.setUpdateTime(new Date());
        inoutConfRepository.save(data);
            inoutConfMapper.insert(data);
        }else {
            data.setUpdateBy(ContextUtil.getLoginUserName());
            data.setUpdateTime(new Date());
            inoutConfMapper.updateById(data);
        }
        return null;
    }

    /**
     * JPA-删除设备配置
     * åˆ é™¤è®¾å¤‡é…ç½®
     *
     * @param data
     * @return
     */
    public String delData(InoutConf data) {
        inoutConfRepository.delete(data);
        inoutConfMapper.deleteById(data);
        return null;
    }

    /**
     * è®¾ç½®ç¼“å­˜
     *
     * @param companyId
     * @param deptId
     */
@@ -183,6 +227,7 @@

    /**
     * èŽ·å–缓存
     *
     * @param companyId
     * @param deptId
     * @return
@@ -199,6 +244,7 @@

    /**
     * èŽ·å–缓存
     *
     * @param companyId
     * @param deptId
     * @param confId
@@ -223,11 +269,15 @@

    /**
     * æ›´æ–°å‡ºå…¥åº“设备状态
     *
     * @param ip
     * @param port
     * @param status
     */
    public void updateInoutConfStatus(String ip, Integer port, String status) {
        inoutConfRepository.updateInoutConfStatus(status, ip, port);

        UpdateWrapper<InoutConf> updateWrapper = new UpdateWrapper<>();
        updateWrapper.eq("ip", ip).eq("port", port).set("status", status);
        inoutConfMapper.update(null, updateWrapper);
    }
}

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

@@ -1,8 +1,10 @@
package com.fzzy.igds.service;

import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import com.fzzy.igds.constant.RedisConst;
import com.fzzy.igds.domain.QuantityConf;
import com.fzzy.igds.repository.QuantityConfRepository;
import com.fzzy.igds.mapper.QuantityConfMapper;
import com.fzzy.igds.utils.ContextUtil;
import com.ruoyi.common.core.redis.RedisCache;
import com.ruoyi.common.utils.StringUtils;
@@ -24,12 +26,12 @@
public class QuantityService {

    @Resource
    private QuantityConfRepository quantityConfRepository;
    private QuantityConfMapper quantityConfMapper;
    @Resource
    private RedisCache redisCache;

    /**
     * JPA - æŸ¥è¯¢é…ç½®ä¿¡æ¯ï¼Œæ ¹æ®åº“区编码获取
     * æŸ¥è¯¢é…ç½®ä¿¡æ¯ï¼Œæ ¹æ®åº“区编码获取
     *
     * @param companyId
     * @param deptId
@@ -39,15 +41,22 @@
        if (StringUtils.isEmpty(companyId)) {
            companyId = ContextUtil.getCompanyId();
        }

        if (StringUtils.isEmpty(deptId)) {
            deptId = ContextUtil.subDeptId(null);
        }
        return quantityConfRepository.listQuantityConf(companyId, deptId);
        
        QueryWrapper<QuantityConf> queryWrapper = new QueryWrapper<>();
        queryWrapper.eq("company_id", companyId);
        if(StringUtils.isNotBlank(deptId)){
            queryWrapper.eq("dept_id", deptId);
        }
        queryWrapper.orderByAsc("order_num");

        return quantityConfMapper.selectList(queryWrapper);
    }

    /**
     * JPA - æŸ¥è¯¢é…ç½®ä¿¡æ¯ï¼Œæ ¹æ®ç»„织编码获取
     *  - æŸ¥è¯¢é…ç½®ä¿¡æ¯ï¼Œæ ¹æ®ç»„织编码获取
     *
     * @param companyId
     * @return
@@ -57,11 +66,11 @@
            companyId = ContextUtil.getCompanyId();
        }

        return quantityConfRepository.listQuantityConf(companyId);
        return this.getConfList(companyId, null);
    }

    /**
     * JPA - æ›´æ–°ä¿å­˜æ•°æ®
     *  - æ›´æ–°ä¿å­˜æ•°æ®
     *
     * @param conf
     */
@@ -69,41 +78,50 @@
        if (StringUtils.isEmpty(conf.getDepotId())) {
            return;
        }
        if (StringUtils.isEmpty(conf.getCompanyId())) {
        if (StringUtils.isBlank(conf.getCompanyId())) {
            conf.setCompanyId(ContextUtil.getCompanyId());
        }
        if (StringUtils.isEmpty(conf.getDeptId())) {
        if (StringUtils.isBlank(conf.getDeptId())) {
            conf.setDeptId(ContextUtil.subDeptId(null));
        }
        if (null == conf.getUpdateBy()) {
            conf.setCreateBy(ContextUtil.getLoginUserName());
            conf.setCreateTime(new Date());
        }
        conf.setUpdateBy(ContextUtil.getLoginUserName());
        conf.setUpdateTime(new Date());
        quantityConfRepository.save(conf);
            quantityConfMapper.insert(conf);
        }else {
            conf.setUpdateBy(ContextUtil.getLoginUserName());
            conf.setUpdateTime(new Date());
            quantityConfMapper.updateById(conf);
        }

        //刷新缓存
        setCacheQuantityConf(conf);
        this.setCacheQuantityConf(conf);
    }

    /**
     * JPA- æ›´æ–°é…ç½®å’‹æ··ä¸ªå¤ª
     * æ›´æ–°ä¿¡æ¯
     *
     * @param conf
     */
    public void updateQuantityConfBySn(QuantityConf conf) {
        //更新状态
        quantityConfRepository.updateConfStatus(conf.getIp(), conf.getPort(), conf.getStatus(), conf.getSn());

        setCacheQuantityConf(conf);
        UpdateWrapper<QuantityConf> updateWrapper = new UpdateWrapper<>();
        updateWrapper.eq("sn", conf.getSn()).set("ip", conf.getIp()).set("port", conf.getPort()).set("status", conf.getStatus());
        quantityConfMapper.update(null, updateWrapper);

        this.setCacheQuantityConf(conf);
    }

    /**
     * JPA - åˆ é™¤æ•°æ®
     *  - åˆ é™¤æ•°æ®
     *
     * @param conf
     * @return
     */
    public String delQuantityConf(QuantityConf conf) {
        quantityConfRepository.delete(conf);
        quantityConfMapper.deleteById(conf);
        //删除配置信息

        flushConfCache(conf.getCompanyId(), conf.getDeptId());

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

@@ -1,17 +1,16 @@
package com.fzzy.igds.service;

import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import com.fzzy.igds.constant.RedisConst;
import com.fzzy.igds.domain.Camera;
import com.fzzy.igds.repository.SecCameraRepository;
import com.fzzy.igds.mapper.CameraMapper;
import com.fzzy.igds.utils.ContextUtil;
import com.ruoyi.common.core.redis.RedisCache;
import com.ruoyi.common.utils.StringUtils;
import lombok.extern.slf4j.Slf4j;
import org.springframework.data.domain.Page;
import org.springframework.data.domain.Pageable;
import org.springframework.data.jpa.domain.Specification;
import org.springframework.stereotype.Service;

import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import javax.annotation.Resource;
import java.util.ArrayList;
import java.util.Date;
@@ -27,31 +26,54 @@
public class SecCameraService {

    @Resource
    private SecCameraRepository secCameraRepository;
    private CameraMapper cameraMapper;
    @Resource
    private RedisCache redisCache;

    /**
     * JPA分页查询数据
     *
     * @param specification
     * @param pageable
     * @return
     */
    public Page<Camera> findAll(Specification<Camera> specification, Pageable pageable) {
        return secCameraRepository.findAll(specification, pageable);
    public void listPageCamera(Page<Camera> page, Camera param) {
        QueryWrapper<Camera> queryWrapper = new QueryWrapper<>();

        param.setCompanyId(ContextUtil.getCompanyId());
        param.setDeptId(ContextUtil.subDeptId(null));
        queryWrapper.eq("company_id", param.getCompanyId());
        queryWrapper.eq("dept_id", param.getDeptId());

        if(StringUtils.isNotBlank(param.getName())){
            queryWrapper.like("name", param.getName());
        }
        if(StringUtils.isNotBlank(param.getBrand())){
            queryWrapper.eq("brand", param.getBrand());
        }
        if(StringUtils.isNotBlank(param.getSpjklx())){
            queryWrapper.eq("spjklx", param.getSpjklx());
        }
        if(StringUtils.isNotBlank(param.getSpdwlx())){
            queryWrapper.eq("spdwlx", param.getSpdwlx());
        }

        cameraMapper.selectPage(page, queryWrapper);
    }

    /**
     * JPA - æŸ¥è¯¢åº“区下所有监控
     * æŸ¥è¯¢åº“区下所有监控
     * @return
     */
    public List<Camera> listCamera() {
        return secCameraRepository.listCamera(ContextUtil.getCompanyId(), ContextUtil.subDeptId(null));
    public List<Camera> listCamera(String companyId, String deptId) {

        QueryWrapper<Camera> queryWrapper = new QueryWrapper<>();

        if(StringUtils.isNotBlank(companyId)){
            queryWrapper.eq("company_id", companyId);
        }
        if(StringUtils.isNotBlank(deptId)){
            queryWrapper.eq("dept_id", deptId);
        }

        return cameraMapper.selectList(queryWrapper);
    }

    /**
     * JPA - ä¿å­˜æ•°æ®
     * ä¿å­˜æ•°æ®
     * @param data
     */
    public void saveCamera(Camera data) {
@@ -71,16 +93,16 @@
        }
        data.setUpdateBy(ContextUtil.getLoginUserName());
        data.setUpdateTime(new Date());
        secCameraRepository.save(data);
        cameraMapper.insert(data);
    }

    /**
     * JPA - åˆ é™¤æ•°æ®
     * åˆ é™¤æ•°æ®
     * @param data
     * @return
     */
    public String delCamera(Camera data) {
        secCameraRepository.delete(data);
        cameraMapper.deleteById(data);
        return null;
    }

@@ -92,7 +114,7 @@
        if (StringUtils.isEmpty(companyId)) {
            companyId = ContextUtil.getCompanyId();
        }
        List<Camera> list = secCameraRepository.listCameraByCompanyId(companyId);
        List<Camera> list = this.listCamera(companyId,null);
        redisCache.setCacheObject(RedisConst.buildKey(companyId, RedisConst.KEY_CAMERA_LIST), list);
    }

@@ -109,7 +131,7 @@
        List<Camera> list =  redisCache.getCacheObject(key);

        if (null == list || list.isEmpty()) {
            list = secCameraRepository.listCameraByCompanyId(companyId);
            list = this.listCamera(companyId,null);
            redisCache.setCacheObject(key, list);
        }
        return list;
@@ -171,7 +193,9 @@
     * @param param
     */
    public void updatePos(Camera param) {
        secCameraRepository.updatePosById(param.getId(), param.getPosX(), param.getPosY());
        UpdateWrapper<Camera> updateWrapper = new UpdateWrapper<>();
        updateWrapper.eq("id", param.getId()).set("pos_x", param.getPosX()).set("pos_y", param.getPosY());
        cameraMapper.update(null, updateWrapper);
    }

}

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

@@ -4,6 +4,8 @@
import com.bstek.dorado.annotation.DataResolver;
import com.fzzy.igds.domain.Company;
import com.fzzy.igds.service.CoreCompanyService;
import com.fzzy.igds.utils.ContextUtil;
import com.ruoyi.common.core.domain.entity.SysUser;
import org.springframework.beans.BeanUtils;
import org.springframework.stereotype.Component;
import javax.annotation.Resource;
@@ -21,7 +23,7 @@
    private CoreCompanyService coreCompanyService;

    /**
     * æŸ¥è¯¢è®¾å¤‡,将操作信息调整为空，默认包括分库参数
     * èŽ·å–当前账号下属所有公司信息
     *
     * companyPR#getData
     *
@@ -29,8 +31,8 @@
     */
    @DataProvider
    public List<Company> getData() {

        return coreCompanyService.getDataByParentId();
        SysUser user = ContextUtil.getLoginUser();
        return coreCompanyService.listCompany(null, null, user.getDeptId() + "");
    }



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

@@ -5,6 +5,7 @@
import com.bstek.dorado.annotation.Expose;
import com.fzzy.igds.domain.DepotConf;
import com.fzzy.igds.service.DepotConfService;
import com.fzzy.igds.utils.ContextUtil;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.BeanUtils;
import org.springframework.stereotype.Component;
@@ -31,7 +32,7 @@
     */
    @DataProvider
    public List<DepotConf> getConfList() {
        return depotConfService.getConfList(null,null);
        return depotConfService.getConfList(null, ContextUtil.subDeptId(null));
    }

    /**

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

@@ -31,7 +31,7 @@
     */
    @DataProvider
    public List<Depot> getData(){
        return depotService.getData(null, null);
        return depotService.getData(null, ContextUtil.subDeptId(null) ,false);
    }

    /**

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

@@ -34,7 +34,7 @@
    @DataProvider
    public List<Dept> getAllData() {

        return coreDeptService.getAllDeptData();
        return coreDeptService.listDept(null,ContextUtil.getCompanyId(),null);
    }

    /**

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

@@ -158,13 +158,13 @@
          <Property name="width">160</Property>
        </DataColumn>
      </DataGrid>
    </Container>
    <Container layoutConstraint="bottom">
      <Property name="className">c-bottom</Property>
      <ToolBar layoutConstraint="bottom">
        <Fill/>
      <DataPilot layoutConstraint="right">
        <Property name="dataSet">dsDeviceIot</Property>
        <Property name="itemCodes">pageSize,pages</Property>
          <Property name="dataSet">dsDeviceIot</Property>
      </DataPilot>
      </ToolBar>
    </Container>
    <Dialog id="dialogDeviceIot" layout="regionPadding:8">
      <ClientEvent name="onHide">view.id(&quot;dsDeviceIot&quot;).getData().cancel();</ClientEvent>

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

@@ -6,26 +6,14 @@
import com.bstek.dorado.data.entity.EntityState;
import com.bstek.dorado.data.entity.EntityUtils;
import com.bstek.dorado.data.provider.Page;
import com.fzzy.igds.data.DeviceIotParam;
import com.fzzy.igds.domain.DeviceIot;
import com.fzzy.igds.service.DeviceIotService;
import com.fzzy.igds.utils.ContextUtil;
import com.ruoyi.common.utils.StringUtils;
import org.springframework.beans.BeanUtils;
import org.springframework.data.domain.PageRequest;
import org.springframework.data.domain.Pageable;
import org.springframework.data.domain.Sort;
import org.springframework.data.jpa.domain.Specification;
import org.springframework.stereotype.Component;
import org.springframework.transaction.annotation.Transactional;
import javax.annotation.Resource;
import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.CriteriaQuery;
import javax.persistence.criteria.Predicate;
import javax.persistence.criteria.Root;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;

/**
 * @Description
@@ -48,47 +36,17 @@
     * @return
     */
    @DataProvider
    public void loadDeviceIotPage(Page<DeviceIot> page, Map<String, Object> param) {
    public void loadDeviceIotPage(Page<DeviceIot> page, DeviceIotParam param) {
        com.baomidou.mybatisplus.extension.plugins.pagination.Page<DeviceIot> corePage = new com.baomidou.mybatisplus.extension.plugins.pagination.Page<>(page.getPageNo(), page.getPageSize());

        if (null == param) {
            param = new HashMap<>();
            param = new DeviceIotParam();
        }
        Map<String, Object> finalParam = param;
        deviceIotService.listPageData(corePage, param);

        //多参数分页查询
        Pageable pageable = PageRequest.of(page.getPageNo() - 1, page.getPageSize(), Sort.Direction.ASC, DeviceIot.SORT_PROP);
        Specification<DeviceIot> specification = new Specification<DeviceIot>() {
            private static final long serialVersionUID = 1L;

            public Predicate toPredicate(Root<DeviceIot> root, CriteriaQuery<?> query, CriteriaBuilder cb) {
                List<Predicate> predicates = new ArrayList<Predicate>(); //所有的断言

                Predicate predicate1 = cb.equal(root.get("companyId"), ContextUtil.getCompanyId());
                predicates.add(predicate1);
                predicate1 = cb.equal(root.get("deptId"), ContextUtil.subDeptId(null));
                predicates.add(predicate1);

                String key = (String) finalParam.get("depotId");
                if (StringUtils.isNotEmpty(key)) {
                    predicate1 = cb.equal(root.get("depotId"), key);
                    predicates.add(predicate1);
                }
                key = (String) finalParam.get("type");
                if (StringUtils.isNotEmpty(key)) {
                    predicate1 = cb.equal(root.get("type"), key);
                    predicates.add(predicate1);
                }
                key = (String) finalParam.get("serId");
                if (StringUtils.isNotEmpty(key)) {
                    predicate1 = cb.equal(root.get("serId"), key);
                    predicates.add(predicate1);
                }

                return cb.and(predicates.toArray(new Predicate[0]));
            }
        };
        org.springframework.data.domain.Page<DeviceIot> japPage = deviceIotService.findAll(specification, pageable);
        page.setEntityCount((int) japPage.getTotalElements());
        page.setEntities(japPage.getContent());
        // é‡æ–°å°è£…
        page.setEntities(corePage.getRecords());
        page.setEntityCount(Integer.parseInt(String.valueOf(corePage.getTotal())));
    }

    /**

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

@@ -108,13 +108,13 @@
          <Property name="name">remark</Property>
        </DataColumn>
      </DataGrid>
    </Container>
    <Container layoutConstraint="bottom">
      <Property name="className">c-bottom</Property>
      <ToolBar layoutConstraint="bottom">
        <Fill/>
      <DataPilot layoutConstraint="right">
        <Property name="dataSet">dsMain</Property>
        <Property name="itemCodes">pageSize,pages</Property>
          <Property name="dataSet">dsMain</Property>
      </DataPilot>
      </ToolBar>
    </Container>
    <Dialog id="dialogMain">
      <Property name="closeable">false</Property>

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

@@ -6,20 +6,10 @@
import com.bstek.dorado.data.provider.Page;
import com.fzzy.igds.domain.DicArea;
import com.fzzy.igds.service.DicAreaService;
import com.ruoyi.common.utils.StringUtils;
import org.springframework.beans.BeanUtils;
import org.springframework.data.domain.PageRequest;
import org.springframework.data.domain.Pageable;
import org.springframework.data.domain.Sort;
import org.springframework.data.jpa.domain.Specification;
import org.springframework.stereotype.Component;

import javax.annotation.Resource;
import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.CriteriaQuery;
import javax.persistence.criteria.Predicate;
import javax.persistence.criteria.Root;
import java.util.ArrayList;
import java.util.List;

/**
@@ -40,31 +30,14 @@
     */
    @DataProvider
    public void pageList(Page<DicArea> page, String key) {
        //多参数分页查询
        Pageable pageable = PageRequest.of(page.getPageNo() - 1, page.getPageSize(), Sort.Direction.ASC, DicArea.SORT_PROP);

        if (StringUtils.isEmpty(key)) {
            org.springframework.data.domain.Page<DicArea> japPage = dicAreaService.findAll(pageable);
            page.setEntityCount((int) japPage.getTotalElements());
            page.setEntities(japPage.getContent());
        com.baomidou.mybatisplus.extension.plugins.pagination.Page<DicArea> corePage = new com.baomidou.mybatisplus.extension.plugins.pagination.Page<>(page.getPageNo(), page.getPageSize());

            return;
        }
        Specification<DicArea> specification = new Specification<DicArea>() {
            private static final long serialVersionUID = 1L;
        dicAreaService.listPageData(corePage, key);

            public Predicate toPredicate(Root<DicArea> root, CriteriaQuery<?> query, CriteriaBuilder cb) {
                List<Predicate> predicates = new ArrayList<Predicate>(); //所有的断言

                Predicate predicate1 = cb.like(root.get("name"), "%" + key + "%");
                predicates.add(predicate1);

                return cb.and(predicates.toArray(new Predicate[0]));
            }
        };
        org.springframework.data.domain.Page<DicArea> japPage = dicAreaService.findAll(specification, pageable);
        page.setEntityCount((int) japPage.getTotalElements());
        page.setEntities(japPage.getContent());
        // é‡æ–°å°è£…
        page.setEntities(corePage.getRecords());
        page.setEntityCount(Integer.parseInt(String.valueOf(corePage.getTotal())));
    }

    /**
@@ -72,7 +45,7 @@
     */
    @DataProvider
    public List<DicArea> getDicAreaByParentCode(String parentCode) {
        return dicAreaService.getDicAreaByParentCode(parentCode);
        return dicAreaService.listData(parentCode, null, null);
    }

    /**

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

@@ -450,23 +450,8 @@
                <Editor/>
              </AutoFormElement>
              <AutoFormElement>
                <Property name="name">createBy</Property>
                <Property name="property">createBy</Property>
                <Editor/>
              </AutoFormElement>
              <AutoFormElement>
                <Property name="name">createTime</Property>
                <Property name="property">createTime</Property>
                <Editor/>
              </AutoFormElement>
              <AutoFormElement>
                <Property name="name">port</Property>
                <Property name="property">port</Property>
                <Editor/>
              </AutoFormElement>
              <AutoFormElement>
                <Property name="name">updateBy</Property>
                <Property name="property">updateBy</Property>
                <Editor/>
              </AutoFormElement>
              <AutoFormElement>
@@ -477,7 +462,7 @@
            </AutoForm>
          </Children>
        </FieldSet>
        <FieldSet layoutConstraint="padding:5">
        <FieldSet layout="padding:5">
          <Property name="caption">监控信息</Property>
          <Buttons/>
          <Children>
@@ -541,7 +526,7 @@
            </AutoForm>
          </Children>
        </FieldSet>
        <FieldSet layoutConstraint="padding:5">
        <FieldSet layout="padding:5">
          <Property name="caption">播放配置</Property>
          <Buttons/>
          <Children>

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

@@ -157,10 +157,6 @@
        <Property></Property>
        <Property name="label">备注信息</Property>
      </PropertyDef>
      <PropertyDef name="tag">
        <Property></Property>
        <Property name="label">标记</Property>
      </PropertyDef>
      <PropertyDef name="createTime">
        <Property name="dataType">DateTime</Property>
        <Property name="label">制单时间</Property>
@@ -236,7 +232,7 @@
        <Button>
          <ClientEvent name="onClick">var data = view.get(&quot;#dsQuery.data&quot;);&#xD;
            if(data){&#xD;
            view.get(&quot;#dsMain&quot;).set(&quot;parameter&quot;,data.toJSON()).flushAsync();&#xD;
            view.get(&quot;#dsMain&quot;).set(&quot;parameter&quot;,data).flushAsync();&#xD;
            }else{&#xD;
            view.get(&quot;#dsMain&quot;).flushAsync();&#xD;
            }</ClientEvent>
@@ -329,9 +325,8 @@
          <Property name="align">center</Property>
          <Property name="width">120</Property>
        </DataColumn>
        <DataColumn>
        <DataColumn name="customerName">
          <Property name="property">customerName</Property>
          <Property name="name">customerName</Property>
          <Property name="align">center</Property>
        </DataColumn>
        <DataColumn name="depotId">
@@ -390,7 +385,7 @@
      <Property name="iconClass">fa fa-tasks</Property>
      <Buttons>
        <Button id="btnOk">
          <ClientEvent name="onClick">view.get(&quot;#udpateSave&quot;).execute(function(result){&#xD;
          <ClientEvent name="onClick">view.get(&quot;#updateSave&quot;).execute(function(result){&#xD;
    if(result){&#xD;
        $alert(result);&#xD;
        return;&#xD;
@@ -560,10 +555,7 @@
      </Children>
      <Tools/>
    </Dialog>
    <AjaxAction id="ajaxSave">
      <Property name="service">inoutNoticePR#saveIn</Property>
    </AjaxAction>
    <UpdateAction id="udpateSave">
    <UpdateAction id="updateSave">
      <Property name="dataResolver">inoutNoticePR#saveIn</Property>
      <UpdateItem>
        <Property name="dataPath">[#current]</Property>

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

@@ -6,10 +6,12 @@
import com.fzzy.igds.domain.QuantityConf;
import com.fzzy.igds.service.DepotService;
import com.fzzy.igds.service.QuantityService;
import com.fzzy.igds.utils.ContextUtil;
import org.springframework.beans.BeanUtils;
import org.springframework.stereotype.Component;
import javax.annotation.Resource;
import java.util.List;

/**
 * @Description
 * @Author CZT
@@ -30,7 +32,7 @@
     */
    @DataProvider
    public List<QuantityConf> getConfList() {
        return quantityService.getConfList(null, null);
        return quantityService.getConfList(null, ContextUtil.subDeptId(null));
    }

    /**

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

@@ -571,7 +571,7 @@
        </AutoFormElement>
        <Button>
          <ClientEvent name="onClick">var param = view.get(&quot;#dsParam.data&quot;);&#xD;
view.get(&quot;#dsMain&quot;).set(&quot;parameter&quot;,param.toJSON()).flushAsync();</ClientEvent>
view.get(&quot;#dsMain&quot;).set(&quot;parameter&quot;,param).flushAsync();</ClientEvent>
          <Property name="caption">搜索</Property>
          <Property name="iconClass">fa fa-search</Property>
          <Property name="exClassName">btn-q1</Property>
@@ -705,13 +705,13 @@
          <Editor/>
        </DataColumn>
      </DataGrid>
    </Container>
    <Container layoutConstraint="bottom">
      <Property name="className">c-bottom</Property>
      <ToolBar layoutConstraint="bottom">
        <Fill/>
      <DataPilot layoutConstraint="right">
        <Property name="dataSet">dsMain</Property>
        <Property name="itemCodes">pageSize,pages</Property>
          <Property name="dataSet">dsMain</Property>
      </DataPilot>
      </ToolBar>
    </Container>
    <Dialog id="dialogMain" layout="regionPadding:8">
      <Property name="iconClass">fa fa-tasks</Property>
@@ -1199,9 +1199,5 @@
      </Children>
      <Tools/>
    </Dialog>
    <AjaxAction id="ajaxRemoteMedia">
      <Property name="confirmMessage">确定要同步么？</Property>
      <Property name="service">secCameraPR#flushByMedia</Property>
    </AjaxAction>
  </View>
</ViewConfig>

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

@@ -7,23 +7,11 @@
import com.fzzy.igds.domain.Camera;
import com.fzzy.igds.service.SecCameraService;
import com.fzzy.igds.utils.ContextUtil;
import com.ruoyi.common.utils.StringUtils;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.data.domain.PageRequest;
import org.springframework.data.domain.Pageable;
import org.springframework.data.domain.Sort;
import org.springframework.data.jpa.domain.Specification;
import org.springframework.stereotype.Component;
import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.CriteriaQuery;
import javax.persistence.criteria.Predicate;
import javax.persistence.criteria.Root;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;

/**
 * @Description
@@ -43,61 +31,19 @@
     * @param param
     */
    @DataProvider
    public void listPageCamera(Page<Camera> page, Map<String, Object> param) {
        org.springframework.data.domain.Page<Camera> japPage = pageCamera(page, param);
        page.setEntityCount((int) japPage.getTotalElements());
        page.setEntities(japPage.getContent());
    }
    public void listPageCamera(Page<Camera> page, Camera param) {
        com.baomidou.mybatisplus.extension.plugins.pagination.Page<Camera> corePage = new com.baomidou.mybatisplus.extension.plugins.pagination.Page<>(page.getPageNo(), page.getPageSize());

    public org.springframework.data.domain.Page<Camera> pageCamera(Page<Camera> page, Map<String, Object> param) {
        if (null == param) {
            param = new HashMap<>();
            param = new Camera();
        }
        Map<String, Object> finalParam = param;
        Camera camera = new Camera();
        BeanUtils.copyProperties(param, camera);
        secCameraService.listPageCamera(corePage, camera);

        //多参数分页查询
        Pageable pageable = PageRequest.of(page.getPageNo() - 1, page.getPageSize(), Sort.Direction.ASC, Camera.SORT_PROP);
        Specification<Camera> specification = new Specification<Camera>() {
            private static final long serialVersionUID = 1L;

            public Predicate toPredicate(Root<Camera> root, CriteriaQuery<?> query, CriteriaBuilder cb) {
                List<Predicate> predicates = new ArrayList<Predicate>(); //所有的断言

                Predicate predicate1 = cb.equal(root.get("companyId"), ContextUtil.getCompanyId());
                predicates.add(predicate1);
                Predicate predicate2 = cb.equal(root.get("deptId"), ContextUtil.subDeptId(null));
                predicates.add(predicate2);

                String key = (String) finalParam.get("bizType");
                if (StringUtils.isNotEmpty(key)) {
                    Predicate predicate3 = cb.equal(root.get("bizType"), key);
                    predicates.add(predicate3);
                }
                key = (String) finalParam.get("name");
                if (StringUtils.isNotEmpty(key)) {
                    Predicate predicate4 = cb.like(root.get("name"), "%" + key + "%");
                    predicates.add(predicate4);
                }
                key = (String) finalParam.get("brand");
                if (StringUtils.isNotEmpty(key)) {
                    Predicate predicate5 = cb.equal(root.get("brand"), key);
                    predicates.add(predicate5);
                }
                key = (String) finalParam.get("spjklx");
                if (StringUtils.isNotEmpty(key)) {
                    Predicate predicate5 = cb.equal(root.get("spjklx"), key);
                    predicates.add(predicate5);
                }
                key = (String) finalParam.get("spdwlx");
                if (StringUtils.isNotEmpty(key)) {
                    Predicate predicate5 = cb.equal(root.get("spdwlx"), key);
                    predicates.add(predicate5);
                }
                return cb.and(predicates.toArray(new Predicate[0]));
            }
        };
        org.springframework.data.domain.Page<Camera> japPage = secCameraService.findAll(specification, pageable);
        return japPage;
        // é‡æ–°å°è£…
        page.setEntities(corePage.getRecords());
        page.setEntityCount(Integer.parseInt(String.valueOf(corePage.getTotal())));
    }

    /**
@@ -107,7 +53,7 @@
     */
    @DataProvider
    public List<Camera> listCamera() {
        return secCameraService.listCamera();
        return secCameraService.listCamera(ContextUtil.getCompanyId(),ContextUtil.subDeptId(null));
    }

    /**
@@ -143,41 +89,6 @@
    public String refreshCache() {
        secCameraService.refreshCache(ContextUtil.getCompanyId());
        return null;
    }

    /***
     * securityPR#flushByMedia
     *
     * èŽ·å–摄像头列表信息
     * @return
     */
    @Expose
    public String flushByMedia(String playType) {

        if (null == playType){
            return "没有选择播放方式，执行失败";
        }

//        try {
//            if (CameraUtil.PLAY_TYPE_MEDIA_HIK.equals(playType)) {
//                ApiCameraData apiCameraData = new ApiCameraData();
//                apiCameraData.setCompanyId(ContextUtil.getCompanyId());
//                apiCameraData.setDeptId(ContextUtil.subDeptId(null));
//                apiCameraData.setPlayType(playType);
//                List<SecCameraDto> list = apiCameraManager.getApiCameraService(playType).searchCamera(apiCameraData);
//                if(list == null){
//                    return "同步失败！";
//                }else {
//                    return "同步成功！";
//                }
//            }
            return "当前播放方式没有此功能！";
//
//        }catch (Exception e){
//            log.error("-----同步摄像头列表失败-----原因={}", e.toString());
//            return "远程接口服务异常，请核查后重试！";
//        }

    }

}

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

@@ -25,6 +25,7 @@
    private CoreCompanyService companyService;
    @Resource
    private CoreDeptService deptService;

    /**
     * selectDeptPR#listCompany
     * æ ¹æ®è¡Œæ”¿åŒºåˆ’代码获取 ä¼ä¸šä¿¡æ¯åˆ—表
@@ -37,11 +38,11 @@
        SysUser user = ContextUtil.getLoginUser();

        if(FrameworkConfig.getCompanyId().equals(user.getCompanyId())){
            //系统监管账号
            return companyService.getAllData(user.getCompanyId());
            //系统监管账号，获取组织下所有公司信息
            return companyService.listCompany(null, user.getCompanyId(), null);
        }else {
            //收储公司账号
            return companyService.getDataById(user.getCompanyId());
            //收储公司账号，只获取当前公司信息
            return companyService.listCompany(user.getCompanyId(), null, null);
        }
    }

@@ -49,11 +50,11 @@
    /**
     * èŽ·å–公司下属库区列表
     * selectDeptPR#listArea
     * @param id
     * @param parentId
     * @return
     */
    @DataProvider
    public List<Dept> listArea(String id){
        return deptService.getDataByParentId(id);
    public List<Dept> listArea(String parentId){
        return deptService.listDept(null,null, parentId);
    }
}

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

@@ -919,12 +919,17 @@
    <PropertyDef name="companyId">
      <Property/>
    </PropertyDef>
    <PropertyDef name="depotId">
      <Property/>
    </PropertyDef>
    <PropertyDef name="deptId">
      <Property/>
    </PropertyDef>
    <PropertyDef name="depotId">
      <Property/>
      <Property name="label">装卸仓库</Property>
      <Property name="mapping">
        <Property name="mapValues">${dorado.getDataProvider(&quot;depotPR#getAllCache&quot;).getResult()}</Property>
        <Property name="keyProperty">id</Property>
        <Property name="valueProperty">name</Property>
      </Property>
    </PropertyDef>
    <PropertyDef name="customerName">
      <Property/>
@@ -933,6 +938,11 @@
    <PropertyDef name="foodVariety">
      <Property/>
      <Property name="label">粮食品种</Property>
      <Property name="mapping">
        <Property name="mapValues">${dorado.getDataProvider(&quot;dicPR#sysDictData&quot;).getResult(&quot;FOOD_VARIETY_&quot;)}</Property>
        <Property name="keyProperty">dictValue</Property>
        <Property name="valueProperty">dictLabel</Property>
      </Property>
    </PropertyDef>
    <PropertyDef name="contractId">
      <Property/>
@@ -958,6 +968,22 @@
    <PropertyDef name="completeStatus">
      <Property/>
      <Property name="label">完成状态</Property>
      <Property name="mapping">
        <Property name="mapValues">
          <Collection>
            <Entity>
              <Property name="name">未完成</Property>
              <Property name="code">NONE</Property>
            </Entity>
            <Entity>
              <Property name="name">已完成</Property>
              <Property name="code">COMPLETE</Property>
            </Entity>
          </Collection>
        </Property>
        <Property name="keyProperty">code</Property>
        <Property name="valueProperty">name</Property>
      </Property>
    </PropertyDef>
    <PropertyDef name="storageReal">
      <Property name="dataType">Double</Property>

 fzzy-igdss-web/src/main/java/com/fzzy/sys/controller/system/SysDeptNewController.java

@@ -85,11 +85,11 @@
        if(i > 0){
            if (Constant.DEPT_TYPE_10.equals(dept.getType())) {
                //新增公司信息
                coreCompanyService.saveOrUpdate(dept);
                coreCompanyService.saveOrUpdate(dept, true);
            }
            if (Constant.DEPT_TYPE_20.equals(dept.getType())) {
                //新增库区信息
                coreDeptService.saveOrUpdate(dept);
                coreDeptService.saveOrUpdate(dept, true);
            }
        }
        return toAjax(i);
@@ -132,11 +132,11 @@
        if(i > 0){
            if (Constant.DEPT_TYPE_10.equals(dept.getType())) {
                //新增公司信息
                coreCompanyService.saveOrUpdate(dept);
                coreCompanyService.saveOrUpdate(dept, false);
            }
            if (Constant.DEPT_TYPE_20.equals(dept.getType())) {
                //新增库区信息
                coreDeptService.saveOrUpdate(dept);
                coreDeptService.saveOrUpdate(dept, false);
            }
        }
        return toAjax(i);