修改隔离接口

admin/src/main/java/com/huimv/farm/damsubsidy/controller/BillIsolatedController.java

@@ -1,13 +1,17 @@
 package com.huimv.farm.damsubsidy.controller;
 
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.huimv.farm.damsubsidy.common.utils.Result;
+import com.huimv.farm.damsubsidy.common.utils.ResultCode;
+import com.huimv.farm.damsubsidy.entity.BillIsolated;
 import com.huimv.farm.damsubsidy.service.IBillIsolatedService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 
 import javax.servlet.http.HttpServletRequest;
+import java.text.ParseException;
 import java.util.Map;
 
 /**
@@ -27,7 +31,7 @@ public class BillIsolatedController {
     private IBillIsolatedService iBillIsolatedService;
 
     @PostMapping("/addIsolation")
-    public Result addIsolation(HttpServletRequest httpServletRequest, @RequestBody Map<String, String> paramsMap){
+    public Result addIsolation(HttpServletRequest httpServletRequest, @RequestBody Map<String, String> paramsMap) throws ParseException {
         return iBillIsolatedService.addIsolation(httpServletRequest,paramsMap);
     }
 
@@ -49,4 +53,10 @@ public class BillIsolatedController {
                                   @RequestParam("deaths") String deaths){
         return iBillIsolatedService.cancelIsolation(httpServletRequest,image,id,isDead,deaths);
     }
+
+    @PostMapping("/listDetail")
+    public Result listDetail(@RequestBody Map<String, String> paramsMap){
+        String inspectionNum = paramsMap.get("inspectionNum");
+        return new Result(ResultCode.SUCCESS,iBillIsolatedService.getOne(new QueryWrapper<BillIsolated>().eq("inspection_num",inspectionNum)));
+    }
 }

admin/src/main/java/com/huimv/farm/damsubsidy/controller/MenuController.java

@@ -17,7 +17,7 @@ public class MenuController {
 
     @PostMapping("/add")
     public Result addMenu(@RequestBody Menu menu , HttpServletRequest request){
-        Integer userId = TokenSign.getMemberIdByJwtToken(request);
+        Long userId = TokenSign.getMemberIdByJwtToken(request);
 
         return menuService.addMenu(menu,userId);
     }

admin/src/main/java/com/huimv/farm/damsubsidy/controller/SysUserController.java

@@ -56,7 +56,7 @@ public class SysUserController {
         if (result.getCode() == 10004) {
             accessToken.setAccountName("游客");
             accessToken.setCreated(new Date());
-            accessToken.setToken(TokenSign.sign("游客", map.get("phone")));
+            accessToken.setToken(TokenSign.sign("游客", map.get("phone"),null));
             accessToken.setLoginIp("");
         }
         if (result.getCode() == 10001) {
@@ -168,7 +168,7 @@ public class SysUserController {
             accessToken.setAccountName(user.getUserName());
             accessToken.setCreated(new Date());
             accessToken.setLoginIp(user.getLastIp());
-            accessToken.setToken(TokenSign.sign(user.getUserName(), user.getPhone()));
+            accessToken.setToken(TokenSign.sign(user.getUserName(), user.getPhone(),user.getId()));
             JSONObject jsonObject = new JSONObject();
             jsonObject.put("newToken", accessToken);
             jsonObject.put("user", user);
@@ -227,20 +227,4 @@ public class SysUserController {
 //        return iSysUserService.listSubordinate(searchStr,pageNum,pageSize,userId);
         return null;
     }
-    }
-
-   /* @PostMapping("/add")
-    public Result add(@RequestBody SysAccountMultilevel sysAccountMultilevel , HttpServletRequest request){
-
-        Integer userId = TokenSign.getMemberIdByJwtToken(request);
-        return accountMultilevelService.add(sysAccountMultilevel,userId);
-
-    }
-
-    @PostMapping("/update")
-    public Result update(@RequestBody SysAccountMultilevel sysAccountMultilevel){
-        accountMultilevelService.updateById(sysAccountMultilevel);
-
-        return new Result(10000,"修改成功",true);
-
-    }
+}

admin/src/main/java/com/huimv/farm/damsubsidy/entity/BillIsolated.java

@@ -8,6 +8,8 @@ import com.baomidou.mybatisplus.annotation.TableId;
 import java.time.LocalDateTime;
 import java.util.Date;
 import java.io.Serializable;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
@@ -51,7 +53,8 @@ public class BillIsolated extends BaseEntity implements Serializable {
     /**
      * 隔离开始时间
      */
