bug

huimv-receive/src/main/java/com/huimv/receive/controller/BaseJobController.java

@@ -29,7 +29,6 @@ public class BaseJobController {
 
     @PostMapping("/list")
     public Result listAll(@RequestBody Map<String, String> paramsMap) {
-        String farmId = paramsMap.get("farmId");
         return new Result(ResultCode.SUCCESS,baseJobService.list());
     }
 

huimv-receive/src/main/java/com/huimv/receive/controller/BillSamplingController.java

@@ -33,6 +33,7 @@ public class BillSamplingController {
     public Result listSampling(HttpServletRequest httpServletRequest, @RequestBody Map<String, String> paramsMap) {
         return billSamplingService.list(httpServletRequest, paramsMap);
     }
+
     @RequestMapping("/listById")
     public Result listById(HttpServletRequest httpServletRequest, @RequestBody Map<String, String> paramsMap) {
         return billSamplingService.listById(httpServletRequest, paramsMap);

huimv-receive/src/main/java/com/huimv/receive/controller/LoginController.java

@@ -144,7 +144,7 @@ public class LoginController {
             accessToken.setCreated(new Date());
             accessToken.setAccountName(accountEntity.getAccount());
             accessToken.setFarmId(accountEntity.getFarmIds());
-            String token = TokenSign.sign(accountEntity.getAccount(), id, accountEntity.getFarmIds(), accountEntity.getWorkLocationType()+"", accountEntity.getType());
+            String token = TokenSign.sign(accountEntity.getUserName(), id, accountEntity.getFarmIds(), accountEntity.getWorkLocationType()+"", accountEntity.getType());
             accessToken.setToken(token);
 
             accessToken.setId(id);

huimv-receive/src/main/java/com/huimv/receive/service/impl/BillCleanServiceImpl.java

@@ -53,6 +53,8 @@ public class BillCleanServiceImpl extends ServiceImpl<BillCleanMapper, BillClean
     @Autowired
     private BaseLocationMapper locationMapper;
     @Autowired
+    private BaseWashoutPointMapper baseWashoutPointMapper;
+    @Autowired
     private UploadImage uploadImage;
     @Autowired
     private BillDryMapper dryMapper;
@@ -84,18 +86,13 @@ public class BillCleanServiceImpl extends ServiceImpl<BillCleanMapper, BillClean
         }
         if (type.equals("0")) {
 
-            QueryWrapper<BaseLocation> queryWrapper1 = new QueryWrapper<>();
-            queryWrapper1.eq("location_type", TokenSign.getWorkIdByJwtToken(httpServletRequest));
-            List<BaseLocation> baseLocations = locationMapper.selectList(queryWrapper1);
-            List<Integer> ids = new ArrayList<>();
-            for (BaseLocation baseLocation : baseLocations) {
-                ids.add(baseLocation.getId());
-            }
+            BaseLocation baseLocation = locationMapper.selectById(TokenSign.getWorkIdByJwtToken(httpServletRequest));
+
 
             Page<BillClean> page = new Page<>(Integer.parseInt(pageNum), Integer.parseInt(pageSize));
             QueryWrapper<BillClean> queryWrapper = new QueryWrapper<>();
             queryWrapper.eq("farm_id", farmId).eq("vistit_type", type).orderByDesc("sub_date")
-                    .in("test_location_id", ids);
+                    .eq("test_location_id", baseLocation.getId());
 
             if ("0".equals(data)) {
                 queryWrapper.in("bill_status", 0, 1, 2);
@@ -108,7 +105,7 @@ public class BillCleanServiceImpl extends ServiceImpl<BillCleanMapper, BillClean
             }
             QueryWrapper<BillClean> queryWrapper2 = new QueryWrapper<>();
             queryWrapper2.eq("farm_id", farmId).eq("vistit_type", type).orderByDesc("sub_date")
-                    .in("test_location_id", ids).eq("bill_status", 0);
+                    .eq("test_location_id", baseLocation.getId()).eq("bill_status", 0);
 
             return new Result(ResultCode.SUCCESS, cleanMapper.selectPage(page, queryWrapper), cleanMapper.selectCount(queryWrapper2));
         }/* else if (type.equals("4")) {

huimv-receive/src/main/java/com/huimv/receive/service/impl/BillPcrServiceImpl.java

@@ -300,15 +300,8 @@ public class BillPcrServiceImpl extends ServiceImpl<BillPcrMapper, BillPcr> impl
             pageSize = "20";
         }
         Page<BillPcr> page = new Page<>(Integer.parseInt(pageNum), Integer.parseInt(pageSize));
-        QueryWrapper<BaseLocation> queryWrapper1 = new QueryWrapper<>();
-        queryWrapper1.eq("location_type", TokenSign.getWorkIdByJwtToken(httpServletRequest));
-        List<BaseLocation> baseLocations = locationMapper.selectList(queryWrapper1);
-        List<Integer> ids = new ArrayList<>();
-        for (BaseLocation baseLocation : baseLocations) {
-            ids.add(baseLocation.getId());
-        }
         QueryWrapper<BillPcr> queryWrapper = new QueryWrapper<>();
-        queryWrapper.eq("farm_id", farmId).in("test_location_id", ids).orderByDesc("sub_date");
+        queryWrapper.eq("farm_id", farmId).eq("test_location_id", TokenSign.getWorkIdByJwtToken(httpServletRequest)).orderByDesc("sub_date");
         if ("0".equals(type)) {
             queryWrapper.in("bill_status", 0, 1, 2, 3);
         }
@@ -322,7 +315,7 @@ public class BillPcrServiceImpl extends ServiceImpl<BillPcrMapper, BillPcr> impl
             queryWrapper.in("bill_status", 2, 3);
         }
         QueryWrapper<BillPcr> queryWrapper2 = new QueryWrapper<>();
-        queryWrapper2.eq("farm_id", farmId).in("test_location_id", ids).orderByDesc("sub_date");
+        queryWrapper2.eq("farm_id", farmId).eq("test_location_id", TokenSign.getWorkIdByJwtToken(httpServletRequest)).orderByDesc("sub_date");
         queryWrapper2.eq("bill_status", 0);
         return new Result(ResultCode.SUCCESS, pcrMapper.selectPage(page, queryWrapper), pcrMapper.selectCount(queryWrapper2));
     }

huimv-receive/src/main/java/com/huimv/receive/service/impl/BillSamplingServiceImpl.java

@@ -23,6 +23,7 @@ import java.io.IOException;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
 import java.time.LocalDateTime;
+import java.time.format.DateTimeFormatter;
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
@@ -130,11 +131,8 @@ public class BillSamplingServiceImpl extends ServiceImpl<BillSamplingMapper, Bil
         }
         s = uploadImage.getVideoCom(img);
 
-        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm");
+        DateTimeFormatter dateTimeFormatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm");
 
-        if (StringUtils.isBlank(date)) {
-            date = sdf.format(new Date());
-        }
         BillSampling sampling = billSamplingMapper.selectById(id);
         sampling.setImgUrl(s);
         sampling.setImgStatus(1);
@@ -161,7 +159,7 @@ public class BillSamplingServiceImpl extends ServiceImpl<BillSamplingMapper, Bil
         sampling.setPassUserId(TokenSign.getMemberIdByJwtToken(httpServletRequest));
         sampling.setTestLocation(baseLocation.getLocationName());
         sampling.setTestLocationId(baseLocation.getId());
-        sampling.setCheckDate(LocalDateTime.parse(date));
+        sampling.setCheckDate(LocalDateTime.parse(date, dateTimeFormatter));
         sampling.setPassDate(LocalDateTime.now());
 
 
@@ -200,7 +198,7 @@ public class BillSamplingServiceImpl extends ServiceImpl<BillSamplingMapper, Bil
             BillCleanBefore before = new BillCleanBefore();
             billCleanBeforeMapper.insert(before);
         }
-        baseProcess.setUpdateDate(baseProcess.getUpdateDate() + "," + sdf.format(new Date()));
+        baseProcess.setUpdateDate(baseProcess.getUpdateDate() + "," + LocalDateTime.now().format(dateTimeFormatter));
         baseProcess.setCurrentLocation(baseProcess.getCurrentLocation() + "," + baseLocation.getLocationName());
         baseProcess.setCurrentLocationId(baseProcess.getCurrentLocationId() + "," + baseLocation.getId());
         String status = baseProcess.getCurrentStatus();
@@ -210,6 +208,6 @@ public class BillSamplingServiceImpl extends ServiceImpl<BillSamplingMapper, Bil
         baseProcess.setCurrentFlowId(baseProcess.getCurrentLocationId() + "," + nextId);
         processMapper.updateById(baseProcess);
         billSamplingMapper.updateById(sampling);
-        return new Result(10000, "修改成功！", true);
+        return new Result(10000, "修改成功!", true);
     }
 }

huimv-receive/src/main/java/com/huimv/receive/service/impl/SysUserServiceImpl.java

@@ -96,13 +96,10 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
     @Override
     public Result listWorkLocation(Map map) {
         String farmId = (String)map.get("farmId");
-        if (checkFarm(farmId))
+        if (checkFarm(farmId)){
             return new Result(10001,"牧场信息为空",false);
-        Exist exist = existMapper.selectOne(new QueryWrapper<Exist>().eq("farm_id", farmId));
-        if (exist.getExist() == 0){
-            return new Result(ResultCode.SUCCESS,baseLocationMapper.selectList(new QueryWrapper<BaseLocation>().groupBy("location_type").orderByAsc("location_type")));
         }else {
-            return new Result(ResultCode.SUCCESS,baseLocationMapper.selectList(new QueryWrapper<BaseLocation>().notIn("location_type",3,7,9).groupBy("location_type").orderByAsc("location_type")));
+            return new Result(ResultCode.SUCCESS,baseLocationMapper.selectList(new QueryWrapper<BaseLocation>().like("farm_ids",farmId)));
         }
       }