生物防控人员2

huimv-admin/src/main/java/com/huimv/admin/jinghongtimer/ProtTimer.java

@@ -52,7 +52,9 @@ public class ProtTimer {
                 }else {
                     protData.setLoctionType(1);
                 }
-
+                if("865661077850256".equals(jinghongWater.getDeviceId())){
+                    protData.setFlow(String.format("%.2f",Double.parseDouble(jinghongWater.getValueA()) * 0.01));
+                }
 
                 protData.setCod("0");
                 protData.setNh3n("0");

huimv-admin/src/main/java/com/huimv/admin/service/impl/ProtDataServiceImpl.java

@@ -1082,7 +1082,7 @@ public class ProtDataServiceImpl extends ServiceImpl<ProtDataMapper, ProtData> i
         QueryWrapper<ProtData> protDataQueryWrapper = new QueryWrapper<>();
         ArrayList<Map> maps = new ArrayList<>();
         Date now = new Date();
-        for (int i = 8; i >0 ; i--) {
+        for (int i = 8; i >=0 ; i--) {
             DateTime dateTime = DateUtil.offsetDay(now, -i);
             HashMap<Object, Object> objectObjectHashMap = new HashMap<>();
             ProtData protData = getListFlowScreenWrapper(protDataQueryWrapper,1,dateTime,farmId);

huimv-admin/src/main/java/com/huimv/admin/timer/SafeTimer.java

@@ -1,54 +1,54 @@
-package com.huimv.admin.timer;
-
-
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.huimv.admin.common.utils.NumberUtils;
-import com.huimv.admin.entity.BillIsolate;
-import com.huimv.admin.entity.GasData;
-import com.huimv.admin.entity.GasThreshold;
-import com.huimv.admin.entity.GasWarningInfo;
-import com.huimv.admin.mapper.GasDataMapper;
-import com.huimv.admin.mapper.GasThresholdMapper;
-import com.huimv.admin.mapper.GasWarningInfoMapper;
-import com.huimv.admin.service.IBillIsolateService;
-import com.huimv.admin.service.IBillPcrService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.scheduling.annotation.EnableScheduling;
-import org.springframework.scheduling.annotation.Scheduled;
-
-import java.text.ParseException;
-import java.text.SimpleDateFormat;
-import java.util.Date;
-import java.util.List;
-
-@Configuration
-@EnableScheduling
-public class SafeTimer {
-
-
-    @Autowired
-    private IBillPcrService pcrService;
-    @Autowired
-    private IBillIsolateService isolateService;
-
-
-    @Scheduled(cron = "0 0/1 * * * ? ")
-    private void getShenChan() throws Exception {
-        QueryWrapper<BillIsolate> queryWrapper = new QueryWrapper<>();
-        queryWrapper.eq("bill_status", 1);
-        List<BillIsolate> isolates = isolateService.list(queryWrapper);
-        Date date = new Date();
-        for (BillIsolate isolate : isolates) {
-            if (isolate.getIsolateEndDate().getTime() <= date.getTime()) {
-                isolate.setIsolateRealEndDate(date);
-                isolate.setIsolateRealDayNum(isolate.getIsolateDayNum());
-                isolate.setBillStatus(2);
-                isolate.setPassUserName("自然解除隔离");
-                isolate.setPassDate(date);
-                isolateService.updateById(isolate);
-            }
-        }
-    }
-
-}
+//package com.huimv.admin.timer;
+//
+//
+//import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+//import com.huimv.admin.common.utils.NumberUtils;
+//import com.huimv.admin.entity.BillIsolate;
+//import com.huimv.admin.entity.GasData;
+//import com.huimv.admin.entity.GasThreshold;
+//import com.huimv.admin.entity.GasWarningInfo;
+//import com.huimv.admin.mapper.GasDataMapper;
+//import com.huimv.admin.mapper.GasThresholdMapper;
+//import com.huimv.admin.mapper.GasWarningInfoMapper;
+//import com.huimv.admin.service.IBillIsolateService;
+//import com.huimv.admin.service.IBillPcrService;
+//import org.springframework.beans.factory.annotation.Autowired;
+//import org.springframework.context.annotation.Configuration;
+//import org.springframework.scheduling.annotation.EnableScheduling;
+//import org.springframework.scheduling.annotation.Scheduled;
+//
+//import java.text.ParseException;
+//import java.text.SimpleDateFormat;
+//import java.util.Date;
+//import java.util.List;
+//
+//@Configuration
+//@EnableScheduling
+//public class SafeTimer {
+//
+//
+//    @Autowired
+//    private IBillPcrService pcrService;
+//    @Autowired
+//    private IBillIsolateService isolateService;
+//
+//
+//    @Scheduled(cron = "0 0/1 * * * ? ")
+//    private void getShenChan() throws Exception {
+//        QueryWrapper<BillIsolate> queryWrapper = new QueryWrapper<>();
+//        queryWrapper.eq("bill_status", 1);
+//        List<BillIsolate> isolates = isolateService.list(queryWrapper);
+//        Date date = new Date();
+//        for (BillIsolate isolate : isolates) {
+//            if (isolate.getIsolateEndDate().getTime() <= date.getTime()) {
+//                isolate.setIsolateRealEndDate(date);
+//                isolate.setIsolateRealDayNum(isolate.getIsolateDayNum());
+//                isolate.setBillStatus(2);
+//                isolate.setPassUserName("自然解除隔离");
+//                isolate.setPassDate(date);
+//                isolateService.updateById(isolate);
+//            }
+//        }
+//    }
+//
+//}

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

@@ -128,7 +128,7 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
         wrapper.eq(ObjectUtil.isNotEmpty(workLocationType),"work_location_type",workLocationType);
         wrapper.eq(ObjectUtil.isNotEmpty(gender),"gender",gender);
         if (StringUtils.isNotBlank(searchStr))
-            wrapper.and(i -> i.like("user_name",searchStr).or().like("user_id",searchStr));
+            wrapper.and(i -> i.like("sys_user.user_name",searchStr).or().like("sys_user.user_id",searchStr));
 
         Page<UserAccountVo> userAccountVoPage = new Page<>(pageNum,pageSize);
         IPage<UserAccountVo> userAccountVoIPage =  userMapper.pageAccount(userAccountVoPage,wrapper,farmId);