同步牧场功能

huimv-farm-v2/huimv-admin/src/main/java/com/huimv/admin/controller/ProdFarmNameController.java

@@ -0,0 +1,58 @@
+package com.huimv.admin.controller;
+
+
+import com.huimv.admin.entity.ProdFarmName;
+import com.huimv.admin.service.IProdFarmNameService;
+import com.huimv.common.token.TokenSign;
+import com.huimv.common.utils.Result;
+import com.huimv.common.utils.ResultCode;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletRequest;
+import java.util.List;
+
+/**
+ * <p>
+ *  前端控制器
+ * </p>
+ *
+ * @author astupidcoder
+ * @since 2021-11-20
+ */
+@RestController
+@RequestMapping("/prodFarmName")
+public class ProdFarmNameController {
+    @Autowired
+    IProdFarmNameService farmNameService;
+
+    @GetMapping("/updatName")
+    public Result updatName(){
+        farmNameService.updatName();
+        return new Result(10000,"同步成功",true);
+    }
+
+    @PostMapping("/add")
+    public Result add(@RequestBody ProdFarmName farm){
+        farmNameService.save(farm);
+        return new Result(10000,"添加成功",true);
+    }
+
+    @PostMapping("/edit")
+    public Result edit(@RequestBody ProdFarmName farm){
+
+        farmNameService.updateById(farm);
+        return new Result(10000,"修改成功",true);
+    }
+
+    @GetMapping("/remove")
+    public Result remove(@RequestParam(name = "ids") List<Integer> ids){
+        farmNameService.removeByIds(ids);
+        return new Result(10000,"删除成功",true);
+    }
+
+    @GetMapping("/listFarmName")
+    public Result listFarmName(){
+        return new Result(ResultCode.SUCCESS,farmNameService.list());
+    }
+}

huimv-farm-v2/huimv-admin/src/main/java/com/huimv/admin/entity/ProdFarmName.java

@@ -0,0 +1,37 @@
+package com.huimv.admin.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+import com.baomidou.mybatisplus.annotation.TableId;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author astupidcoder
+ * @since 2021-11-20
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@Accessors(chain = true)
+public class ProdFarmName extends Model {
+
+    private static final long serialVersionUID = 1L;
+
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+    private String farmName;
+
+    private Integer farmId;
+
+    private String erpFarmName;
+
+    private String erpShortName;
+
+
+}

huimv-farm-v2/huimv-admin/src/main/java/com/huimv/admin/mapper/FarmMapper.java

@@ -2,6 +2,9 @@ package com.huimv.admin.mapper;
 
 import com.huimv.admin.entity.Farm;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.springframework.stereotype.Repository;
+
+import java.util.List;
 
 /**
  * <p>
@@ -11,6 +14,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  * @author astupidcoder
  * @since 2021-10-14
  */
+@Repository
 public interface FarmMapper extends BaseMapper<Farm> {
 
 }

huimv-farm-v2/huimv-admin/src/main/java/com/huimv/admin/mapper/ProdFarmNameMapper.java

@@ -0,0 +1,23 @@
+package com.huimv.admin.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.huimv.admin.entity.ProdFarmName;
+import org.springframework.stereotype.Repository;
+
+import java.util.List;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author astupidcoder
+ * @since 2021-11-20
+ */
+@Repository
+public interface ProdFarmNameMapper extends BaseMapper<ProdFarmName> {
+
+
+
+    List<ProdFarmName> updatName();
+}

huimv-farm-v2/huimv-admin/src/main/java/com/huimv/admin/service/IProdFarmNameService.java

@@ -0,0 +1,17 @@
+package com.huimv.admin.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.huimv.admin.entity.ProdFarmName;
+
+/**
+ * <p>
+ *  服务类
+ * </p>
+ *
+ * @author astupidcoder
+ * @since 2021-11-20
+ */
+public interface IProdFarmNameService extends IService<ProdFarmName> {
+
+    void updatName();
+}

huimv-farm-v2/huimv-admin/src/main/java/com/huimv/admin/service/impl/ProdFarmNameServiceImpl.java

