Newspaper 1 year ago
parent
commit
195787bc1c

+ 2 - 1
snowy-web-app/src/main/java/vip/xiaonuo/Timer/SendOrgId.java

@@ -30,7 +30,8 @@ public class SendOrgId implements CommonTimerTaskRunner {
     @Override
 //    @Scheduled(cron = "0 0/1 * * * ? ")
     public void action() {
-        List<SysOrg> sysOrgs = orgMapper.selectList(new QueryWrapper<SysOrg>().eq("DELETE_FLAG", "NOT_DELETE"));
+        List<SysOrg> sysOrgs = orgMapper.selectList(new QueryWrapper<SysOrg>()
+                .eq("DELETE_FLAG", "NOT_DELETE").eq("CATEGORY","PASTURE"));
         List<OrgIdVo> list = new ArrayList<>();
         for (SysOrg sysOrg : sysOrgs) {
             OrgIdVo orgIdVo = new OrgIdVo();

+ 6 - 2
snowy-web-app/src/main/java/vip/xiaonuo/modular/feed/feedingthreshold/entity/FeedingThreshold.java

@@ -95,10 +95,14 @@ public class FeedingThreshold {
     private String fatWaterLower;
 
     /** 料塔名称 */
-    @ApiModelProperty(value = "肥猪饮水下限", position = 16)
+    @ApiModelProperty(value = "料塔名称", position = 16)
     private String feedingName;
 
     /** 料塔单元id */
-    @ApiModelProperty(value = "肥猪饮水下限", position = 17)
+    @ApiModelProperty(value = "料塔单元id", position = 17)
     private String feedingUnitId;
+
+    /** 设备编码 */
+    @ApiModelProperty(value = "设备编码", position = 17)
+    private String deviceCode;
 }