后端修改

src/main/java/com/steerinfo/meterwork/meterworkcaractualfirst/service/impl/MeterWorkCarActualFirstServiceImpl.java

@@ -5105,7 +5105,7 @@ public class MeterWorkCarActualFirstServiceImpl extends BaseServiceImpl<MeterWor
                 model.setNote("期限皮匹配结净");
                 model.setUploadFlag("1");
                 model.setIsPreScale("1");
-                model.setValueFlag("1");
+                model.setValueFlag("2");
                 model.setNetManNo("admin");
                 model.setNetManName("admin");
                 model.setNetSpot3No(tareModel.getBaseSpotNo());
@@ -5387,7 +5387,7 @@ public class MeterWorkCarActualFirstServiceImpl extends BaseServiceImpl<MeterWor
                     actualRow.setNetMode(DbConstants.TYPE);
                     actualRow.setUploadFlag("1");
                     actualRow.setIsPreScale("1");
-                    actualRow.setValueFlag("1");
+                    actualRow.setValueFlag("2");
                     actualRow.setPredictionNo(scale.getPredictionNo());
                     actualRow.setPredictionType("1");
                     actualRow.setNote("期限皮匹配结净");
@@ -5730,7 +5730,7 @@ public class MeterWorkCarActualFirstServiceImpl extends BaseServiceImpl<MeterWor
             actualRow01.setNote("内倒双委托期限皮匹配结净");
             actualRow01.setUploadFlag("1");
             actualRow01.setIsPreScale("1");
-            actualRow01.setValueFlag("1");
+            actualRow01.setValueFlag("2");
             actualRow01.setNetSpot3No(grossFirst01.getBaseSpotNo());
             actualRow01.setNetSpot3Name(grossFirst01.getBaseSpotName());
             actualRow01.setNetTime(grossFirst01.getCreateTime());
@@ -5747,7 +5747,7 @@ public class MeterWorkCarActualFirstServiceImpl extends BaseServiceImpl<MeterWor
             actualRow02.setNote("内倒双委托期限皮匹配结净");
             actualRow02.setUploadFlag("1");
             actualRow02.setIsPreScale("1");
-            actualRow02.setValueFlag("1");
+            actualRow02.setValueFlag("2");
             actualRow02.setNetSpot3No(grossFirst02.getBaseSpotNo());
             actualRow02.setNetSpot3Name(grossFirst02.getBaseSpotName());
             actualRow02.setNetTime(grossFirst02.getCreateTime());
@@ -5934,7 +5934,7 @@ public class MeterWorkCarActualFirstServiceImpl extends BaseServiceImpl<MeterWor
             actualRow01.setNote("内倒双委托一次匹配结净");
             actualRow01.setUploadFlag("1");
             actualRow01.setIsPreScale("1");