-    private LocalDateTime strIsolated;
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+    private Date strIsolated;
 
     /**
      * 隔离天数
@@ -61,7 +64,8 @@ public class BillIsolated extends BaseEntity implements Serializable {
     /**
      * 隔离结束时间
      */
-    private LocalDateTime endIsolated;
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+    private Date endIsolated;
 
     /**
      * 延期天数

admin/src/main/java/com/huimv/farm/damsubsidy/service/IBillIsolatedService.java

@@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
 import org.springframework.web.multipart.MultipartFile;
 
 import javax.servlet.http.HttpServletRequest;
+import java.text.ParseException;
 import java.util.Map;
 
 /**
@@ -18,7 +19,7 @@ import java.util.Map;
  */
 public interface IBillIsolatedService extends IService<BillIsolated> {
 
-    Result addIsolation(HttpServletRequest httpServletRequest, Map<String, String> paramsMap);
+    Result addIsolation(HttpServletRequest httpServletRequest, Map<String, String> paramsMap) throws ParseException;
 
     Result listIsolation(HttpServletRequest httpServletRequest, Map<String, String> paramsMap);
 

admin/src/main/java/com/huimv/farm/damsubsidy/service/IMenuService.java

@@ -16,7 +16,7 @@ import java.util.Map;
  * @since 2021-09-09
  */
 public interface IMenuService extends IService<Menu> {
-    Result addMenu(Menu menu, Integer userId);
+    Result addMenu(Menu menu, Long userId);
     //修改菜单
     Result editMenu(Menu menu);
     //删除菜单(批量)

admin/src/main/java/com/huimv/farm/damsubsidy/service/impl/BillIsolatedServiceImpl.java

@@ -3,6 +3,7 @@ package com.huimv.farm.damsubsidy.service.impl;
 import cn.hutool.core.date.DateTime;
 import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.lang.UUID;
+import cn.hutool.core.util.ObjectUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.huimv.farm.damsubsidy.common.token.TokenSign;
@@ -26,13 +27,12 @@ import javax.servlet.http.HttpServletRequest;
 import java.io.BufferedInputStream;
 import java.io.ByteArrayOutputStream;
 import java.io.InputStream;
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
 import java.time.LocalDate;
 import java.time.LocalDateTime;
 import java.time.format.DateTimeFormatter;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 
 /**
  * <p>
@@ -53,22 +53,29 @@ public class BillIsolatedServiceImpl extends ServiceImpl<BillIsolatedMapper, Bil
 
     @Override
     @Transactional
-    public Result addIsolation(HttpServletRequest httpServletRequest, Map<String, String> paramsMap) {
+    public Result addIsolation(HttpServletRequest httpServletRequest, Map<String, String> paramsMap) throws ParseException {
         String inspectionNum = paramsMap.get("inspectionNum");
         String isolatedPosition = paramsMap.get("isolatedPosition");
         String strIsolated = paramsMap.get("strIsolated");
         String dayIsolated = paramsMap.get("dayIsolated");
 
+        Integer integer = this.count(new QueryWrapper<BillIsolated>().eq("inspection_num", inspectionNum));
+        if (integer != 0){
+            return new Result(10001,"检疫证号重复！",false);
+        }
         BillIsolated billIsolated = new BillIsolated();
-        DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
-        LocalDateTime time = LocalDateTime.parse(strIsolated, formatter);
-        LocalDateTime endDay = time.plusDays(Long.valueOf(dayIsolated));
+        SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd");
+        Date startTime = dateFormat.parse(strIsolated);
+        Calendar calendar = Calendar.getInstance();
+        calendar.setTime(startTime);
+        calendar.add(Calendar.DATE, Integer.valueOf(dayIsolated));
+        Date endTime = calendar.getTime();
         billIsolated.setInspectionName(TokenSign.getUserName(httpServletRequest)+"的隔离信息");
         billIsolated.setInspectionNum(inspectionNum);
         billIsolated.setIsolatedPosition(isolatedPosition);
-        billIsolated.setStrIsolated(time);
+        billIsolated.setStrIsolated(startTime);
         billIsolated.setDayIsolated(Integer.parseInt(dayIsolated));
-        billIsolated.setEndIsolated(endDay);
+        billIsolated.setEndIsolated(endTime);
         billIsolated.setCreateTime(DateTime.now());
         billIsolated.setCreateUser(TokenSign.getUserName(httpServletRequest));
         this.save(billIsolated);
@@ -187,9 +194,16 @@ public class BillIsolatedServiceImpl extends ServiceImpl<BillIsolatedMapper, Bil
     public Result delayedIsolation(HttpServletRequest httpServletRequest, Map<String, String> paramsMap) {
         String id = paramsMap.get("id");
         String day = paramsMap.get("day");
+        if (day.contains(".")){
+            return new Result(10001,"请输入整数",false);
+        }
         BillIsolated billIsolated = this.getById(id);
         billIsolated.setDayIsolated(billIsolated.getDayIsolated()+Integer.parseInt(day));
-        billIsolated.setEndIsolated(billIsolated.getEndIsolated().plusDays(Integer.parseInt(day)));
+        Calendar calendar = Calendar.getInstance();
+        calendar.setTime(billIsolated.getEndIsolated());
+        calendar.add(Calendar.DATE, Integer.valueOf(day));
+        Date endTime = calendar.getTime();
+        billIsolated.setEndIsolated(endTime);
         this.updateById(billIsolated);
         return Result.SUCCESS();
     }
@@ -237,6 +251,9 @@ public class BillIsolatedServiceImpl extends ServiceImpl<BillIsolatedMapper, Bil
                 for (String s : eartag) {
                     if (!s.contains("-")){
                         BaseAnimal baseAnimal = baseAnimalMapper.selectOne(new QueryWrapper<BaseAnimal>().eq("earatg_no", s));
+                        if (ObjectUtil.isEmpty(baseAnimal)){
+                            return new Result(10001,"耳标号不存在",false);
+                        }
                         baseAnimal.setIsDie(1);
                         baseAnimalMapper.updateById(baseAnimal);
                     }else {
@@ -251,6 +268,9 @@ public class BillIsolatedServiceImpl extends ServiceImpl<BillIsolatedMapper, Bil
                         for (Integer number : numbers) {
                             String earatgNo = number.toString();
                             BaseAnimal animal = baseAnimalMapper.selectOne(new QueryWrapper<BaseAnimal>().eq("earatg_no", earatgNo));
+                            if (ObjectUtil.isEmpty(animal)){
+                                return new Result(10001,"耳标号不存在",false);
+                            }
                             animal.setIsDie(1);
                             baseAnimalMapper.updateById(animal);
                         }
@@ -259,6 +279,9 @@ public class BillIsolatedServiceImpl extends ServiceImpl<BillIsolatedMapper, Bil
             }else {
                 if (!deaths.contains("-")){
                     BaseAnimal baseAnimal = baseAnimalMapper.selectOne(new QueryWrapper<BaseAnimal>().eq("earatg_no", deaths));
+                    if (ObjectUtil.isEmpty(baseAnimal)){
+                        return new Result(10001,"耳标号不存在",false);
+                    }
                     baseAnimal.setIsDie(1);
                     baseAnimalMapper.updateById(baseAnimal);
                 }else {
@@ -273,6 +296,9 @@ public class BillIsolatedServiceImpl extends ServiceImpl<BillIsolatedMapper, Bil
                     for (Integer number : numbers) {
                         String earatgNo = number.toString();
                         BaseAnimal animal = baseAnimalMapper.selectOne(new QueryWrapper<BaseAnimal>().eq("earatg_no", earatgNo));
+                        if (ObjectUtil.isEmpty(animal)){
+                            return new Result(10001,"耳标号不存在",false);
+                        }
                         animal.setIsDie(1);
                         baseAnimalMapper.updateById(animal);
                     }
@@ -284,7 +310,7 @@ public class BillIsolatedServiceImpl extends ServiceImpl<BillIsolatedMapper, Bil
         BillLandingInspection billLandingInspection = landingInspectionMapper.selectOne(new QueryWrapper<BillLandingInspection>().eq("inspection_num", isolation.getInspectionNum()));
         billLandingInspection.setInspectionSch(4);
         landingInspectionMapper.updateById(billLandingInspection);
-        this.save(isolation);
+        this.updateById(isolation);
         return Result.SUCCESS();
     }
 

admin/src/main/java/com/huimv/farm/damsubsidy/service/impl/MenuServiceImpl.java

@@ -39,7 +39,7 @@ public class MenuServiceImpl extends ServiceImpl<MenuMapper, Menu> implements IM
     private GroupMenuMapper groupMenuMapper;
 
     @Override
-    public Result addMenu(Menu menu, Integer userId) {
+    public Result addMenu(Menu menu, Long userId) {
 
         try {
             if (menu == null){