|
|
@@ -8,11 +8,13 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
|
|
|
import com.huimv.admin.common.utils.DataUill;
|
|
|
import com.huimv.admin.common.utils.Result;
|
|
|
import com.huimv.admin.common.utils.ResultCode;
|
|
|
+import com.huimv.admin.entity.ProdFermentDevice;
|
|
|
import com.huimv.admin.entity.ProtData;
|
|
|
import com.huimv.admin.entity.ProtWarningInfo;
|
|
|
import com.huimv.admin.entity.dto.ProCountDto;
|
|
|
import com.huimv.admin.entity.vo.ProCountVo;
|
|
|
import com.huimv.admin.entity.vo.ProDataVo;
|
|
|
+import com.huimv.admin.mapper.ProdFermentDeviceMapper;
|
|
|
import com.huimv.admin.mapper.ProtDataMapper;
|
|
|
import com.huimv.admin.mapper.ProtWarningInfoMapper;
|
|
|
import com.huimv.admin.service.IProtDataService;
|
|
|
@@ -39,6 +41,8 @@ public class ProtDataServiceImpl extends ServiceImpl<ProtDataMapper, ProtData> i
|
|
|
private ProtDataMapper protDataMapper;
|
|
|
@Autowired
|
|
|
private ProtWarningInfoMapper protWarningInfoMapper;
|
|
|
+ @Autowired
|
|
|
+ private ProdFermentDeviceMapper fermentDeviceMapper;
|
|
|
|
|
|
@Override
|
|
|
public Result list(HttpServletRequest httpServletRequest, Map<String, String> paramsMap) {
|
|
|
@@ -755,25 +759,9 @@ public class ProtDataServiceImpl extends ServiceImpl<ProtDataMapper, ProtData> i
|
|
|
queryWrapper1.ge("date", timesmorning);
|
|
|
Integer countDay = protWarningInfoMapper.selectCount(queryWrapper1);//今日报警条数
|
|
|
|
|
|
- //得到监测保障天数
|
|
|
- SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
|
|
|
- long day = 0;
|
|
|
- try {
|
|
|
- Date now = new Date();
|
|
|
- String nowTime = sdf.format(now);
|
|
|
-// System.out.println(now);
|
|
|
- Date date = sdf.parse("2023-01-01");//指定日期
|
|
|
- Date mydate = sdf.parse(nowTime);//当前日期
|
|
|
- day = (mydate.getTime() - date.getTime()) / (24 * 60 * 60 * 1000);
|
|
|
-// System.out.println(day);
|
|
|
- } catch (Exception e) {
|
|
|
- return new Result(ResultCode.SUCCESS, "");
|
|
|
- }
|
|
|
-
|
|
|
- DateTime dateTime = DateUtil.beginOfYear(new Date());
|
|
|
- QueryWrapper<ProtData> queryWrapper2 = new QueryWrapper<>();
|
|
|
- queryWrapper2.eq("farm_id", farmId).ge("create_date", dateTime);
|
|
|
- ProtData protData = protDataMapper.flowCount(queryWrapper2);
|
|
|
+ QueryWrapper<ProdFermentDevice> queryWrapper2 = new QueryWrapper<>();
|
|
|
+ queryWrapper2.eq("farm_id", farmId);
|
|
|
+ Integer day = fermentDeviceMapper.selectCount(queryWrapper2);
|
|
|
|
|
|
JSONObject jsonObject = new JSONObject();
|
|
|
jsonObject.put("locCount", 27);
|