@@ -0,0 +1,36 @@
+package com.huimv.admin.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.huimv.admin.entity.Farm;
+import com.huimv.admin.entity.ProdFarmName;
+import com.huimv.admin.mapper.FarmMapper;
+import com.huimv.admin.mapper.ProdFarmNameMapper;
+import com.huimv.admin.service.IProdFarmNameService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+ * <p>
+ *  服务实现类
+ * </p>
+ *
+ * @author astupidcoder
+ * @since 2021-11-20
+ */
+@Service
+public class ProdFarmNameServiceImpl extends ServiceImpl<ProdFarmNameMapper, ProdFarmName> implements IProdFarmNameService {
+
+
+
+    @Autowired
+    private ProdFarmNameMapper farmNameMapper;
+
+    @Override
+    public void updatName() {
+       List<ProdFarmName> farms  = farmNameMapper.updatName();
+       this.saveBatch(farms);
+
+    }
+}

huimv-farm-v2/huimv-admin/src/main/resources/com/huimv/admin/mapper/FarmMapper.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.huimv.admin.mapper.FarmMapper">
+
+
+</mapper>

huimv-farm-v2/huimv-admin/src/main/resources/com/huimv/admin/mapper/ProdFarmNameMapper.xml

@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.huimv.admin.mapper.ProdFarmNameMapper">
+
+
+
+    <select id="updatName" resultType="com.huimv.admin.entity.ProdFarmName">
+          SELECT id farm_id, farm_name FROM base_farm
+            WHERE id NOT IN
+            (SELECT farm_id FROM  `prod_farm_name` )
+    </select>
+</mapper>

huimv-farm-v2/huimv-common/pom.xml

@@ -66,8 +66,6 @@
             <artifactId>fastjson</artifactId>
             <version>1.2.28</version>
         </dependency>
-
-
     </dependencies>
 
 

huimv-farm-v2/huimv-produce-warning/pom.xml

@@ -42,6 +42,12 @@
             <artifactId>poi-ooxml</artifactId>
             <version>4.1.2</version>
         </dependency>
+        <!--ICC-->
+        <dependency>
+            <groupId>com.dahuatech.icc</groupId>
+            <artifactId>java-sdk-oauth</artifactId>
+            <version>1.0.8</version>
+        </dependency>
     </dependencies>
 
 </project>

huimv-farm-v2/huimv-produce-warning/src/main/java/com/huimv/produce/HuimvProduceWarningApplication.java

@@ -3,9 +3,7 @@ package com.huimv.produce;
 import org.mybatis.spring.annotation.MapperScan;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
-import org.springframework.context.ApplicationContext;
 import org.springframework.scheduling.annotation.EnableScheduling;
-import org.springframework.scheduling.annotation.Scheduled;
 
 @SpringBootApplication
 @MapperScan("com.huimv.produce.mapper")

huimv-farm-v2/huimv-produce-warning/src/main/java/com/huimv/produce/timer/SgdTimer.java

@@ -336,9 +336,14 @@ public class SgdTimer {
 
                         SysMonthWater monthWater = new SysMonthWater();
                         Double newValue = (Double)monitoryValue.getValue();
-                        Double add =0.0 ;
+                        Double add  ;
                         if (ObjectUtil.isEmpty(oldWater)){
-                            add = newValue;
+                            if (newValue == null){
+                                add = 0.0;
+                            }else {
+                                add = newValue;
+                            }
+
                         }else {
                             Double oldValue = Double.parseDouble(oldWater.getValue());
                             if (newValue >= oldValue){

huimv-farm-v2/huimv-video/src/main/java/com/huimv/video/service/impl/CameraServiceImpl.java

@@ -73,7 +73,10 @@ public class CameraServiceImpl extends ServiceImpl<CameraMapper, Camera> impleme
         }else {
             wrapper.orderByAsc("sort");
         }
-        wrapper.eq("farm_id",farmId);
+        if (farmId != null){
+            wrapper.eq("farm_id",farmId);
+        }
+
 
 
         return new Result(ResultCode.SUCCESS,page(new Page<>(current, size), wrapper));