新建牧场管理Controller

registration-center/src/main/java/com/huimv/center/controller/BizFarmController.java

@@ -1,9 +1,13 @@
 package com.huimv.center.controller;
 
 
-import org.springframework.web.bind.annotation.RequestMapping;
+import com.huimv.center.service.BizFarmService;
+import com.huimv.eartag2.common.utils.Result;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
 
-import org.springframework.web.bind.annotation.RestController;
+import java.text.ParseException;
+import java.util.Map;
 
 /**
  * <p>
@@ -14,8 +18,65 @@ import org.springframework.web.bind.annotation.RestController;
  * @since 2022-06-21
  */
 @RestController
-@RequestMapping("/biz-farm")
+@RequestMapping("/bizFarm")
 public class BizFarmController {
+    @Autowired
+    private BizFarmService bizFarmService;
+
+    @RequestMapping(value = "/addFarm",method = RequestMethod.POST)
+    public Result add(@RequestParam Map<String,Object> paramsMap) throws ParseException {
+        String farmName = paramsMap.get("farmName").toString();
+        String farmCode = paramsMap.get("farmCode").toString();
+        String linkman = paramsMap.get("linkman").toString();
+        String phone = paramsMap.get("phone").toString();
+        String remark = paramsMap.get("remark").toString();
+        return bizFarmService.save(farmName,farmCode,linkman,phone,remark);
+    }
+
+    @PostMapping("/editFarm")
+    public Result edit(@RequestParam Map<String,Object> paramsMap) throws ParseException {
+        String id = paramsMap.get("id").toString();
+        String farmName = paramsMap.get("farmName").toString();
+        String farmCode = paramsMap.get("farmCode").toString();
+        String linkman = paramsMap.get("linkman").toString();
+        String phone = paramsMap.get("phone").toString();
+        String remark = paramsMap.get("remark").toString();
+        return bizFarmService.edit(Integer.parseInt(id),farmName,farmCode,linkman,phone,remark);
+    }
+
+    @PostMapping("/removeFarm")
+    public Result remove(@RequestParam String ids){
+        return bizFarmService.remove(ids);
+    }
+
+    @PostMapping("/listFarm")
+    public Result list(@RequestParam Map<String,Object> paramsMap) {
+        String pageNo = paramsMap.get("pageNo").toString();
+        if(pageNo == null){
+            pageNo ="1";
+        }
+        String pageSize = paramsMap.get("pageSize").toString();
+        if(pageSize == null){
+            pageSize = "10";
+        }
+        String farmName = "";
+        if(paramsMap.get("farmName") != null){
+            farmName = paramsMap.get("farmName").toString();
+        }
+        String farmCode = "";
+        if(paramsMap.get("farmCode") != null){
+            farmCode = paramsMap.get("farmCode").toString();
+        }
+        String startDate = "";
+        if(paramsMap.get("startDate") != null) {
+            startDate = paramsMap.get("startDate").toString();
+        }
+        String endDate = "";
+        if(paramsMap.get("endDate") !=null) {
+            endDate = paramsMap.get("endDate").toString();
+        }
+        return bizFarmService.list(Integer.parseInt(pageNo),Integer.parseInt(pageSize),farmName,farmCode,startDate,endDate);
+    }
 
 }
 

registration-center/src/main/java/com/huimv/center/listener/DeviceListener.java

