所有的代码

huimv-massage-service/src/main/java/com/huimv/socketservice/controller/AlarmHistoryController.java

@@ -3,14 +3,16 @@
 import java.util.Arrays;
 import java.util.Map;
 
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.huimv.socketservice.dao.AlarmHistoryDao;
 import com.huimv.socketservice.result.R;
 import com.huimv.socketservice.socket.eartagrecive.util.PageUtils;
+import com.huimv.socketservice.socket.eartagrecive.util.Result;
+import com.huimv.socketservice.socket.eartagrecive.util.StringUtilsWork;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 import com.huimv.socketservice.entity.AlarmHistoryEntity;
 import com.huimv.socketservice.service.AlarmHistoryService;
@@ -26,19 +28,46 @@ import com.huimv.socketservice.service.AlarmHistoryService;
  * @date 2021-09-07 10:24:08
  */
 @RestController
+@CrossOrigin
 @RequestMapping("socketservice/alarmhistory")
 public class AlarmHistoryController {
     @Autowired
     private AlarmHistoryService alarmHistoryService;
 
+    @Autowired
+    private AlarmHistoryDao alarmHistoryDao ;
+
+
+
+
     /**
      * 列表
      */
     @RequestMapping("/list")
     public R list(@RequestParam Map<String, Object> params){
-        PageUtils page = alarmHistoryService.queryPage(params);
-
-        return R.ok().put("page", page);
+        //带分页的查询
+
+        String farmCode = (String) params.get("farmCode");//牧场编码
+        Integer pageNum = Integer.valueOf(params.get("pageNum").toString());
+        Integer pageSize = Integer.valueOf(params.get("pageSize").toString());
+        String name = (String) params.get("name");//给单个人的报警记录
+        if (StringUtilsWork.isNotBlank(name)){
+            //返回带姓名查询
+            IPage<AlarmHistoryEntity> page = new Page<>(pageNum, pageSize);
+            LambdaQueryWrapper<AlarmHistoryEntity> lambdaQueryWrapper4 = new LambdaQueryWrapper<>();
+            lambdaQueryWrapper4.eq(AlarmHistoryEntity::getAlarmType, 1);   //在使用的手机号码
+            lambdaQueryWrapper4.eq(AlarmHistoryEntity::getPersonName, name);   //在使用的手机号码
+            lambdaQueryWrapper4.eq(AlarmHistoryEntity::getFarmCode, farmCode).orderByDesc(AlarmHistoryEntity::getId);
+            IPage<AlarmHistoryEntity> alarmHistoryEntityIPage = alarmHistoryDao.selectPage(page, lambdaQueryWrapper4);
+            return R.ok().put("page", alarmHistoryEntityIPage);
+        }
+
+        IPage<AlarmHistoryEntity> page = new Page<>(pageNum, pageSize);
+        LambdaQueryWrapper<AlarmHistoryEntity> lambdaQueryWrapper4 = new LambdaQueryWrapper<>();
+        lambdaQueryWrapper4.eq(AlarmHistoryEntity::getAlarmType, 1);   //在使用的手机号码
+        lambdaQueryWrapper4.eq(AlarmHistoryEntity::getFarmCode, farmCode).orderByDesc(AlarmHistoryEntity::getId);
+        IPage<AlarmHistoryEntity> alarmHistoryEntityIPage = alarmHistoryDao.selectPage(page, lambdaQueryWrapper4);
+        return R.ok().put("page", alarmHistoryEntityIPage);
     }
 
 

huimv-massage-service/src/main/java/com/huimv/socketservice/controller/FarmRegisterController.java

@@ -6,11 +6,7 @@ import java.util.Map;
 import com.huimv.socketservice.result.R;
 import com.huimv.socketservice.socket.eartagrecive.util.PageUtils;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 import com.huimv.socketservice.entity.FarmRegisterEntity;
 import com.huimv.socketservice.service.FarmRegisterService;
@@ -26,6 +22,7 @@ import com.huimv.socketservice.service.FarmRegisterService;
  * @date 2021-09-07 10:24:09
  */
 @RestController
+@CrossOrigin
 @RequestMapping("socketservice/farmregister")
 public class FarmRegisterController {
     @Autowired

huimv-massage-service/src/main/java/com/huimv/socketservice/controller/HeartBeatController.java

@@ -6,11 +6,7 @@ import java.util.Map;
 import com.huimv.socketservice.result.R;
 import com.huimv.socketservice.socket.eartagrecive.util.PageUtils;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 import com.huimv.socketservice.entity.HeartBeatEntity;
 import com.huimv.socketservice.service.HeartBeatService;
@@ -25,6 +21,7 @@ import com.huimv.socketservice.service.HeartBeatService;
  * @version ${version}
  * @date 2021-09-06 15:16:14
  */
+@CrossOrigin
 @RestController
 @RequestMapping("socketservice/heartbeat")
 public class HeartBeatController {

huimv-massage-service/src/main/java/com/huimv/socketservice/controller/PhoneNumberController.java

@@ -1,17 +1,23 @@
  package com.huimv.socketservice.controller;
 
 import java.util.Arrays;
+import java.util.List;
 import java.util.Map;
 
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.huimv.socketservice.dao.AlarmHistoryDao;
+import com.huimv.socketservice.dao.FarmRegisterDao;
+import com.huimv.socketservice.dao.PhoneNumberDao;
+import com.huimv.socketservice.entity.AlarmHistoryEntity;
+import com.huimv.socketservice.entity.FarmRegisterEntity;
 import com.huimv.socketservice.result.R;
 import com.huimv.socketservice.socket.eartagrecive.util.PageUtils;
+import com.huimv.socketservice.socket.eartagrecive.util.StringUtilsWork;
+import org.hibernate.id.factory.internal.DefaultIdentifierGeneratorFactory;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
-
+import org.springframework.web.bind.annotation.*;
 import com.huimv.socketservice.entity.PhoneNumberEntity;
 import com.huimv.socketservice.service.PhoneNumberService;
 
@@ -26,22 +32,42 @@ import com.huimv.socketservice.service.PhoneNumberService;
  * @date 2021-09-07 10:24:08
  */
 @RestController
+@CrossOrigin
 @RequestMapping("socketservice/phonenumber")
 public class PhoneNumberController {
     @Autowired
     private PhoneNumberService phoneNumberService;
 
+    @Autowired
+    private PhoneNumberDao  phoneNumberDao ;
+
+    @Autowired
+    private FarmRegisterDao  farmRegisterDao  ;
+
+    @Autowired
+    private AlarmHistoryDao alarmHistoryDao   ;
+
     /**
      * 列表
      */
     @RequestMapping("/list")
     public R list(@RequestParam Map<String, Object> params){
-        PageUtils page = phoneNumberService.queryPage(params);
-
-        return R.ok().put("page", page);
+        IPage<PhoneNumberEntity> page = new Page<>();
+        String farmCode = (String) params.get("farmCode");//牧场编码
+
+        //最多十个通知人，不做分页,d但是用分页查询的
+        LambdaQueryWrapper<PhoneNumberEntity> lambdaQueryWrapper1 = new LambdaQueryWrapper<>();
+        lambdaQueryWrapper1.eq(PhoneNumberEntity::getStatus, 0);   //在使用的手机号码
+        lambdaQueryWrapper1.eq(PhoneNumberEntity::getAlarmType, 1);   //在使用的手机号码
+        lambdaQueryWrapper1.eq(PhoneNumberEntity::getFarmCode, farmCode);
+        IPage<PhoneNumberEntity> PhoneNumberEntity11 = phoneNumberDao.selectPage(page, lambdaQueryWrapper1);
+        return R.ok().put("page", PhoneNumberEntity11);
     }
 
 
+
+
+
     /**
      * 信息
      */
@@ -55,30 +81,97 @@ public class PhoneNumberController {
     /**
      * 保存
      */
-    @RequestMapping("/save")
-    public R save(@RequestBody PhoneNumberEntity phoneNumber){
-		phoneNumberService.save(phoneNumber);
 
-        return R.ok();
+
+    @RequestMapping("/save")
+    public R save(@RequestParam Map<String, Object> params){
+        String farmCode = (String) params.get("farmCode");//牧场编码
+        String userName = (String) params.get("userName");//牧场编码
+        String phoneNumber = (String) params.get("phoneNumber");//牧场编码
+        String remark = (String) params.get("remark");//牧场编码
+
+
+        //保存  保存之前鉴定已经有的人数是否会大于10
+        LambdaQueryWrapper<PhoneNumberEntity> lambdaQueryWrapper1 = new LambdaQueryWrapper<>();
+        lambdaQueryWrapper1.eq(PhoneNumberEntity::getStatus, 0);   //在使用的手机号码
+        lambdaQueryWrapper1.eq(PhoneNumberEntity::getAlarmType, 1);   //在使用的手机号码   只限定与
+        lambdaQueryWrapper1.eq(PhoneNumberEntity::getFarmCode, farmCode);
+        List<PhoneNumberEntity> phoneNumberEntities = phoneNumberDao.selectList(lambdaQueryWrapper1);
+
+        if(phoneNumberEntities.size()>10){
+            return R.error("添加人数累计不得大于10人");
+        }
+
+        LambdaQueryWrapper<PhoneNumberEntity> lambdaQueryWrapper3 = new LambdaQueryWrapper<>();
+        lambdaQueryWrapper3.eq(PhoneNumberEntity::getStatus, 0);   //在使用的手机号码
+        lambdaQueryWrapper3.eq(PhoneNumberEntity::getAlarmType, 1);   //在使用的手机号码   只限定与
+        lambdaQueryWrapper3.eq(PhoneNumberEntity::getUserName, userName);   //
+        lambdaQueryWrapper3.eq(PhoneNumberEntity::getFarmCode, farmCode);
+        List<PhoneNumberEntity> phoneNumberEntitie1 = phoneNumberDao.selectList(lambdaQueryWrapper3);
+
+        if(phoneNumberEntitie1.size()>0){
+            return R.error("不得重复添加");
+        }
+        LambdaQueryWrapper<FarmRegisterEntity> lambdaQueryWrapper4 = new LambdaQueryWrapper<>();
+        lambdaQueryWrapper4.eq(FarmRegisterEntity::getStatus, 0);   //在使用的手机号码
+        lambdaQueryWrapper4.eq(FarmRegisterEntity::getFarmCode, farmCode);
+        FarmRegisterEntity farmRegisterEntity = farmRegisterDao.selectOne(lambdaQueryWrapper4);
+
+
+        PhoneNumberEntity phoneNumberEntity = new PhoneNumberEntity();
+        phoneNumberEntity.setUserName(userName);
+        phoneNumberEntity.setRemark(remark);
+        phoneNumberEntity.setFarmCode(farmRegisterEntity.getFarmCode());
+        phoneNumberEntity.setStatus(0);
+        phoneNumberEntity.setPhoneNumber(phoneNumber);
+        phoneNumberEntity.setAlarmType(1);
+
+        phoneNumberService.save(phoneNumberEntity);
+
+        return R.ok("保存成功");
     }
 
+
+
     /**
      * 修改
      */
     @RequestMapping("/update")
-    public R update(@RequestBody PhoneNumberEntity phoneNumber){
-		phoneNumberService.updateById(phoneNumber);
+    public R update(@RequestParam Map<String, Object> params){
 
-        return R.ok();
+        String farmCode = (String) params.get("farmCode");//牧场编码
+        String userName = (String) params.get("userName");
+        String remark = (String) params.get("remark");
+        String phoneNumber = (String) params.get("phoneNumber");
+        Integer id = Integer.valueOf( params.get("id").toString());
+
+        LambdaQueryWrapper<PhoneNumberEntity> lambdaQueryWrapper1 = new LambdaQueryWrapper<>();
+        lambdaQueryWrapper1.eq(PhoneNumberEntity::getId, id);
+        lambdaQueryWrapper1.eq(PhoneNumberEntity::getFarmCode, farmCode);
+        lambdaQueryWrapper1.eq(PhoneNumberEntity::getStatus, 0);
+        PhoneNumberEntity phoneNumberEntity = phoneNumberDao.selectOne(lambdaQueryWrapper1);
+
+        phoneNumberEntity.setPhoneNumber(phoneNumber);
+        phoneNumberEntity.setRemark(remark);
+        phoneNumberEntity.setUserName(userName);
+
+        phoneNumberService.updateById(phoneNumberEntity);
+
+        return R.ok("修改成功");
     }
 
+
     /**
      * 删除
      */
     @RequestMapping("/delete")
-    public R delete(@RequestBody Integer[] ids){
-		phoneNumberService.removeByIds(Arrays.asList(ids));
-
+    public R delete(@RequestParam Map<String, Object> params){
+        Integer id = Integer.valueOf( params.get("id").toString());
+        LambdaQueryWrapper<PhoneNumberEntity> lambdaQueryWrapper1 = new LambdaQueryWrapper<>();
+        lambdaQueryWrapper1.eq(PhoneNumberEntity::getId, id);
+        lambdaQueryWrapper1.eq(PhoneNumberEntity::getStatus, 0);
+        PhoneNumberEntity phoneNumberEntity = phoneNumberDao.selectOne(lambdaQueryWrapper1);
+		phoneNumberService.removeById(phoneNumberEntity.getId());
         return R.ok();
     }
 

huimv-massage-service/src/main/java/com/huimv/socketservice/result/R.java

@@ -40,6 +40,9 @@ public class R extends HashMap<String, Object> {
         return r;
     }
 
+
+
+
     public static R ok() {
         return new R();
     }

huimv-massage-service/src/main/java/com/huimv/socketservice/timmertask/DeleteOldData.java

@@ -45,7 +45,6 @@ public class DeleteOldData {
         lambdaQueryWrapper.between(HeartBeatEntity::getCreateTime, settingTimesBeforeTowday, settingTimesBeforeOneday);   //在使用的牧场
         List<Integer> collect = heartBeatDao.selectObjs(lambdaQueryWrapper).stream().map(o -> (Integer) o).collect(Collectors.toList());
         heartBeatService.removeByIds(collect);
-//
     }