-            actualRow01.setValueFlag("1");
+            actualRow01.setValueFlag("2");
             if(actualRow01.getGrossTime().compareTo(actualRow01.getTareTime()) >= 0) {
                 actualRow01.setNetSpot3No(actualRow01.getBaseSpot1No());
                 actualRow01.setNetSpot3Name(actualRow01.getBaseSpot1Name());
@@ -5963,7 +5963,7 @@ public class MeterWorkCarActualFirstServiceImpl extends BaseServiceImpl<MeterWor
             actualRow02.setNote("内倒双委托一次匹配结净");
             actualRow02.setUploadFlag("1");
             actualRow02.setIsPreScale("1");
-            actualRow02.setValueFlag("1");
+            actualRow02.setValueFlag("2");
             if(actualRow02.getGrossTime().compareTo(actualRow02.getTareTime()) >= 0) {
                 actualRow02.setNetSpot3No(actualRow02.getBaseSpot1No());
                 actualRow02.setNetSpot3Name(actualRow02.getBaseSpot1Name());
@@ -6213,7 +6213,7 @@ public class MeterWorkCarActualFirstServiceImpl extends BaseServiceImpl<MeterWor
             actualRow01.setNote("内倒双委托一次保存期限皮匹配结净");
             actualRow01.setUploadFlag("1");
             actualRow01.setIsPreScale("1");
-            actualRow01.setValueFlag("2");
+            actualRow01.setValueFlag("1");
             if(actualRow01.getGrossTime().compareTo(actualRow01.getTareTime()) >= 0) {
                 actualRow01.setNetSpot3No(actualRow01.getBaseSpot1No());
                 actualRow01.setNetSpot3Name(actualRow01.getBaseSpot1Name());
@@ -6242,7 +6242,7 @@ public class MeterWorkCarActualFirstServiceImpl extends BaseServiceImpl<MeterWor
             actualRow02.setNote("内倒双委托一次保存期限皮匹配结净");
             actualRow02.setUploadFlag("1");
             actualRow02.setIsPreScale("1");
-            actualRow02.setValueFlag("2");
+            actualRow02.setValueFlag("1");
             if(actualRow02.getGrossTime().compareTo(actualRow02.getTareTime()) >= 0) {
                 actualRow02.setNetSpot3No(actualRow02.getBaseSpot1No());
                 actualRow02.setNetSpot3Name(actualRow02.getBaseSpot1Name());
@@ -6359,7 +6359,7 @@ public class MeterWorkCarActualFirstServiceImpl extends BaseServiceImpl<MeterWor
                 mwca.setNote("内倒多毛一皮匹配委托洁净");
                 mwca.setUploadFlag("1");
                 mwca.setIsPreScale("1");
-                mwca.setValueFlag("1");
+                mwca.setValueFlag("2");
                 if(mwca.getGrossTime().compareTo(mwca.getTareTime()) >= 0) {
                     mwca.setNetSpot3No(mwca.getBaseSpot1No());
                     mwca.setNetSpot3Name(mwca.getBaseSpot1Name());
@@ -6547,7 +6547,7 @@ public class MeterWorkCarActualFirstServiceImpl extends BaseServiceImpl<MeterWor
                 mwca.setNote("期限皮匹配结净");
                 mwca.setUploadFlag("1");
                 mwca.setIsPreScale("1");
-                mwca.setValueFlag("1");
+                mwca.setValueFlag("2");
                 mwca.setNetManNo("admin");
                 mwca.setNetManName("admin");
                 mwca.setNetSpot3No(model.getBaseSpotNo());

src/main/java/com/steerinfo/meterwork/meterworkparammap/controller/MeterWorkParamMap.java

@@ -0,0 +1,40 @@
+package com.steerinfo.meterwork.meterworkparammap.controller;
+
+import com.steerinfo.framework.controller.BaseRESTfulController;
+import com.steerinfo.framework.controller.RESTfulResult;
+import com.steerinfo.framework.service.pagehelper.PageHelper;
+import com.steerinfo.framework.service.pagehelper.PageList;
+import com.steerinfo.meterwork.meterworkparammap.service.impl.MeterWorkParamMapService;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.transaction.interceptor.TransactionAspectSupport;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.annotation.Resource;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.List;
+
+@RestController
+@RequestMapping("/${api.version}/meterworkparammaps")
+public class MeterWorkParamMap extends BaseRESTfulController {
+
+    @Resource
+    private MeterWorkParamMapService meterWorkParamMapService;
+
+    @ApiOperation(value="查询监控表信息、最近一次计量数据、未使用和使用中的委托、洁净数据、委托信息", notes="返回List<HashMap>对象")
+    @PostMapping(value = "combinationByParams")
+    public RESTfulResult combinationByParams(@RequestBody HashMap params) {
+        RESTfulResult rm = failed();
+        try {
+            rm = meterWorkParamMapService.combinationByParams(params);
+        }catch (Exception e) {
+            e.printStackTrace();
+            rm.setMessage("操作异常:>>>" + e.getMessage());
+        }
+        return rm;
+    }
+}

src/main/java/com/steerinfo/meterwork/meterworkparammap/mapper/MeterWorkParamMapMapper.java

@@ -0,0 +1,5 @@
+package com.steerinfo.meterwork.meterworkparammap.mapper;
+
+public interface MeterWorkParamMapMapper {
+
+}

src/main/java/com/steerinfo/meterwork/meterworkparammap/mapper/MeterWorkParamMapMapper.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.steerinfo.meterwork.meterworkparammap.mapper.MeterWorkParamMapMapper">
+
+
+</mapper>

src/main/java/com/steerinfo/meterwork/meterworkparammap/service/IMeterWorkParamMapService.java

@@ -0,0 +1,12 @@
+package com.steerinfo.meterwork.meterworkparammap.service;
+
+import com.steerinfo.framework.controller.RESTfulResult;
+import com.steerinfo.meterwork.meterworkparammap.service.impl.MeterWorkParamMapService;
+
+import java.util.HashMap;
+
+
+public interface IMeterWorkParamMapService {
+
+    RESTfulResult combinationByParams(HashMap<String, Object> params);
+}

src/main/java/com/steerinfo/meterwork/meterworkparammap/service/impl/MeterWorkParamMapService.java

@@ -0,0 +1,53 @@
+package com.steerinfo.meterwork.meterworkparammap.service.impl;
+
+import com.steerinfo.framework.controller.RESTfulResult;
+import com.steerinfo.meterwork.meterworkcaractual.mapper.MeterWorkCarActualMapper;
+import com.steerinfo.meterwork.meterworkcaractual.model.MeterWorkCarActual;
+import com.steerinfo.meterwork.meterworkcaractualfirst.mapper.MeterWorkCarActualFirstMapper;
+import com.steerinfo.meterwork.meterworkcaractualfirst.model.MeterWorkCarActualFirst;
+import com.steerinfo.meterwork.meterworkmonitor.mapper.MeterWorkMonitorMapper;
+import com.steerinfo.meterwork.meterworkparammap.controller.MeterWorkParamMap;
+import com.steerinfo.meterwork.meterworkparammap.mapper.MeterWorkParamMapMapper;
+import com.steerinfo.meterwork.meterworkparammap.service.IMeterWorkParamMapService;
+import com.steerinfo.pretrack.pretrackscale.mapper.PreTrackScaleMapper;
+import com.steerinfo.pretrack.pretrackscale.model.PreTrackScale;
+import io.micrometer.core.instrument.Meter;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.util.HashMap;
+
+@Service("MeterWorkParamService")
+public class MeterWorkParamMapService implements IMeterWorkParamMapService {
+
+    @Resource
+    private MeterWorkParamMapMapper meterWorkParamMapMapper;
+
+    @Resource
+    private MeterWorkMonitorMapper meterWorkMonitorMapper;
+
+    @Resource
+    private MeterWorkCarActualFirstMapper meterWorkCarActualFirstMapper;
+
+    @Resource
+    private MeterWorkCarActualMapper meterWorkCarActualMapper;
+
+    @Resource
+    private PreTrackScaleMapper preTrackScaleMapper;
+
+    @Override
+    public RESTfulResult combinationByParams(HashMap<String, Object> params) {
+        RESTfulResult rm = new RESTfulResult();
+        try{
+            String baseSpotNo = params.get("baseSpotNo") == null ? "": params.get("baseSpotNo").toString();
+            String carNo = params.get("carNo") == null ? "": params.get("carNo").toString();
+            String predicitonNo = params.get("predicitonNo") == null ? "": params.get("predicitonNo").toString();
+
+
+        }catch(Exception e) {
+            e.printStackTrace();
+            rm.setMessage("操作异常，" + e.getMessage());
+        }
+        return rm;
+    }
+}