@@ -48,7 +48,7 @@ public class DeviceListener {
      * @Date        : 2022/6/22
      * @Time        : 20:11
      */
-    @RabbitListener(queues = Const.QUEUE_DEVICE_REGISTERED)
+//    @RabbitListener(queues = Const.QUEUE_DEVICE_REGISTERED)
     @RabbitHandler
     @Transactional
     public void processDeviceRegisteredFlow(Map askMap) throws ParseException {
@@ -79,8 +79,9 @@ public class DeviceListener {
      * @Date        : 2022/6/22       
      * @Time        : 20:13
      */
-    @RabbitListener(queues = Const.QUEUE_DEVICE_UNREGISTERED)
+//    @RabbitListener(queues = Const.QUEUE_DEVICE_UNREGISTERED)
     @RabbitHandler
+    @Transactional
     public void processDeviceUnregisteredFlow(Map askMap) throws ParseException {
         System.out.println("<<<<<<<<<<<<<<< askMap>>"+askMap.toString());
         String askText = askMap.get("deviceUnregistered").toString();
@@ -88,7 +89,6 @@ public class DeviceListener {
         System.out.println("<<<<<<<<<<<<<<<<<<<<<<< 处理未注册设备 2 <<<<<<<<<<<<<<<<<<<<<<<");
         // 添加非注册流水（统计次数）
         deviceUnregisteredFlowService.addDeviceUnregisteredFlow(chipId);
-
         // 添加非注册信息
         deviceUnregisteredService.updateDeviceRegisterTimes(chipId);
     }
@@ -103,8 +103,9 @@ public class DeviceListener {
      * @Date        : 2022/6/22
      * @Time        : 20:15
      */
-    @RabbitListener(queues = Const.QUEUE_DEVICE_ANSWER)
+//    @RabbitListener(queues = Const.QUEUE_DEVICE_ANSWER)
     @RabbitHandler
+    @Transactional
     public void processDeviceAnswer(Map askMap) throws ParseException {
         System.out.println("<<<<<<<<<<<<<<< askMap>>"+askMap.toString());
         String askText = askMap.get("deviceAnswer").toString();
@@ -114,9 +115,13 @@ public class DeviceListener {
 
         // 添加设备应答信息流水信息
         deviceAnswerFlowService.addDeviceAnswer(chipId,deviceCode,askText);
+        // 计算应答次数
+        deviceRegisterService.updateDeviceAnswerTimes(chipId);
+        //+++++++++++++++++++++++++++++++++++++++++++++++++++++
+
     }
 
-    @RabbitListener(queues = Const.QUEUE_ASK_CMD)
+//    @RabbitListener(queues = Const.QUEUE_ASK_CMD)
     @RabbitHandler
     public void processAskCmd(Map askMap) throws ParseException {
         System.out.println("<<<<<<<<<<<<<<< askMap>>"+askMap.toString());

registration-center/src/main/java/com/huimv/center/mapper/xml/BizDeviceRegisterMapper.xml

@@ -14,7 +14,10 @@
         <result column="first_time" property="firstTime" />
         <result column="last_time" property="lastTime" />
         <result column="remark" property="remark" />
-        <result column="times" property="askTimes" />
+        <result column="ask_times" property="askTimes" />
+        <result column="first_time_answer" property="firstTimeAnswer" />
+        <result column="last_time_answer" property="lastTimeAnswer" />
+        <result column="answer_times" property="answerTimes" />
     </resultMap>
 
     <!-- 通用查询结果列 -->

registration-center/src/main/java/com/huimv/center/mapper/xml/BizFarmMapper.xml

@@ -10,6 +10,7 @@
         <result column="linkman" property="linkman" />
         <result column="phone" property="phone" />
         <result column="remark" property="remark" />
+        <result column="add_time" property="addTime" />
     </resultMap>
 
     <!-- 通用查询结果列 -->

registration-center/src/main/java/com/huimv/center/pojo/BizDeviceRegister.java

@@ -47,5 +47,9 @@ public class BizDeviceRegister implements Serializable {
 
     private Integer askTimes;
 
+    private Date firstTimeAnswer;
 
+    private Date lastTimeAnswer;
+
+    private Integer answerTimes;
 }

registration-center/src/main/java/com/huimv/center/pojo/BizFarm.java

@@ -4,6 +4,8 @@ import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.Version;
 import com.baomidou.mybatisplus.annotation.TableId;
 import java.io.Serializable;
+import java.util.Date;
+
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
@@ -36,5 +38,7 @@ public class BizFarm implements Serializable {
 
     private String remark;
 
+    private Date addTime;
+
 
 }

registration-center/src/main/java/com/huimv/center/service/BizDeviceRegisterService.java

@@ -28,4 +28,6 @@ public interface BizDeviceRegisterService extends IService<BizDeviceRegister> {
     Map getServerAndIpByChipId(String idCode);
 
     Result updateDeviceRegisterTimes(String chipId) throws ParseException;
+
+    Result updateDeviceAnswerTimes(String chipId) throws ParseException;
 }

registration-center/src/main/java/com/huimv/center/service/BizFarmService.java

@@ -4,6 +4,8 @@ import com.huimv.center.pojo.BizFarm;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.huimv.eartag2.common.utils.Result;
 
+import java.text.ParseException;
+
 /**
  * <p>
  *  服务类
@@ -14,9 +16,11 @@ import com.huimv.eartag2.common.utils.Result;
  */
 public interface BizFarmService extends IService<BizFarm> {
 
-    Result save(String farmName, String farmCode, String linkman, String phone, String remark);
+    Result save(String farmName, String farmCode, String linkman, String phone, String remark) throws ParseException;
 
-    Result edit(Integer id, String farmName, String farmCode, String linkman, String phone, String remark);
+    Result edit(Integer id, String farmName, String farmCode, String linkman, String phone, String remark) throws ParseException;
 
     Result remove(String ids);
+
+    Result list(Integer pageNo, Integer pageSize, String farmName, String farmCode, String startDate, String endDate);
 }

registration-center/src/main/java/com/huimv/center/service/impl/BizDeviceRegisterServiceImpl.java

@@ -60,6 +60,7 @@ public class BizDeviceRegisterServiceImpl extends ServiceImpl<BizDeviceRegisterM
         deviceRegister.setServerPort(serverPort);
         deviceRegister.setRemark(remark);
         deviceRegister.setAskTimes(0);
+        deviceRegister.setAnswerTimes(0);
         int rows = bizDeviceRegisterMapper.insert(deviceRegister);
         return ResultUtil.result(rows);
     }
@@ -163,4 +164,34 @@ public class BizDeviceRegisterServiceImpl extends ServiceImpl<BizDeviceRegisterM
         int rows = bizDeviceRegisterMapper.updateById(deviceRegister);
         return ResultUtil.result(rows);
     }
+
+    /**
+     * @Method      : updateDeviceAnswerTimes
+     * @Description : 修改应答次数
+     * @Params      : [chipId]
+     * @Return      : com.huimv.eartag2.common.utils.Result
+     *
+     * @Author      : ZhuoNing
+     * @Date        : 2022/6/24
+     * @Time        : 14:00
+     */
+    @Override
+    public Result updateDeviceAnswerTimes(String chipId) throws ParseException {
+        DateUtil dateUtil = new DateUtil();
+        QueryWrapper<BizDeviceRegister> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("chip_id", chipId);
+        // 查询注册设备
+        BizDeviceRegister deviceRegister = bizDeviceRegisterMapper.selectOne(queryWrapper);
+        if(deviceRegister.getFirstTimeAnswer()== null){
+            deviceRegister.setFirstTimeAnswer(dateUtil.getTodayDatetime());
+        }
+        deviceRegister.setLastTimeAnswer(dateUtil.getTodayDatetime());
+        Integer times = deviceRegister.getAnswerTimes();
+        if(times == null){
+            times = 0;
+        }
+        deviceRegister.setAnswerTimes(++times);
+        int rows = bizDeviceRegisterMapper.updateById(deviceRegister);
+        return ResultUtil.result(rows);
+    }
 }

registration-center/src/main/java/com/huimv/center/service/impl/BizFarmServiceImpl.java

@@ -1,14 +1,21 @@
 package com.huimv.center.service.impl;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.huimv.center.pojo.BizFarm;
 import com.huimv.center.mapper.BizFarmMapper;
+import com.huimv.center.pojo.BizRawData;
 import com.huimv.center.service.BizFarmService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.huimv.eartag2.common.utils.DateUtil;
 import com.huimv.eartag2.common.utils.Result;
 import com.huimv.eartag2.common.utils.ResultCode;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.text.ParseException;
+
 /**
  * <p>
  *  服务实现类
@@ -22,44 +29,99 @@ public class BizFarmServiceImpl extends ServiceImpl<BizFarmMapper, BizFarm> impl
     @Autowired
     private BizFarmMapper BizFarmMapper;
     private BizFarm farm;
+    @Autowired
+    private com.huimv.center.utils.IDUtil idUtil;
+    @Autowired
+    private com.huimv.center.utils.DateUtil dateUtil;
+    @Autowired
+    private com.huimv.center.utils.ResultUtil ResultUtil;
 
+    /**
+     * @Method      : save
+     * @Description : 
+     * @Params      : [farmName, farmCode, linkman, phone, remark]
+     * @Return      : com.huimv.eartag2.common.utils.Result
+     * 
+     * @Author      : ZhuoNing
+     * @Date        : 2022/6/24       
+     * @Time        : 14:46
+     */
     @Override
-    public Result save(String farmName, String farmCode, String linkman, String phone, String remark) {
+    public Result save(String farmName, String farmCode, String linkman, String phone, String remark) throws ParseException {
+        DateUtil dateUtil = new DateUtil();
         BizFarm farm = new BizFarm();
         farm.setFarmName(farmName);
         farm.setFarmCode(farmCode);
         farm.setLinkman(linkman);
         farm.setPhone(phone);
         farm.setRemark(remark);
-        int result = BizFarmMapper.insert(farm);
-        System.out.println(result); //影响的行数
-        System.out.println(farm); //影响的行数
-        return new Result(ResultCode.SUCCESS, "添加成功.");
+        farm.setAddTime(dateUtil.getTodayDatetime());
+        return ResultUtil.result(BizFarmMapper.insert(farm));
     }
 
+    /**
+     * @Method      : edit
+     * @Description : 
+     * @Params      : [id, farmName, farmCode, linkman, phone, remark]
+     * @Return      : com.huimv.eartag2.common.utils.Result
+     * 
+     * @Author      : ZhuoNing
+     * @Date        : 2022/6/24       
+     * @Time        : 14:44
+     */
     @Override
-    public Result edit(Integer id, String farmName, String farmCode, String linkman, String phone, String remark){
+    public Result edit(Integer id, String farmName, String farmCode, String linkman, String phone, String remark) throws ParseException {
+        DateUtil dateUtil = new DateUtil();
         BizFarm farm = BizFarmMapper.selectById(id);
         farm.setFarmName(farmName);
         farm.setFarmCode(farmCode);
         farm.setLinkman(linkman);
         farm.setPhone(phone);
         farm.setRemark(remark);
-        int result = BizFarmMapper.updateById(farm);
-        System.out.println(result); //影响的行数
-        System.out.println(farm); //影响的行数
-        return new Result(ResultCode.SUCCESS, "编辑成功.");
+        farm.setAddTime(dateUtil.getTodayDatetime());
+        return ResultUtil.result(BizFarmMapper.updateById(farm));
     }
 
-    @Autowired
-    private com.huimv.center.utils.IDUtil idUtil;
-
+    /**
+     * @Method      : remove
+     * @Description : 
+     * @Params      : [ids]
+     * @Return      : com.huimv.eartag2.common.utils.Result
+     * 
+     * @Author      : ZhuoNing
+     * @Date        : 2022/6/24       
+     * @Time        : 14:44
+     */
     @Override
     public Result remove(String ids){
-        //
-        int result = BizFarmMapper.deleteBatchIds(idUtil.convert(ids));
-        System.out.println(result); //影响的行数
-        System.out.println(ids); //影响的行数
-        return new Result(ResultCode.SUCCESS, "删除成功.");
+        return ResultUtil.result(BizFarmMapper.deleteBatchIds(idUtil.convert(ids)));
+    }
+
+    /**
+     * @Method      : list
+     * @Description : 
+     * @Params      : [pageNo, pageSize, farmName, farmCode, startDate, endDate]
+     * @Return      : com.huimv.eartag2.common.utils.Result
+     * 
+     * @Author      : ZhuoNing
+     * @Date        : 2022/6/24       
+     * @Time        : 14:44
+     */
+    @Override
+    public Result list(Integer pageNo, Integer pageSize, String farmName,String farmCode,String startDate,String endDate){
+        if(pageNo == 0){
+            pageNo = 1;
+        }
+        startDate = dateUtil.buildStartDate(startDate);
+        endDate = dateUtil.buildEndDate(endDate);
+        Page<BizFarm> page = new Page<>(pageNo, pageSize);
+        QueryWrapper<BizFarm> queryWrapper = new QueryWrapper<>();
+        queryWrapper.like(StringUtils.isNotBlank(farmName),"farm_name", farmName);
+        queryWrapper.like(StringUtils.isNotBlank(farmCode),"farm_code", farmCode);
+        queryWrapper.ge(StringUtils.isNotBlank(startDate),"add_time", startDate);
+        queryWrapper.le(StringUtils.isNotBlank(endDate),"add_time", endDate);
+        //创建时间降序
+        queryWrapper.orderByDesc("id");
+        return new Result(ResultCode.SUCCESS,BizFarmMapper.selectPage(page, queryWrapper));
     }
 }

registration-center/src/test/java/com/huimv/center/service/BizFarmServiceTest.java

@@ -7,6 +7,8 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.test.context.junit4.SpringRunner;
 
+import java.text.ParseException;
+
 /**
  * @Project : huimv.shiwan
  * @Package : com.huimv.biosafety.uface.controller
@@ -22,7 +24,7 @@ public class BizFarmServiceTest {
     private BizFarmService farmService;
 
     @Test
-    public void testAdd(){
+    public void testAdd() throws ParseException {
         String farmName = "杭州慧牧牧场b";
         String farmCode = "hz001b";
         String linkman = "张经理b";
@@ -33,7 +35,7 @@ public class BizFarmServiceTest {
     }
 
     @Test
-    public void testEdit(){
+    public void testEdit() throws ParseException {
         String farmName = "杭州慧牧牧场2";
         String farmCode = "hz0012";
         String linkman = "张经理2";
@@ -45,7 +47,7 @@ public class BizFarmServiceTest {
 
     @Test
     public void testRemove(){
-        Result result = farmService.remove("4,5,6");
+        Result result = farmService.remove("8,9,12");
         System.out.println("result>>"+result.toString());
     }
 

registration-center/target/classes/com/huimv/center/mapper/xml/BizDeviceRegisterMapper.xml

@@ -14,7 +14,10 @@
         <result column="first_time" property="firstTime" />
         <result column="last_time" property="lastTime" />
         <result column="remark" property="remark" />
-        <result column="times" property="askTimes" />
+        <result column="ask_times" property="askTimes" />
+        <result column="first_time_answer" property="firstTimeAnswer" />
+        <result column="last_time_answer" property="lastTimeAnswer" />
+        <result column="answer_times" property="answerTimes" />
     </resultMap>
 
     <!-- 通用查询结果列 -->

registration-center/target/classes/com/huimv/center/mapper/xml/BizFarmMapper.xml

@@ -10,6 +10,7 @@
         <result column="linkman" property="linkman" />
         <result column="phone" property="phone" />
         <result column="remark" property="remark" />
+        <result column="add_time" property="addTime" />
     </resultMap>
 
     <!-- 通用查询结果列 -->