From 096296cd7485c5583c8194d88cca700e3c4d84a0 Mon Sep 17 00:00:00 2001
From: czt <czt18638530771@163.com>
Date: 星期一, 01 十二月 2025 16:50:42 +0800
Subject: [PATCH] 调整基础配置信息查询方式，取消jpa
---
fzzy-igdss-view/src/main/java/com/fzzy/igds/SelectDeptPR.java | 15
fzzy-igdss-core/src/main/java/com/fzzy/igds/data/IgdsBaseParam.java | 6
fzzy-igdss-view/src/main/java/models/core.model.xml | 32 +
fzzy-igdss-core/src/main/java/com/fzzy/igds/mapper/DepotMapper.java | 15
fzzy-igdss-core/src/main/java/com/fzzy/igds/service/DepotConfService.java | 70 +-
fzzy-igdss-core/src/main/java/com/fzzy/igds/service/DicAreaService.java | 91 +-
fzzy-igdss-core/src/main/java/com/fzzy/igds/service/DeviceIotService.java | 72 +
fzzy-igdss-core/src/main/java/com/fzzy/igds/service/QuantityService.java | 58 +
fzzy-igdss-view/src/main/java/com/fzzy/igds/CompanyPR.java | 8
fzzy-igdss-core/src/main/java/com/fzzy/igds/mapper/CameraMapper.java | 16
fzzy-igdss-view/src/main/java/com/fzzy/igds/InoutNoticeIn.view.xml | 16
fzzy-igdss-core/src/main/java/com/fzzy/igds/mapper/InoutSysConfMapper.java | 15
fzzy-igdss-core/src/main/java/com/fzzy/igds/mapper/DepotConfMapper.java | 15
fzzy-igdss-view/src/main/java/com/fzzy/igds/QuantityConfPR.java | 4
fzzy-igdss-view/src/main/java/com/fzzy/igds/SecCameraPR.java | 111 ---
fzzy-igdss-core/src/main/java/com/fzzy/igds/domain/InoutConf.java | 6
fzzy-igdss-core/src/main/java/com/fzzy/igds/domain/Camera.java | 8
fzzy-igdss-core/src/main/java/com/fzzy/igds/domain/Dept.java | 4
fzzy-igdss-core/src/main/java/com/fzzy/igds/domain/QuantityConf.java | 5
fzzy-igdss-core/src/main/java/com/fzzy/igds/mapper/DeviceSerMapper.java | 15
fzzy-igdss-core/src/main/java/com/fzzy/igds/mapper/CoreCompanyMapper.java | 16
fzzy-igdss-view/src/main/java/com/fzzy/igds/SecCamera.view.xml | 20
fzzy-igdss-core/src/main/java/com/fzzy/igds/domain/Depot.java | 60 --
fzzy-igdss-core/src/main/java/com/fzzy/igds/service/DeviceSerService.java | 99 ++
fzzy-igdss-core/src/main/java/com/fzzy/igds/mapper/DeviceIotMapper.java | 15
fzzy-igdss-core/src/main/java/com/fzzy/igds/service/CoreDeptService.java | 81 +-
fzzy-igdss-core/src/main/java/com/fzzy/igds/service/InoutConfService.java | 126 +++-
fzzy-igdss-web/src/main/java/com/fzzy/sys/controller/system/SysDeptNewController.java | 8
fzzy-igdss-core/src/main/java/com/fzzy/igds/service/DepotService.java | 131 ++--
fzzy-igdss-core/src/main/java/com/fzzy/igds/mapper/InoutConfMapper.java | 15
fzzy-igdss-core/src/main/java/com/fzzy/igds/service/CoreCompanyService.java | 80 +-
fzzy-igdss-view/src/main/java/com/fzzy/igds/DepotConfPR.java | 3
fzzy-igdss-view/src/main/java/com/fzzy/igds/DeviceIotPR.java | 62 -
fzzy-igdss-core/src/main/java/com/fzzy/igds/mapper/DepotStoreMapper.java | 15
fzzy-igdss-core/src/main/java/com/fzzy/igds/service/DepotStoreService.java | 89 ++-
fzzy-igdss-view/src/main/java/com/fzzy/igds/DicArea.view.xml | 14
fzzy-igdss-core/src/main/java/com/fzzy/igds/mapper/QuantityConfMapper.java | 15
fzzy-igdss-view/src/main/java/com/fzzy/igds/InoutConf.view.xml | 19
/dev/null | 51 -
fzzy-igdss-view/src/main/java/com/fzzy/igds/DepotPR.java | 2
fzzy-igdss-view/src/main/java/com/fzzy/igds/DeviceIot.view.xml | 14
fzzy-igdss-core/src/main/java/com/fzzy/igds/data/DeviceIotParam.java | 25
fzzy-igdss-core/src/main/java/com/fzzy/igds/service/SecCameraService.java | 74 +
fzzy-igdss-view/src/main/java/com/fzzy/igds/DeptPR.java | 2
fzzy-igdss-view/src/main/java/com/fzzy/igds/DicAreaPR.java | 39 -
fzzy-igdss-core/src/main/java/com/fzzy/igds/domain/DepotConf.java | 8
fzzy-igdss-core/src/main/java/com/fzzy/igds/mapper/CoreDeptMapper.java | 15
47 files changed, 899 insertions(+), 781 deletions(-)
diff --git a/fzzy-igdss-core/src/main/java/com/fzzy/igds/data/DeviceIotParam.java b/fzzy-igdss-core/src/main/java/com/fzzy/igds/data/DeviceIotParam.java
new file mode 100644
index 0000000..27b1ec2
--- /dev/null
+++ b/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;
+
+}
diff --git a/fzzy-igdss-core/src/main/java/com/fzzy/igds/data/IgdsBaseParam.java b/fzzy-igdss-core/src/main/java/com/fzzy/igds/data/IgdsBaseParam.java
index 36fac62..3db8abe 100644
--- a/fzzy-igdss-core/src/main/java/com/fzzy/igds/data/IgdsBaseParam.java
+++ b/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;
diff --git a/fzzy-igdss-core/src/main/java/com/fzzy/igds/domain/Camera.java b/fzzy-igdss-core/src/main/java/com/fzzy/igds/domain/Camera.java
index 93199b3..6822cc6 100644
--- a/fzzy-igdss-core/src/main/java/com/fzzy/igds/domain/Camera.java
+++ b/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;//娴佸獟浣揑frame鎾斁鍦板潃
-
- @Transient
- private String msg;
}
diff --git a/fzzy-igdss-core/src/main/java/com/fzzy/igds/domain/Depot.java b/fzzy-igdss-core/src/main/java/com/fzzy/igds/domain/Depot.java
index 08bfe24..2052502 100644
--- a/fzzy-igdss-core/src/main/java/com/fzzy/igds/domain/Depot.java
+++ b/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;
- }
}
diff --git a/fzzy-igdss-core/src/main/java/com/fzzy/igds/domain/DepotConf.java b/fzzy-igdss-core/src/main/java/com/fzzy/igds/domain/DepotConf.java
index ceb2be3..43b0d38 100644
--- a/fzzy-igdss-core/src/main/java/com/fzzy/igds/domain/DepotConf.java
+++ b/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;
-
}
diff --git a/fzzy-igdss-core/src/main/java/com/fzzy/igds/domain/Dept.java b/fzzy-igdss-core/src/main/java/com/fzzy/igds/domain/Dept.java
index d46a60f..ce248a9 100644
--- a/fzzy-igdss-core/src/main/java/com/fzzy/igds/domain/Dept.java
+++ b/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;
-
}
\ No newline at end of file
diff --git a/fzzy-igdss-core/src/main/java/com/fzzy/igds/domain/InoutConf.java b/fzzy-igdss-core/src/main/java/com/fzzy/igds/domain/InoutConf.java
index d2f50ff..7b401e6 100644
--- a/fzzy-igdss-core/src/main/java/com/fzzy/igds/domain/InoutConf.java
+++ b/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) {
diff --git a/fzzy-igdss-core/src/main/java/com/fzzy/igds/domain/QuantityConf.java b/fzzy-igdss-core/src/main/java/com/fzzy/igds/domain/QuantityConf.java
index e99f75f..4c47634 100644
--- a/fzzy-igdss-core/src/main/java/com/fzzy/igds/domain/QuantityConf.java
+++ b/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;
}
diff --git a/fzzy-igdss-core/src/main/java/com/fzzy/igds/mapper/CameraMapper.java b/fzzy-igdss-core/src/main/java/com/fzzy/igds/mapper/CameraMapper.java
new file mode 100644
index 0000000..091edb0
--- /dev/null
+++ b/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> {
+
+}
diff --git a/fzzy-igdss-core/src/main/java/com/fzzy/igds/mapper/CoreCompanyMapper.java b/fzzy-igdss-core/src/main/java/com/fzzy/igds/mapper/CoreCompanyMapper.java
new file mode 100644
index 0000000..0b6d531
--- /dev/null
+++ b/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> {
+
+}
diff --git a/fzzy-igdss-core/src/main/java/com/fzzy/igds/mapper/CoreDeptMapper.java b/fzzy-igdss-core/src/main/java/com/fzzy/igds/mapper/CoreDeptMapper.java
new file mode 100644
index 0000000..b089ea2
--- /dev/null
+++ b/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> {
+
+}
diff --git a/fzzy-igdss-core/src/main/java/com/fzzy/igds/mapper/DepotConfMapper.java b/fzzy-igdss-core/src/main/java/com/fzzy/igds/mapper/DepotConfMapper.java
new file mode 100644
index 0000000..bff135a
--- /dev/null
+++ b/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> {
+
+}
diff --git a/fzzy-igdss-core/src/main/java/com/fzzy/igds/mapper/DepotMapper.java b/fzzy-igdss-core/src/main/java/com/fzzy/igds/mapper/DepotMapper.java
new file mode 100644
index 0000000..2790ffa
--- /dev/null
+++ b/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> {
+
+}
diff --git a/fzzy-igdss-core/src/main/java/com/fzzy/igds/mapper/DepotStoreMapper.java b/fzzy-igdss-core/src/main/java/com/fzzy/igds/mapper/DepotStoreMapper.java
new file mode 100644
index 0000000..b04550d
--- /dev/null
+++ b/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> {
+
+}
diff --git a/fzzy-igdss-core/src/main/java/com/fzzy/igds/mapper/DeviceIotMapper.java b/fzzy-igdss-core/src/main/java/com/fzzy/igds/mapper/DeviceIotMapper.java
new file mode 100644
index 0000000..b35db3c
--- /dev/null
+++ b/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> {
+
+}
diff --git a/fzzy-igdss-core/src/main/java/com/fzzy/igds/mapper/DeviceSerMapper.java b/fzzy-igdss-core/src/main/java/com/fzzy/igds/mapper/DeviceSerMapper.java
new file mode 100644
index 0000000..d379a77
--- /dev/null
+++ b/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> {
+
+}
diff --git a/fzzy-igdss-core/src/main/java/com/fzzy/igds/mapper/InoutConfMapper.java b/fzzy-igdss-core/src/main/java/com/fzzy/igds/mapper/InoutConfMapper.java
new file mode 100644
index 0000000..64bc108
--- /dev/null
+++ b/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> {
+
+}
diff --git a/fzzy-igdss-core/src/main/java/com/fzzy/igds/mapper/InoutSysConfMapper.java b/fzzy-igdss-core/src/main/java/com/fzzy/igds/mapper/InoutSysConfMapper.java
new file mode 100644
index 0000000..3625eca
--- /dev/null
+++ b/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> {
+
+}
diff --git a/fzzy-igdss-core/src/main/java/com/fzzy/igds/mapper/QuantityConfMapper.java b/fzzy-igdss-core/src/main/java/com/fzzy/igds/mapper/QuantityConfMapper.java
new file mode 100644
index 0000000..6a3e5ac
--- /dev/null
+++ b/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> {
+
+}
diff --git a/fzzy-igdss-core/src/main/java/com/fzzy/igds/repository/CompanyRepository.java b/fzzy-igdss-core/src/main/java/com/fzzy/igds/repository/CompanyRepository.java
deleted file mode 100644
index b023463..0000000
--- a/fzzy-igdss-core/src/main/java/com/fzzy/igds/repository/CompanyRepository.java
+++ /dev/null
@@ -1,46 +0,0 @@
-package com.fzzy.igds.repository;
-
-import com.fzzy.igds.domain.Company;
-import org.springframework.data.jpa.repository.JpaRepository;
-import org.springframework.data.jpa.repository.Query;
-import org.springframework.data.repository.query.Param;
-import org.springframework.stereotype.Service;
-
-import java.util.List;
-
-/**
- * @Description
- * @Author CZT
- * @Date 2025/11/26 15:48
- */
-@Service
-public interface CompanyRepository extends JpaRepository<Company, String> {
-
- /**
- * 鏍规嵁id鑾峰彇淇℃伅
- *
- * @param id
- * @return
- */
- @Query("from Company where id =:id order by id")
- List<Company> getDataById(@Param("id") String id);
-
-
- /**
- * 鏍规嵁companyId鑾峰彇淇℃伅
- *
- * @param parentId
- * @return
- */
- @Query("from Company where id like:parentId order by id")
- List<Company> getDataByParentId(@Param("parentId") String parentId);
-
- /**
- * 鏍规嵁companyId鑾峰彇淇℃伅
- *
- * @param companyId
- * @return
- */
- @Query("from Company where companyId =:companyId order by id")
- List<Company> getAllData(@Param("companyId") String companyId);
-}
diff --git a/fzzy-igdss-core/src/main/java/com/fzzy/igds/repository/DepotConfRepository.java b/fzzy-igdss-core/src/main/java/com/fzzy/igds/repository/DepotConfRepository.java
deleted file mode 100644
index 8090d33..0000000
--- a/fzzy-igdss-core/src/main/java/com/fzzy/igds/repository/DepotConfRepository.java
+++ /dev/null
@@ -1,56 +0,0 @@
-package com.fzzy.igds.repository;
-
-import com.fzzy.igds.domain.DepotConf;
-import org.springframework.data.jpa.repository.JpaRepository;
-import org.springframework.data.jpa.repository.Modifying;
-import org.springframework.data.jpa.repository.Query;
-import org.springframework.data.repository.query.Param;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-
-import java.util.List;
-
-/**
- * @Description
- * @Author CZT
- * @Date 2025/11/28 15:38
- */
-@Service
-public interface DepotConfRepository extends JpaRepository<DepotConf, String> {
-
- /**
- * 鏍规嵁缁勭粐缂栫爜鑾峰彇浠撳簱璐т綅淇℃伅
- *
- * @param companyId
- * @return
- */
- @Query("from DepotConf where companyId =:companyId order by depotId")
- List<DepotConf> getDepotConfByCompanyId(@Param("companyId") String companyId);
-
- /**
- * 鏍规嵁缁勭粐缂栫爜鍜屽簱鍖虹紪鐮佽幏鍙栦粨搴撹揣浣嶄俊鎭�
- *
- * @param companyId
- * @param deptId
- * @return
- */
- @Query("from DepotConf where companyId =:companyId and deptId =:deptId order by depotId")
- List<DepotConf> getDepotConf(@Param("companyId") String companyId, @Param("deptId") String deptId);
-
-
- /**
- * 鏍规嵁缁勭粐缂栫爜鍜屼粨搴撶紪鐮佽幏鍙栦粨搴撹揣浣嶄俊鎭�
- * @param companyId
- * @param depotId
- * @return
- */
- @Query("from DepotConf where companyId =:companyId and depotId =:depotId")
- DepotConf getDepotConfByDepotId(@Param("companyId") String companyId, @Param("depotId") String depotId);
-
-
- @Transactional
- @Modifying
- @Query("update DepotConf set grainFreq=:grainFreq where companyId=:companyId and deptId =:deptId")
- int updateGrainFreq(@Param("grainFreq") String grainFreq, @Param("companyId") String companyId, @Param("deptId") String deptId);
-
-}
diff --git a/fzzy-igdss-core/src/main/java/com/fzzy/igds/repository/DepotRepository.java b/fzzy-igdss-core/src/main/java/com/fzzy/igds/repository/DepotRepository.java
deleted file mode 100644
index 1d06005..0000000
--- a/fzzy-igdss-core/src/main/java/com/fzzy/igds/repository/DepotRepository.java
+++ /dev/null
@@ -1,87 +0,0 @@
-package com.fzzy.igds.repository;
-
-import com.fzzy.igds.domain.Depot;
-import org.springframework.data.jpa.repository.JpaRepository;
-import org.springframework.data.jpa.repository.Modifying;
-import org.springframework.data.jpa.repository.Query;
-import org.springframework.data.repository.query.Param;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-
-import java.util.List;
-
-/**
- * @Description
- * @Author CZT
- * @Date 2025/11/27 13:39
- */
-@Service
-public interface DepotRepository extends JpaRepository<Depot, String> {
-
- /**
- * 鏍规嵁缁勭粐缂栫爜鑾峰彇浠撳簱璐т綅淇℃伅
- *
- * @param companyId
- * @return
- */
- @Query("from Depot where companyId =:companyId order by orderNum")
- List<Depot> getDepotByCompanyId(@Param("companyId") String companyId);
-
- /**
- * 鏍规嵁缁勭粐缂栫爜鍜屽簱鍖虹紪鐮佽幏鍙栦粨搴撹揣浣嶄俊鎭�
- *
- * @param companyId
- * @param deptId
- * @return
- */
- @Query("from Depot where companyId =:companyId and deptId =:deptId order by orderNum")
- List<Depot> getDepot(@Param("companyId") String companyId, @Param("deptId") String deptId);
-
- /**
- * 鏍规嵁缁勭粐缂栫爜鍜屼粨搴撶紪鐮佽幏鍙栦粨搴撹揣浣嶄俊鎭�
- * @param companyId
- * @param id
- * @return
- */
- @Query("from Depot where companyId =:companyId and id =:id")
- Depot getDepotById(@Param("companyId") String companyId, @Param("id") String id);
-
-
- /**
- * 鏇存柊浠撳簱鐘舵��
- * @param status
- * @param depotId
- */
- @Transactional
- @Modifying
- @Query("update Depot set depotStatus =:status where id =:depotId")
- void updateDepotStatus(@Param("status") String status, @Param("depotId") String depotId);
-
- /**
- * 鏍规嵁ids鑾峰彇浠撳簱
- *
- * @param list
- * @return
- */
- @Query("from Depot where id IN :list order by orderNum")
- List<Depot> getDepotByIds(@Param("list") List<String> list);
-
- /**
- * 鏇存柊浠撳簱鍌ㄩ噺
- * @param weight
- * @param depotId
- */
- @Transactional
- @Modifying
- @Query("update Depot set storageReal =:weight where id =:depotId")
- void updateDepotStorage(@Param("weight") Double weight, @Param("depotId") String depotId);
-
- /**
- * 鑾峰彇搴撳尯涓嬫渶澶т粨搴撶紪鐮�
- *
- * @param deptId
- * @return
- */
- @Query("from Depot where deptId =:deptId order by id")
- List<Depot> getDepotMaxId(@Param("deptId") String deptId);
-}
diff --git a/fzzy-igdss-core/src/main/java/com/fzzy/igds/repository/DepotStoreRepository.java b/fzzy-igdss-core/src/main/java/com/fzzy/igds/repository/DepotStoreRepository.java
deleted file mode 100644
index 7dfb4a6..0000000
--- a/fzzy-igdss-core/src/main/java/com/fzzy/igds/repository/DepotStoreRepository.java
+++ /dev/null
@@ -1,30 +0,0 @@
-package com.fzzy.igds.repository;
-
-import com.fzzy.igds.domain.DepotStore;
-import org.springframework.data.jpa.repository.JpaRepository;
-import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
-import org.springframework.data.jpa.repository.Query;
-import org.springframework.data.repository.query.Param;
-import org.springframework.stereotype.Service;
-
-import java.util.Date;
-import java.util.List;
-
-/**
- * @Description
- * @Author CZT
- * @Date 2025/11/27 13:44
- */
-@Service
-public interface DepotStoreRepository extends JpaRepository<DepotStore, String>, JpaSpecificationExecutor<DepotStore> {
-
- /**
- * 鏍规嵁浠撳簱缂栫爜鑾峰彇鏈�鍚庝竴鏉℃暟鎹�
- * @param depotId
- * @param end
- * @return
- */
- @Query("from DepotStore where depotId =:depotId and createDate <:end order by createDate desc")
- List<DepotStore> getDataByDepotId(@Param("depotId") String depotId,@Param("end") Date end);
-
-}
diff --git a/fzzy-igdss-core/src/main/java/com/fzzy/igds/repository/DeptRepository.java b/fzzy-igdss-core/src/main/java/com/fzzy/igds/repository/DeptRepository.java
deleted file mode 100644
index 63e7f04..0000000
--- a/fzzy-igdss-core/src/main/java/com/fzzy/igds/repository/DeptRepository.java
+++ /dev/null
@@ -1,45 +0,0 @@
-package com.fzzy.igds.repository;
-
-import com.fzzy.igds.domain.Dept;
-import org.springframework.data.jpa.repository.JpaRepository;
-import org.springframework.data.jpa.repository.Query;
-import org.springframework.data.repository.query.Param;
-import org.springframework.stereotype.Service;
-
-import java.util.List;
-
-/**
- * @Description
- * @Author CZT
- * @Date 2025/11/26 15:48
- */
-@Service
-public interface DeptRepository extends JpaRepository<Dept, String> {
-
- /**
- * 鏍规嵁id鑾峰彇淇℃伅
- *
- * @param parentId
- * @return
- */
- @Query("from Dept where id like:parentId order by id")
- List<Dept> getDataByParentId(@Param("parentId") String parentId);
-
- /**
- * 鏍规嵁companyId鑾峰彇淇℃伅
- *
- * @param id
- * @return
- */
- @Query("from Dept where id =:id order by id")
- List<Dept> getDataById(@Param("id") String id);
-
- /**
- * 鏍规嵁companyId鑾峰彇淇℃伅
- *
- * @param companyId
- * @return
- */
- @Query("from Dept where companyId =:companyId order by id")
- List<Dept> getAllData(@Param("companyId") String companyId);
-}
diff --git a/fzzy-igdss-core/src/main/java/com/fzzy/igds/repository/DeviceIotRepository.java b/fzzy-igdss-core/src/main/java/com/fzzy/igds/repository/DeviceIotRepository.java
deleted file mode 100644
index 98d1329..0000000
--- a/fzzy-igdss-core/src/main/java/com/fzzy/igds/repository/DeviceIotRepository.java
+++ /dev/null
@@ -1,41 +0,0 @@
-package com.fzzy.igds.repository;
-
-import com.fzzy.igds.domain.DeviceIot;
-import org.springframework.data.jpa.repository.JpaRepository;
-import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
-import org.springframework.data.jpa.repository.Modifying;
-import org.springframework.data.jpa.repository.Query;
-import org.springframework.data.repository.query.Param;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-
-import java.util.List;
-
-/**
- * @Description
- * @Author CZT
- * @Date 2025/11/28 14:42
- */
-@Service
-public interface DeviceIotRepository extends JpaRepository<DeviceIot, String>, JpaSpecificationExecutor<DeviceIot> {
-
- /**
- * 鏍规嵁缁勭粐缂栫爜鑾峰彇浠撳簱璐т綅淇℃伅
- *
- * @param companyId
- * @return
- */
- @Query("from DeviceIot where companyId =:companyId order by id")
- List<DeviceIot> getDeviceIotByCompanyId(@Param("companyId") String companyId);
-
- /**
- * 鏇存柊璁惧浣嶇疆
- * @param deviceId
- * @param posX
- * @param posY
- */
- @Transactional
- @Modifying
- @Query("update DeviceIot set posX =:posX,posY =:posY where id =:deviceId")
- void updatePos(@Param("deviceId") String deviceId, @Param("posX") Double posX, @Param("posY") Double posY);
-}
diff --git a/fzzy-igdss-core/src/main/java/com/fzzy/igds/repository/DeviceSerRepository.java b/fzzy-igdss-core/src/main/java/com/fzzy/igds/repository/DeviceSerRepository.java
deleted file mode 100644
index b95db69..0000000
--- a/fzzy-igdss-core/src/main/java/com/fzzy/igds/repository/DeviceSerRepository.java
+++ /dev/null
@@ -1,82 +0,0 @@
-package com.fzzy.igds.repository;
-
-import com.fzzy.igds.domain.DeviceSer;
-import org.springframework.data.jpa.repository.JpaRepository;
-import org.springframework.data.jpa.repository.Modifying;
-import org.springframework.data.jpa.repository.Query;
-import org.springframework.data.repository.query.Param;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-
-import java.util.Date;
-import java.util.List;
-
-/**
- * @Description
- * @Author CZT
- * @Date 2025/11/28 13:48
- */
-@Service
-public interface DeviceSerRepository extends JpaRepository<DeviceSer, String> {
-
- /**
- * 鏍规嵁缁勭粐缂栫爜鑾峰彇淇℃伅
- *
- * @param companyId
- * @return
- */
- @Query("from DeviceSer where companyId =:companyId order by orderNum")
- List<DeviceSer> getAllSerByCompanyId(@Param("companyId") String companyId);
-
- /**
- * 鏍规嵁缁勭粐缂栫爜鑾峰彇浠撳簱璐т綅淇℃伅
- *
- * @param deptId
- * @return
- */
- @Query("from DeviceSer where deptId =:deptId order by orderNum")
- List<DeviceSer> getDataByDeptId(@Param("deptId") String deptId);
-
-
- /**
- * 鑾峰彇涓嬪睘鍒嗘満淇℃伅
- *
- * @param parentId
- * @return
- */
- @Query("from DeviceSer where deptId like:parentId order by orderNum")
- List<DeviceSer> getDataByParentId(@Param("parentId") String parentId);
-
-
- /**
- * 鏍规嵁缁勭粐缂栫爜鑾峰彇浠撳簱璐т綅淇℃伅
- *
- * @param companyId
- * @return
- */
- @Query("from DeviceSer where companyId =:companyId and id =:id order by orderNum")
- DeviceSer getDataById(@Param("companyId") String companyId, @Param("id") String id);
-
- /**
- * 鏇存柊鍒嗘満鐘舵��
- * @param companyId
- * @param status
- */
- @Transactional
- @Modifying
- @Query("update DeviceSer set status =:status where companyId =:companyId")
- void updateSerStatus(@Param("companyId") String companyId, @Param("status") String status);
-
- /**
- * 鏍规嵁SN鏇存柊鐘舵��
- * @param ip
- * @param port
- * @param status
- * @param sn
- * @param updateTime
- */
- @Transactional
- @Modifying
- @Query("update DeviceSer set status =:status,ip =:ip,port =:port,updateTime =:updateTime where sn =:sn")
- void updateBySn(@Param("ip") String ip, @Param("port") Integer port,@Param("status") String status,@Param("sn") String sn,@Param("updateTime") Date updateTime);
-}
diff --git a/fzzy-igdss-core/src/main/java/com/fzzy/igds/repository/DicAreaRepository.java b/fzzy-igdss-core/src/main/java/com/fzzy/igds/repository/DicAreaRepository.java
deleted file mode 100644
index bd01a83..0000000
--- a/fzzy-igdss-core/src/main/java/com/fzzy/igds/repository/DicAreaRepository.java
+++ /dev/null
@@ -1,47 +0,0 @@
-package com.fzzy.igds.repository;
-
-import com.fzzy.igds.domain.DicArea;
-import org.springframework.data.jpa.repository.JpaRepository;
-import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
-import org.springframework.data.jpa.repository.Query;
-import org.springframework.data.repository.query.Param;
-import org.springframework.stereotype.Service;
-
-import java.util.List;
-
-/**
- * @Description
- * @Author CZT
- * @Date 2025/11/25 16:23
- */
-@Service
-public interface DicAreaRepository extends JpaRepository<DicArea, String>, JpaSpecificationExecutor<DicArea> {
-
- /**
- * 鏍规嵁鐖剁紪鐮佹煡璇㈠尯鍩熶俊鎭�
- *
- * @param parentCode
- * @return
- */
- @Query("from DicArea where parentCode =:parentCode order by code")
- List<DicArea> getDicAreaByParentCode(@Param("parentCode") String parentCode);
-
- /**
- * 鏍规嵁鍚嶇О鑾峰彇鍖哄煙淇℃伅
- *
- * @param name
- * @return
- */
- @Query("from DicArea where name =:name order by code")
- DicArea listDicAreaByName(@Param("name") String name);
-
- /**
- * 鏍规嵁code鑾峰彇鍖哄煙淇℃伅
- *
- * @param code
- * @return
- */
- @Query("from DicArea where code =:code order by code")
- DicArea listDicAreaByCode(@Param("code") String code);
-
-}
diff --git a/fzzy-igdss-core/src/main/java/com/fzzy/igds/repository/InoutConfRepository.java b/fzzy-igdss-core/src/main/java/com/fzzy/igds/repository/InoutConfRepository.java
deleted file mode 100644
index 4f16d63..0000000
--- a/fzzy-igdss-core/src/main/java/com/fzzy/igds/repository/InoutConfRepository.java
+++ /dev/null
@@ -1,41 +0,0 @@
-package com.fzzy.igds.repository;
-
-import com.fzzy.igds.domain.InoutConf;
-import org.springframework.data.jpa.repository.JpaRepository;
-import org.springframework.data.jpa.repository.Modifying;
-import org.springframework.data.jpa.repository.Query;
-import org.springframework.data.repository.query.Param;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-
-import java.util.List;
-
-/**
- * @Description
- * @Author CZT
- * @Date 2025/11/27 20:23
- */
-@Service
-public interface InoutConfRepository extends JpaRepository<InoutConf, String> {
-
- /**
- * 鏍规嵁缁勭粐缂栫爜鍜屽簱鍖虹紪鐮佽幏鍙栦俊鎭�
- *
- * @param companyId
- * @param deptId
- * @return
- */
- @Query("from InoutConf where companyId =:companyId and deptId =:deptId order by sort,inoutProgress")
- List<InoutConf> getInoutConfList(@Param("companyId") String companyId, @Param("deptId") String deptId);
-
- /**
- * 鏇存柊鐘舵��
- * @param status
- * @param ip
- * @param port
- */
- @Transactional
- @Modifying
- @Query("update InoutConf set status =:status where ip =:ip and port =:port")
- void updateInoutConfStatus(@Param("status") String status, @Param("ip") String ip, @Param("port") Integer port);
-}
diff --git a/fzzy-igdss-core/src/main/java/com/fzzy/igds/repository/InoutSysConfRepository.java b/fzzy-igdss-core/src/main/java/com/fzzy/igds/repository/InoutSysConfRepository.java
deleted file mode 100644
index 68de24c..0000000
--- a/fzzy-igdss-core/src/main/java/com/fzzy/igds/repository/InoutSysConfRepository.java
+++ /dev/null
@@ -1,48 +0,0 @@
-package com.fzzy.igds.repository;
-
-import com.fzzy.igds.domain.InoutSysConf;
-import org.springframework.data.jpa.repository.JpaRepository;
-import org.springframework.data.jpa.repository.Query;
-import org.springframework.data.repository.query.Param;
-import org.springframework.stereotype.Service;
-
-import java.util.List;
-
-/**
- * @Description
- * @Author CZT
- * @Date 2025/11/27 20:23
- */
-@Service
-public interface InoutSysConfRepository extends JpaRepository<InoutSysConf, String> {
-
- /**
- * 鏍规嵁缁勭粐缂栫爜鍜屽簱鍖虹紪鐮佽幏鍙栦俊鎭�
- *
- * @param companyId
- * @param deptId
- * @return
- */
- @Query("from InoutSysConf where companyId =:companyId and deptId =:deptId")
- InoutSysConf getInoutSysConf(@Param("companyId") String companyId, @Param("deptId") String deptId);
-
-
- /**
- * 鏍规嵁id鑾峰彇淇℃伅
- *
- * @param parentId
- * @return
- */
- @Query("from InoutSysConf where deptId like:parentId order by deptId")
- List<InoutSysConf> getDataByParentId(@Param("parentId") String parentId);
-
- /**
- * 鏍规嵁companyId鑾峰彇淇℃伅
- *
- * @param companyId
- * @return
- */
- @Query("from InoutSysConf where deptId =:id order by deptId")
- List<InoutSysConf> getDataById(@Param("id") String id);
-
-}
diff --git a/fzzy-igdss-core/src/main/java/com/fzzy/igds/repository/QuantityConfRepository.java b/fzzy-igdss-core/src/main/java/com/fzzy/igds/repository/QuantityConfRepository.java
deleted file mode 100644
index 3897304..0000000
--- a/fzzy-igdss-core/src/main/java/com/fzzy/igds/repository/QuantityConfRepository.java
+++ /dev/null
@@ -1,53 +0,0 @@
-package com.fzzy.igds.repository;
-
-import com.fzzy.igds.domain.QuantityConf;
-import org.springframework.data.jpa.repository.JpaRepository;
-import org.springframework.data.jpa.repository.Modifying;
-import org.springframework.data.jpa.repository.Query;
-import org.springframework.data.repository.query.Param;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-
-import java.util.List;
-
-/**
- * @Description
- * @Author CZT
- * @Date 2025/11/28 16:52
- */
-@Service
-public interface QuantityConfRepository extends JpaRepository<QuantityConf, String> {
-
-
- /**
- * 鏍规嵁缁勭粐缂栫爜鍜屽簱鍖虹紪鐮佽幏鍙栦粨搴撹揣浣嶄俊鎭�
- *
- * @param companyId
- * @param deptId
- * @return
- */
- @Query("from QuantityConf where companyId =:companyId and deptId =:deptId order by depotId")
- List<QuantityConf> listQuantityConf(@Param("companyId") String companyId, @Param("deptId") String deptId);
-
- /**
- * 鏍规嵁缁勭粐缂栫爜鑾峰彇浠撳簱璐т綅淇℃伅
- *
- * @param companyId
- * @return
- */
- @Query("from QuantityConf where companyId =:companyId order by depotId")
- List<QuantityConf> listQuantityConf(@Param("companyId") String companyId);
-
-
- /**
- * 鏇存柊閰嶇疆鐘舵��
- * @param ip
- * @param port
- * @param status
- * @param sn
- */
- @Transactional
- @Modifying
- @Query("update QuantityConf set ip =:ip,port =:port,status =:status where sn =:sn")
- void updateConfStatus(@Param("ip") String ip, @Param("port") Integer port, @Param("status") String status, @Param("sn") String sn);
-}
diff --git a/fzzy-igdss-core/src/main/java/com/fzzy/igds/repository/SecCameraRepository.java b/fzzy-igdss-core/src/main/java/com/fzzy/igds/repository/SecCameraRepository.java
deleted file mode 100644
index 4b5ab43..0000000
--- a/fzzy-igdss-core/src/main/java/com/fzzy/igds/repository/SecCameraRepository.java
+++ /dev/null
@@ -1,51 +0,0 @@
-package com.fzzy.igds.repository;
-
-import com.fzzy.igds.domain.Camera;
-import org.springframework.data.jpa.repository.JpaRepository;
-import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
-import org.springframework.data.jpa.repository.Modifying;
-import org.springframework.data.jpa.repository.Query;
-import org.springframework.data.repository.query.Param;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-
-import java.util.List;
-
-/**
- * @Description
- * @Author CZT
- * @Date 2025/11/28 10:48
- */
-@Service
-public interface SecCameraRepository extends JpaRepository<Camera, String> , JpaSpecificationExecutor<Camera> {
-
- /**
- * 鏍规嵁缁勭粐缂栫爜鍜屽簱鍖虹紪鐮佽幏鍙栦俊鎭�
- *
- * @param companyId
- * @param deptId
- * @return
- */
- @Query("from Camera where companyId =:companyId and deptId =:deptId order by orderNum")
- List<Camera> listCamera(@Param("companyId") String companyId, @Param("deptId") String deptId);
-
- /**
- * 鏍规嵁缁勭粐缂栫爜鍜屽簱鍖虹紪鐮佽幏鍙栦俊鎭�
- *
- * @param companyId
- * @return
- */
- @Query("from Camera where companyId =:companyId order by orderNum")
- List<Camera> listCameraByCompanyId(@Param("companyId") String companyId);
-
- /**
- * 鏇存柊璁惧浣嶇疆
- * @param id
- * @param posX
- * @param posY
- */
- @Transactional
- @Modifying
- @Query("update Camera set posX =:posX,posY =:posY where id =:id")
- void updatePosById(@Param("id") String id, @Param("posX") Double posX, @Param("posY") Double posY);
-}
diff --git a/fzzy-igdss-core/src/main/java/com/fzzy/igds/service/CoreCompanyService.java b/fzzy-igdss-core/src/main/java/com/fzzy/igds/service/CoreCompanyService.java
index 965f11c..5923d64 100644
--- a/fzzy-igdss-core/src/main/java/com/fzzy/igds/service/CoreCompanyService.java
+++ b/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<>();
- /**
- * jpa鏌ヨ鍏徃淇℃伅
- * @return
- */
- public List<Company> getAllData(String companyId) {
-
- if (StringUtils.isEmpty(companyId)) {
- companyId = ContextUtil.getCompanyId();
+ if(StringUtils.isNotBlank(id)){
+ queryWrapper.eq("id", id);
}
- return companyRepository.getAllData(companyId);
+ 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> 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());
-
- this.update(company);
+ 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);
}
}
\ No newline at end of file
diff --git a/fzzy-igdss-core/src/main/java/com/fzzy/igds/service/CoreDeptService.java b/fzzy-igdss-core/src/main/java/com/fzzy/igds/service/CoreDeptService.java
index 9a33407..eefcd8d 100644
--- a/fzzy-igdss-core/src/main/java/com/fzzy/igds/service/CoreDeptService.java
+++ b/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<>();
- /**
- * jpa鏌ヨ淇℃伅
- * @return
- */
- public List<Dept> getAllDeptData() {
- return deptRepository.getAllData(ContextUtil.getCompanyId());
+ 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 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());
-
- this.update(dept);
-
- //鐢熸垚鍑哄叆搴撴祦绋嬮厤缃俊鎭�
- inoutConfService.initSysConfData(sysDept.getCompanyId(), dept.getId());
+ if (isAdd) {
+ this.save(dept);
+ }else {
+ this.update(dept);
+ }
}
/**
- * 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);
diff --git a/fzzy-igdss-core/src/main/java/com/fzzy/igds/service/DepotConfService.java b/fzzy-igdss-core/src/main/java/com/fzzy/igds/service/DepotConfService.java
index 1dcfdd3..f4a075c 100644
--- a/fzzy-igdss-core/src/main/java/com/fzzy/igds/service/DepotConfService.java
+++ b/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());
+ depotConfMapper.insert(conf);
+ }else {
+ conf.setUpdateBy(ContextUtil.getLoginUserName());
+ conf.setUpdateTime(new Date());
+ depotConfMapper.updateById(conf);
}
- conf.setUpdateBy(ContextUtil.getLoginUserName());
- conf.setUpdateTime(new Date());
- depotConfRepository.save(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);
}
}
diff --git a/fzzy-igdss-core/src/main/java/com/fzzy/igds/service/DepotService.java b/fzzy-igdss-core/src/main/java/com/fzzy/igds/service/DepotService.java
index 36fbb15..6142cb8 100644
--- a/fzzy-igdss-core/src/main/java/com/fzzy/igds/service/DepotService.java
+++ b/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,38 +69,42 @@
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());
+ depotMapper.insert(depot);
+ }else {
+ depot.setUpdateBy(ContextUtil.getLoginUserName());
+ depot.setUpdateTime(new Date());
+ depotMapper.updateById(depot);
}
- //榛樿椤哄簭鍙�
- if(null == depot.getOrderNum()){
- depot.setOrderNum(1);
- }
- depot.setUpdateBy(ContextUtil.getLoginUserName());
- depot.setUpdateTime(new Date());
- depotRepository.save(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){
+ if (null != depots && depots.size() > 0) {
oldOrderId = depots.get(0).getId().substring(deptId.length());
}
return deptId + ContextUtil.getOrderId(oldOrderId, 3);
}
/**
- * 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
*/
@@ -157,7 +170,7 @@
if (null == depot) {
return;
}
- if(StringUtils.isEmpty(companyId)){
+ if (StringUtils.isEmpty(companyId)) {
companyId = ContextUtil.getCompanyId();
}
String key = RedisConst.buildKey(companyId, RedisConst.KEY_DEPOT, depot.getId());
@@ -166,11 +179,12 @@
/**
* 鑾峰彇缂撳瓨-鏍规嵁缁勭粐缂栫爜鑾峰彇浠撳簱闆嗗悎
+ *
* @param companyId
* @return
*/
public List<Depot> getCacheDepotList(String companyId) {
- if(StringUtils.isEmpty(companyId)){
+ if (StringUtils.isEmpty(companyId)) {
companyId = ContextUtil.getCompanyId();
}
String patten = RedisConst.buildKey(companyId, RedisConst.KEY_DEPOT) + "*";
@@ -185,8 +199,8 @@
list.add((Depot) redisCache.getCacheObject(key));
}
//缂撳瓨鑾峰彇涓虹┖锛屽垯鏌ヨ鏁版嵁搴�
- if(list.size() < 1){
- list = depotRepository.getDepotByCompanyId(companyId);
+ if (list.size() < 1) {
+ list = this.getData(companyId,null, false);
setCacheDepotList(list, companyId);
}
@@ -197,6 +211,7 @@
/**
* 鑾峰彇缂撳瓨-鏍规嵁缁勭粐缂栫爜鍜屽簱鍖虹紪鐮佽幏鍙栦粨搴撻泦鍚�
+ *
* @param companyId
* @param deptId
* @return
@@ -206,7 +221,7 @@
return null;
}
List<Depot> list = getCacheDepotList(companyId);
- if(null == list || list.isEmpty()){
+ if (null == list || list.isEmpty()) {
return null;
}
List<Depot> result = new ArrayList<>();
@@ -222,6 +237,7 @@
/**
* 鑾峰彇浠撳簱淇℃伅-鏍规嵁浠撳簱缂栫爜鑾峰彇缂撳瓨淇℃伅
+ *
* @param companyId
* @param depotId
* @return
@@ -230,40 +246,15 @@
if (StringUtils.isEmpty(depotId)) {
return null;
}
- if(StringUtils.isEmpty(companyId)){
+ if (StringUtils.isEmpty(companyId)) {
companyId = ContextUtil.getCompanyId();
}
String key = RedisConst.buildKey(companyId, RedisConst.KEY_DEPOT, depotId);
Depot depot = redisCache.getCacheObject(key);
- if(null == depot){
- depot = depotRepository.getDepotById(companyId, depotId);
+ if (null == depot) {
+ 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);
}
}
diff --git a/fzzy-igdss-core/src/main/java/com/fzzy/igds/service/DepotStoreService.java b/fzzy-igdss-core/src/main/java/com/fzzy/igds/service/DepotStoreService.java
index 1dc77a6..6fb340c 100644
--- a/fzzy-igdss-core/src/main/java/com/fzzy/igds/service/DepotStoreService.java
+++ b/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());
-
- data.setId(data.getDepotId() + "_" + DateFormatUtils.format(data.getStoreDate(), "yyyyMMddHHmmss") + "_" + DateFormatUtils.format(data.getUpdateTime(), "yyyyMMddHHmmss"));
- data.setCreateTime(new Date());
- data.setRemark("绯荤粺鐢熸垚");
-
- depotStoreRepository.save(data);
+ 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("绯荤粺鐢熸垚");
+ 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);
}
}
-
}
diff --git a/fzzy-igdss-core/src/main/java/com/fzzy/igds/service/DeviceIotService.java b/fzzy-igdss-core/src/main/java/com/fzzy/igds/service/DeviceIotService.java
index b147541..197d39c 100644
--- a/fzzy-igdss-core/src/main/java/com/fzzy/igds/service/DeviceIotService.java
+++ b/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());
+ deviceIotMapper.insert(deviceIot);
+ }else {
+ deviceIot.setUpdateBy(ContextUtil.getLoginUserName());
+ deviceIot.setUpdateTime(new Date());
+ deviceIotMapper.updateById(deviceIot);
}
- deviceIot.setUpdateBy(ContextUtil.getLoginUserName());
- deviceIot.setUpdateTime(new Date());
- deviceIotRepository.save(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);
diff --git a/fzzy-igdss-core/src/main/java/com/fzzy/igds/service/DeviceSerService.java b/fzzy-igdss-core/src/main/java/com/fzzy/igds/service/DeviceSerService.java
index 034c6b7..e5611d5 100644
--- a/fzzy-igdss-core/src/main/java/com/fzzy/igds/service/DeviceSerService.java
+++ b/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() + "");
- }else {
- return deviceSerRepository.getDataByParentId(user.getDeptId() + "%");
+ return this.listDeviceSer(null, user.getDeptId() + "", null);
+ } else {
+ 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());
+ deviceSerMapper.insert(ser);
+ } else {
+ ser.setUpdateBy(ContextUtil.getLoginUserName());
+ ser.setUpdateTime(new Date());
+ deviceSerMapper.updateById(ser);
}
- ser.setUpdateBy(ContextUtil.getLoginUserName());
- ser.setUpdateTime(new Date());
- deviceSerRepository.save(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,16 +306,17 @@
/**
* 鏍规嵁绫诲瀷鑾峰彇鍒嗘満淇℃伅
+ *
* @param companyId
* @param type
* @return
*/
public List<DeviceSer> getSerCacheByType(String companyId, String type) {
List<DeviceSer> listAll = this.getCacheSerList(companyId);
- if (null == listAll || listAll.isEmpty()){
+ if (null == listAll || listAll.isEmpty()) {
return null;
}
- if (null == type){
+ if (null == type) {
return listAll;
}
List<DeviceSer> result = new ArrayList<DeviceSer>();
@@ -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);
}
}
diff --git a/fzzy-igdss-core/src/main/java/com/fzzy/igds/service/DicAreaService.java b/fzzy-igdss-core/src/main/java/com/fzzy/igds/service/DicAreaService.java
index 897a806..8504f54 100644
--- a/fzzy-igdss-core/src/main/java/com/fzzy/igds/service/DicAreaService.java
+++ b/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;
}
}
diff --git a/fzzy-igdss-core/src/main/java/com/fzzy/igds/service/InoutConfService.java b/fzzy-igdss-core/src/main/java/com/fzzy/igds/service/InoutConfService.java
index 164d4ac..4ec5982 100644
--- a/fzzy-igdss-core/src/main/java/com/fzzy/igds/service/InoutConfService.java
+++ b/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));
- }else {
- return inoutSysConfRepository.getDataByParentId(user.getDeptId() + "%");
+ return this.listInoutSysConf(ContextUtil.subDeptId(user), null);
+ } else {
+ 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());
}
- data.setUpdateBy(ContextUtil.getLoginUserName());
- data.setUpdateTime(new Date());
- inoutSysConfRepository.save(data);
+ if (StringUtils.isEmpty(data.getUpdateBy())) {
+ data.setCreateBy(ContextUtil.getLoginUserName());
+ data.setCreateTime(new Date());
+ data.setUpdateBy(ContextUtil.getLoginUserName());
+ data.setUpdateTime(new Date());
+ 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));
}
- data.setUpdateBy(ContextUtil.getLoginUserName());
- data.setUpdateTime(new Date());
- inoutConfRepository.save(data);
+ 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());
+ 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
@@ -190,7 +235,7 @@
public List<InoutConf> getCacheInoutConf(String companyId, String deptId) {
String key = RedisConst.buildKey(companyId, Constant.CACHE_INOUT_CONF_LIST, deptId);
List<InoutConf> list = redisCache.getCacheObject(key);
- if(null == list){
+ if (null == list) {
list = this.getInoutConfList(companyId, deptId);
redisCache.setCacheObject(key, list);
}
@@ -199,6 +244,7 @@
/**
* 鑾峰彇缂撳瓨
+ *
* @param companyId
* @param deptId
* @param confId
@@ -210,7 +256,7 @@
}
List<InoutConf> list = getCacheInoutConf(companyId, deptId);
- if (null == list || list.isEmpty()) {
+ if (null == list || list.isEmpty()) {
return null;
}
for (InoutConf inoutConf : list) {
@@ -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);
}
}
diff --git a/fzzy-igdss-core/src/main/java/com/fzzy/igds/service/QuantityService.java b/fzzy-igdss-core/src/main/java/com/fzzy/igds/service/QuantityService.java
index b50bdb5..51c8ff2 100644
--- a/fzzy-igdss-core/src/main/java/com/fzzy/igds/service/QuantityService.java
+++ b/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());
+ quantityConfMapper.insert(conf);
+ }else {
+ conf.setUpdateBy(ContextUtil.getLoginUserName());
+ conf.setUpdateTime(new Date());
+ quantityConfMapper.updateById(conf);
}
- conf.setUpdateBy(ContextUtil.getLoginUserName());
- conf.setUpdateTime(new Date());
- quantityConfRepository.save(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());
diff --git a/fzzy-igdss-core/src/main/java/com/fzzy/igds/service/SecCameraService.java b/fzzy-igdss-core/src/main/java/com/fzzy/igds/service/SecCameraService.java
index fd95374..2203fde 100644
--- a/fzzy-igdss-core/src/main/java/com/fzzy/igds/service/SecCameraService.java
+++ b/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);
}
}
diff --git a/fzzy-igdss-view/src/main/java/com/fzzy/igds/CompanyPR.java b/fzzy-igdss-view/src/main/java/com/fzzy/igds/CompanyPR.java
index a21af61..b5f88ef 100644
--- a/fzzy-igdss-view/src/main/java/com/fzzy/igds/CompanyPR.java
+++ b/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() + "");
}
diff --git a/fzzy-igdss-view/src/main/java/com/fzzy/igds/DepotConfPR.java b/fzzy-igdss-view/src/main/java/com/fzzy/igds/DepotConfPR.java
index b159c22..fc9555d 100644
--- a/fzzy-igdss-view/src/main/java/com/fzzy/igds/DepotConfPR.java
+++ b/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));
}
/**
diff --git a/fzzy-igdss-view/src/main/java/com/fzzy/igds/DepotPR.java b/fzzy-igdss-view/src/main/java/com/fzzy/igds/DepotPR.java
index 2f15b40..a7ec0d8 100644
--- a/fzzy-igdss-view/src/main/java/com/fzzy/igds/DepotPR.java
+++ b/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);
}
/**
diff --git a/fzzy-igdss-view/src/main/java/com/fzzy/igds/DeptPR.java b/fzzy-igdss-view/src/main/java/com/fzzy/igds/DeptPR.java
index ecac0dd..4da2269 100644
--- a/fzzy-igdss-view/src/main/java/com/fzzy/igds/DeptPR.java
+++ b/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);
}
/**
diff --git a/fzzy-igdss-view/src/main/java/com/fzzy/igds/DeviceIot.view.xml b/fzzy-igdss-view/src/main/java/com/fzzy/igds/DeviceIot.view.xml
index 6f53ec5..cc0907f 100644
--- a/fzzy-igdss-view/src/main/java/com/fzzy/igds/DeviceIot.view.xml
+++ b/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>
- <DataPilot layoutConstraint="right">
- <Property name="dataSet">dsDeviceIot</Property>
- <Property name="itemCodes">pageSize,pages</Property>
- </DataPilot>
+ <ToolBar layoutConstraint="bottom">
+ <Fill/>
+ <DataPilot layoutConstraint="right">
+ <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("dsDeviceIot").getData().cancel();</ClientEvent>
diff --git a/fzzy-igdss-view/src/main/java/com/fzzy/igds/DeviceIotPR.java b/fzzy-igdss-view/src/main/java/com/fzzy/igds/DeviceIotPR.java
index 59e6614..7ec57a9 100644
--- a/fzzy-igdss-view/src/main/java/com/fzzy/igds/DeviceIotPR.java
+++ b/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) {
- if (null == param) {
- param = new HashMap<>();
+ 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 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())));
}
/**
diff --git a/fzzy-igdss-view/src/main/java/com/fzzy/igds/DicArea.view.xml b/fzzy-igdss-view/src/main/java/com/fzzy/igds/DicArea.view.xml
index b419740..94bbcdd 100644
--- a/fzzy-igdss-view/src/main/java/com/fzzy/igds/DicArea.view.xml
+++ b/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>
- <DataPilot layoutConstraint="right">
- <Property name="dataSet">dsMain</Property>
- <Property name="itemCodes">pageSize,pages</Property>
- </DataPilot>
+ <ToolBar layoutConstraint="bottom">
+ <Fill/>
+ <DataPilot layoutConstraint="right">
+ <Property name="itemCodes">pageSize,pages</Property>
+ <Property name="dataSet">dsMain</Property>
+ </DataPilot>
+ </ToolBar>
</Container>
<Dialog id="dialogMain">
<Property name="closeable">false</Property>
diff --git a/fzzy-igdss-view/src/main/java/com/fzzy/igds/DicAreaPR.java b/fzzy-igdss-view/src/main/java/com/fzzy/igds/DicAreaPR.java
index 834a3b8..982766c 100644
--- a/fzzy-igdss-view/src/main/java/com/fzzy/igds/DicAreaPR.java
+++ b/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);
}
/**
diff --git a/fzzy-igdss-view/src/main/java/com/fzzy/igds/InoutConf.view.xml b/fzzy-igdss-view/src/main/java/com/fzzy/igds/InoutConf.view.xml
index 034b457..5afacbc 100644
--- a/fzzy-igdss-view/src/main/java/com/fzzy/igds/InoutConf.view.xml
+++ b/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>
diff --git a/fzzy-igdss-view/src/main/java/com/fzzy/igds/InoutNoticeIn.view.xml b/fzzy-igdss-view/src/main/java/com/fzzy/igds/InoutNoticeIn.view.xml
index 5b52c7b..54d6ea7 100644
--- a/fzzy-igdss-view/src/main/java/com/fzzy/igds/InoutNoticeIn.view.xml
+++ b/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("#dsQuery.data");
if(data){
- view.get("#dsMain").set("parameter",data.toJSON()).flushAsync();
+ view.get("#dsMain").set("parameter",data).flushAsync();
}else{
view.get("#dsMain").flushAsync();
}</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("#udpateSave").execute(function(result){
+ <ClientEvent name="onClick">view.get("#updateSave").execute(function(result){
if(result){
$alert(result);
return;
@@ -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>
diff --git a/fzzy-igdss-view/src/main/java/com/fzzy/igds/QuantityConfPR.java b/fzzy-igdss-view/src/main/java/com/fzzy/igds/QuantityConfPR.java
index 1c4df70..54b8595 100644
--- a/fzzy-igdss-view/src/main/java/com/fzzy/igds/QuantityConfPR.java
+++ b/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));
}
/**
diff --git a/fzzy-igdss-view/src/main/java/com/fzzy/igds/SecCamera.view.xml b/fzzy-igdss-view/src/main/java/com/fzzy/igds/SecCamera.view.xml
index ad29ee1..3e8a2e8 100644
--- a/fzzy-igdss-view/src/main/java/com/fzzy/igds/SecCamera.view.xml
+++ b/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("#dsParam.data");
-view.get("#dsMain").set("parameter",param.toJSON()).flushAsync();</ClientEvent>
+view.get("#dsMain").set("parameter",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>
- <DataPilot layoutConstraint="right">
- <Property name="dataSet">dsMain</Property>
- <Property name="itemCodes">pageSize,pages</Property>
- </DataPilot>
+ <ToolBar layoutConstraint="bottom">
+ <Fill/>
+ <DataPilot layoutConstraint="right">
+ <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>
diff --git a/fzzy-igdss-view/src/main/java/com/fzzy/igds/SecCameraPR.java b/fzzy-igdss-view/src/main/java/com/fzzy/igds/SecCameraPR.java
index 5190e2f..2187539 100644
--- a/fzzy-igdss-view/src/main/java/com/fzzy/igds/SecCameraPR.java
+++ b/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<>();
+ if(null == param) {
+ 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 "杩滅▼鎺ュ彛鏈嶅姟寮傚父锛岃鏍告煡鍚庨噸璇曪紒";
-// }
-
}
}
diff --git a/fzzy-igdss-view/src/main/java/com/fzzy/igds/SelectDeptPR.java b/fzzy-igdss-view/src/main/java/com/fzzy/igds/SelectDeptPR.java
index da45a32..46da167 100644
--- a/fzzy-igdss-view/src/main/java/com/fzzy/igds/SelectDeptPR.java
+++ b/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);
}
}
diff --git a/fzzy-igdss-view/src/main/java/models/core.model.xml b/fzzy-igdss-view/src/main/java/models/core.model.xml
index 49c0a85..707e70a 100644
--- a/fzzy-igdss-view/src/main/java/models/core.model.xml
+++ b/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("depotPR#getAllCache").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("dicPR#sysDictData").getResult("FOOD_VARIETY_")}</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>
diff --git a/fzzy-igdss-web/src/main/java/com/fzzy/sys/controller/system/SysDeptNewController.java b/fzzy-igdss-web/src/main/java/com/fzzy/sys/controller/system/SysDeptNewController.java
index a3401a5..021df88 100644
--- a/fzzy-igdss-web/src/main/java/com/fzzy/sys/controller/system/SysDeptNewController.java
+++ b/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);
--
Gitblit v1.9.3