后端更新

src/main/java/com/steerinfo/baseinfo/appversionmsg/service/impl/AppVersionMsgServiceImpl.java

@@ -47,7 +47,7 @@ public class AppVersionMsgServiceImpl extends BaseServiceImpl<AppVersionMsg, Str
         model.setValueFlag("0");
         //获取用户ID和用户名
         UserPayload payload = UserPayload.getCurrUser();
-        String userId = payload.getId();
+        String userId = payload.getUserCode();
         String userName = payload.getUserName();
         model.setCreateId(userId);
         model.setCreateName(userName);

src/main/java/com/steerinfo/baseinfo/meterbasecalibrastandard/service/impl/MeterBaseCalibraStandardServiceImpl.java

@@ -68,7 +68,7 @@ public class MeterBaseCalibraStandardServiceImpl extends BaseServiceImpl<MeterBa
         model.setStandardNo(new SimpleDateFormat("yyyyMMdd").format(new Date()) +no);
 
 //        UserPayload payload = UserPayload.getCurrUser();
-//        String userId = payload.getId();
+//        String userId = payload.getUserCode();
 //        String userName = payload.getUserName();
 //        model.setCreateManNo(userId);
 //        model.setCreateManName(userName);
@@ -92,7 +92,7 @@ public class MeterBaseCalibraStandardServiceImpl extends BaseServiceImpl<MeterBa
         model.setUpdateTime(new Date());
         //设置修改人、修改时间
 //        UserPayload payload = UserPayload.getCurrUser();
-//        String userId = payload.getId();
+//        String userId = payload.getUserCode();
 //        String userName = payload.getUserName();
 //        model.setUpdateTime(new Date());
 //        model.setUpdateManNo(userId);

src/main/java/com/steerinfo/baseinfo/meterbasecar/controller/MeterBaseCarController.java

@@ -991,7 +991,7 @@ public class MeterBaseCarController extends BaseRESTfulController {
             String userName = null;
             try{
                 UserPayload payload = UserPayload.getCurrUser();
-                userId = payload.getId();
+                userId = payload.getUserCode();
                 userName = payload.getUserName();
             }catch(Exception e) {
                 userId = "admin";
@@ -1093,7 +1093,7 @@ public class MeterBaseCarController extends BaseRESTfulController {
                     driver.setDriverNo(params.get("carNo")+driver.getTelNum());
                     driver.setCarId(params.get("carNo").toString());
                     UserPayload payload = UserPayload.getCurrUser();
-                    String userId = payload.getId();
+                    String userId = payload.getUserCode();
                     String userName = payload.getUserName();
                     driver.setUpdateManNo(userId);
                     driver.setUpdateManName(userName);

src/main/java/com/steerinfo/baseinfo/meterbasecarriercustomer/service/impl/MeterBaseCarrierCustomerServiceImpl.java

@@ -80,7 +80,7 @@ public class MeterBaseCarrierCustomerServiceImpl extends BaseServiceImpl<MeterBa
             throw new MarkerMetException(500, "供应商为空!!");
         }
         UserPayload payload = UserPayload.getCurrUser();
-        String userId = payload.getId();
+        String userId = payload.getUserCode();
         String userName = payload.getUserName();
         if(StringUtils.isEmpty(model.getCarrierCustomerNo())){
             model.setCreateTime(new Date());

src/main/java/com/steerinfo/baseinfo/meterbasedriver/service/impl/MeterBaseDriverServiceImpl.java

@@ -54,7 +54,7 @@ public class MeterBaseDriverServiceImpl extends BaseServiceImpl<MeterBaseDriver,
         model.setDriverNo(no);
         try{
             UserPayload payload = UserPayload.getCurrUser();
-            String userId = payload.getId();
+            String userId = payload.getUserCode();
             String userName = payload.getUserName();
             model.setCreateManNo(userId);
             model.setCreateManName(userName);

src/main/java/com/steerinfo/baseinfo/meterbasematterinfo/service/impl/MeterBaseMatterInfoServiceImpl.java

@@ -225,7 +225,7 @@ public class MeterBaseMatterInfoServiceImpl extends BaseServiceImpl<MeterBaseMat
                 return "请传入参数!";
             }
             UserPayload payload = UserPayload.getCurrUser();
-            String userId = payload.getId();
+            String userId = payload.getUserCode();
             String userName = payload.getUserName();
             for (MeterBaseMatterInfo model : models) {
                 model.setAllowedTareWeight("1");
@@ -250,7 +250,7 @@ public class MeterBaseMatterInfoServiceImpl extends BaseServiceImpl<MeterBaseMat
                 return "请传入参数!";
             }
             UserPayload payload = UserPayload.getCurrUser();
-            String userId = payload.getId();
+            String userId = payload.getUserCode();
             String userName = payload.getUserName();
             for (MeterBaseMatterInfo model : models) {
                 model.setAllowedTareWeight("0");
@@ -275,7 +275,7 @@ public class MeterBaseMatterInfoServiceImpl extends BaseServiceImpl<MeterBaseMat
                 return "请传入参数!";
             }
             UserPayload payload = UserPayload.getCurrUser();
-            String userId = payload.getId();
+            String userId = payload.getUserCode();
             String userName = payload.getUserName();
             for (MeterBaseMatterInfo model : models) {
                 model.setAllowedAddWeight("1");
@@ -300,7 +300,7 @@ public class MeterBaseMatterInfoServiceImpl extends BaseServiceImpl<MeterBaseMat
                 return "请传入参数!";
             }
             UserPayload payload = UserPayload.getCurrUser();
-            String userId = payload.getId();
+            String userId = payload.getUserCode();
             String userName = payload.getUserName();
             for (MeterBaseMatterInfo model : models) {
                 model.setAllowedAddWeight("0");

src/main/java/com/steerinfo/baseinfo/meterbasematterinfodirect/controller/MeterBaseMatterInfoDirectController.java

@@ -135,7 +135,7 @@ public class MeterBaseMatterInfoDirectController extends BaseRESTfulController {
     public RESTfulResult batchsdelete(@RequestBody List<MeterBaseMatterInfoDirect> models) {
         try {
             UserPayload payload = UserPayload.getCurrUser();
-            String userId = payload.getId();
+            String userId = payload.getUserCode();
             String userName = payload.getUserName();
             for (MeterBaseMatterInfoDirect model : models){
                 model.setDeleteManNo(userId);

src/main/java/com/steerinfo/baseinfo/meterbasemetertypeconf/controller/MeterBaseMetertypeConfController.java

@@ -108,7 +108,7 @@ public class MeterBaseMetertypeConfController extends BaseRESTfulController {
     @PutMapping(value = "/{id}", produces  = "application/json;charset=UTF-8")
     public RESTfulResult update(@PathVariable String id, @RequestBody MeterBaseMetertypeConf model){
         UserPayload payload = UserPayload.getCurrUser();
-        String userId = payload.getId();
+        String userId = payload.getUserCode();
         String userName = payload.getUserName();
         model.setUpdateTime(new Date());
         model.setUpdateManName(userName);

src/main/java/com/steerinfo/baseinfo/meterbasemetertypeconf/service/impl/MeterBaseMetertypeConfServiceImpl.java

@@ -51,7 +51,7 @@ public class MeterBaseMetertypeConfServiceImpl extends BaseServiceImpl<MeterBase
             return "是否允许使用期限皮重不能为空";
         }
         UserPayload payload = UserPayload.getCurrUser();
-        String userId = payload.getId();
+        String userId = payload.getUserCode();
         String userName = payload.getUserName();
         model.setCreateTime(new Date());
         model.setCreateManName(userName);

src/main/java/com/steerinfo/baseinfo/meterbaserailwayhistaredata/service/impl/MeterBaseRailwayHisTareDataServiceImpl.java

@@ -91,7 +91,7 @@ public class MeterBaseRailwayHisTareDataServiceImpl extends BaseServiceImpl<Mete
                 hisTareData.setMeterTime(new Date());
                 hisTareData.setCreateTime(new Date());
                 UserPayload payload = UserPayload.getCurrUser();
-                String userId = payload.getId();
+                String userId = payload.getUserCode();
                 String userName = payload.getUserName();
                 hisTareData.setCreateManNo(userId);
                 hisTareData.setCreateManName(userName);

src/main/java/com/steerinfo/baseinfo/meterbaserailwayweight/service/impl/MeterBaseRailwayWeightServiceImpl.java

@@ -193,7 +193,7 @@ public class MeterBaseRailwayWeightServiceImpl extends BaseServiceImpl<MeterBase
             throw  new MarkerMetException(500,"轨道衡类型名称不能为空");
         }
         UserPayload payload = UserPayload.getCurrUser();
-        String userId = payload.getId();
+        String userId = payload.getUserCode();
         String userName = payload.getUserName();
         if(StringUtils.isEmpty(model.getRailwayPk())) {
             model.setCreateTime(new Date());

src/main/java/com/steerinfo/baseinfo/meterbaserfidinfo/service/impl/MeterBaseRfidInfoServiceImpl.java

@@ -47,7 +47,7 @@ public class MeterBaseRfidInfoServiceImpl extends BaseServiceImpl<MeterBaseRfidI
         model.setCarNo(map.get("carNo").toString());
         model.setCreateTime(new Date());
         UserPayload payload = UserPayload.getCurrUser();
-        String userId = payload.getId();
+        String userId = payload.getUserCode();
         String userName = payload.getUserName();
         model.setCreateManNo(userId);
         model.setCreateManName(userName);

src/main/java/com/steerinfo/baseinfo/meterbaseunitdirect/controller/MeterBaseUnitDirectController.java

@@ -134,7 +134,7 @@ public class MeterBaseUnitDirectController extends BaseRESTfulController {
     public RESTfulResult batchsdelete(@RequestBody List<MeterBaseUnitDirect> models) {
         try {
             UserPayload payload = UserPayload.getCurrUser();
-            String userId = payload.getId();
+            String userId = payload.getUserCode();
             String userName = payload.getUserName();
             for (MeterBaseUnitDirect model : models){
                 model.setDeleteManNo(userId);

src/main/java/com/steerinfo/baseinfo/meterbaseversions/service/impl/MeterBaseVersionsServiceImpl.java

@@ -63,7 +63,7 @@ public class MeterBaseVersionsServiceImpl extends BaseServiceImpl<MeterBaseVersi
         }
         model.setValidFlag("1");
         UserPayload payload = UserPayload.getCurrUser();
-        String userId = payload.getId();
+        String userId = payload.getUserCode();
         String userName = payload.getUserName();
         /*String userId = "admins";
         String userName = "admins";*/
@@ -107,7 +107,7 @@ public class MeterBaseVersionsServiceImpl extends BaseServiceImpl<MeterBaseVersi
         MeterBaseVersions versionModel = meterBaseVersionsMapper.selectByPrimaryKey(versionNo);
         versionModel.setValidFlag("0");
         UserPayload payload = UserPayload.getCurrUser();
-        String userId = payload.getId();
+        String userId = payload.getUserCode();
         String userName = payload.getUserName();
         /*String userId = "admins";
         String userName = "admins";*/

src/main/java/com/steerinfo/baseinfo/meterbasevoicerelation/service/impl/MeterBaseVoiceRelationServiceImpl.java

@@ -80,7 +80,7 @@ public class MeterBaseVoiceRelationServiceImpl extends BaseServiceImpl<MeterBase
         }
 
         UserPayload payload = UserPayload.getCurrUser();
-        String userId = payload.getId();
+        String userId = payload.getUserCode();
         String userName = payload.getUserName();
         if (model.getRelationId() == null) {
             model.setCreateTime(new Date());

src/main/java/com/steerinfo/meterwork/meterworkaddweight/service/impl/MeterWorkAddWeightServiceImpl.java

@@ -118,7 +118,7 @@ public class MeterWorkAddWeightServiceImpl extends BaseServiceImpl<MeterWorkAddW
             throw  new MarkerMetException(500,"器具属性名称不能为空");
         }
         UserPayload payload = UserPayload.getCurrUser();
-        String userId = payload.getId();
+        String userId = payload.getUserCode();
         String userName = payload.getUserName();
         if(model.getAddWeightActNo() == null){
             model.setCreateTime(new Date());

src/main/java/com/steerinfo/meterwork/meterworkcaractual/service/impl/MeterWorkCarActualServiceImpl.java

@@ -28,6 +28,7 @@ import com.steerinfo.meterwork.meterworkprelink.mapper.MeterWorkPreLinkMapper;
 import com.steerinfo.meterwork.meterworkprelink.service.IMeterWorkPreLinkService;
 import com.steerinfo.meterwork.meterworkrailwayactual.mapper.MeterWorkRailwayActualMapper;
 import com.steerinfo.meterwork.meterworkrailwayactual.model.MeterWorkRailwayActual;
+import com.steerinfo.pretrack.prerailwayscale.model.PreRailwayScale;
 import com.steerinfo.pretrack.pretracknotice.mapper.PreTrackNoticeMapper;
 import com.steerinfo.pretrack.pretracknotice.model.PreTrackNotice;
 import com.steerinfo.pretrack.pretrackscale.mapper.PreTrackScaleMapper;
@@ -213,6 +214,10 @@ public class MeterWorkCarActualServiceImpl extends BaseServiceImpl<MeterWorkCarA
             if (!model.getValueFlag().equals("2")) {
                 throw new MarkerMetException(500, "只有发布状态的数据才能进行撤销发布操作");
             }
+            PreTrackScale scale = preTrackScaleMapper.selectByPrimaryKey(model.getPredictionNo());
+            if(scale != null && scale.getValueFlag().equals("9")) {
+                throw new MarkerMetException(500, "只有未结算的洁净数据才能进行撤销发布操作");
+            }
             check(model);
             model.setValueFlag("1"); // 状态改为未发布
             int num = meterWorkCarActualMapper.updateByPrimaryKeySelective(model);
@@ -292,7 +297,7 @@ public class MeterWorkCarActualServiceImpl extends BaseServiceImpl<MeterWorkCarA
             throw new MarkerMetException(500, "车号不能为空");
         }
         UserPayload payload = UserPayload.getCurrUser();
-        String userId = payload.getId();
+        String userId = payload.getUserCode();
         String userName = payload.getUserName();
         model.setUpdateManName(userName);
         model.setUpdateManNo(userId);
@@ -871,7 +876,7 @@ public class MeterWorkCarActualServiceImpl extends BaseServiceImpl<MeterWorkCarA
         String userName;
         try{
             UserPayload payload = UserPayload.getCurrUser();
-            userId = payload.getId();
+            userId = payload.getUserCode();
             userName = payload.getUserName();
         }catch(Exception e) {
             userId = "admin";
@@ -892,7 +897,7 @@ public class MeterWorkCarActualServiceImpl extends BaseServiceImpl<MeterWorkCarA
         String userName;
         try{
             UserPayload payload = UserPayload.getCurrUser();
-            userId = payload.getId();
+            userId = payload.getUserCode();
             userName = payload.getUserName();
         }catch(Exception e) {
             userId = "admin";
@@ -911,7 +916,7 @@ public class MeterWorkCarActualServiceImpl extends BaseServiceImpl<MeterWorkCarA
         String userName;
         try{
             UserPayload payload = UserPayload.getCurrUser();
-            userId = payload.getId();
+            userId = payload.getUserCode();
             userName = payload.getUserName();
         }catch(Exception e) {
             userId = "admin";
@@ -1221,7 +1226,7 @@ public class MeterWorkCarActualServiceImpl extends BaseServiceImpl<MeterWorkCarA
                 }
             }
             UserPayload payload = UserPayload.getCurrUser();
-            String userId = payload.getId();
+            String userId = payload.getUserCode();
             String userName = payload.getUserName();
             /*String userId = "systems";
             String userName = "systems";*/
@@ -1243,10 +1248,14 @@ public class MeterWorkCarActualServiceImpl extends BaseServiceImpl<MeterWorkCarA
             meterWorkCarActualFirstMapper.updateByPrimaryKey(tarerow);
 
             MeterWorkCarActual mwca = meterWorkCarActualMapper.mathPredcition(actualNo, predictionNo);
-            mwca.setIsPreScale("1");
             mwca.setPredictionType("1");
             mwca.setCreateManName(userName);
             mwca.setCreateTime(new Date());
+            mwca.setUpdateManNo(userId);
+            mwca.setUpdateManName(userName);
+            mwca.setUpdateTime(new Date());
+            mwca.setNote("匹配委托");
+            mwca.setIsPreScale("1");
             mwca.setValueFlag("1");
             mwca.setUploadFlag("1");
             mwca.setNote(note);
@@ -1314,7 +1323,7 @@ public class MeterWorkCarActualServiceImpl extends BaseServiceImpl<MeterWorkCarA
         }
 
         UserPayload payload = UserPayload.getCurrUser();
-        String userId = payload.getId();
+        String userId = payload.getUserCode();
         String userName = payload.getUserName();
 
         // 处理一次计量数据
@@ -1355,6 +1364,7 @@ public class MeterWorkCarActualServiceImpl extends BaseServiceImpl<MeterWorkCarA
         //mwca.setValueFlag("3");
         mwca.setIsPreScale("0");
         mwca.setUploadFlag("1");
+        mwca.setValueFlag("1");
         meterWorkCarActualMapper.updateByPrimaryKey(mwca);
 
         MeterBaseOperationLog logModel = new MeterBaseOperationLog();
@@ -1525,7 +1535,7 @@ public class MeterWorkCarActualServiceImpl extends BaseServiceImpl<MeterWorkCarA
         if (model.getActualNo() == null && model.getUploadFlag() == null)
             model.setUploadFlag(DbConstants.INVALID);
         UserPayload payload = UserPayload.getCurrUser();
-        String userId = payload.getId();
+        String userId = payload.getUserCode();
         String userName = payload.getUserName();
         model.setUploadFlag("1");
         if (model.getActualNo() == null) {
@@ -1570,7 +1580,7 @@ public class MeterWorkCarActualServiceImpl extends BaseServiceImpl<MeterWorkCarA
         if (model.getActualNo() == null && model.getUploadFlag() == null)
             model.setUploadFlag("2");
         UserPayload payload = UserPayload.getCurrUser();
-        String userId = payload.getId();
+        String userId = payload.getUserCode();
         String userName = payload.getUserName();
         model.setUploadFlag("1");
         SimpleDateFormat sdf = new SimpleDateFormat("yyyyMMdd");
@@ -1768,7 +1778,7 @@ public class MeterWorkCarActualServiceImpl extends BaseServiceImpl<MeterWorkCarA
         BeanUtils.copyProperties(scale, carActual);
 
         UserPayload payload = UserPayload.getCurrUser();
-        String userId = payload.getId();
+        String userId = payload.getUserCode();
         String userName = payload.getUserName();
         if (StringUtils.isNotEmpty(userName)) {
             scale.setCreateManNo(userId);
@@ -1837,7 +1847,7 @@ public class MeterWorkCarActualServiceImpl extends BaseServiceImpl<MeterWorkCarA
     public MeterWorkCarActual insertByNotice(MeterWorkCarActual actual) {
         try {
             UserPayload payload = UserPayload.getCurrUser();
-            String userId = payload.getId();
+            String userId = payload.getUserCode();
             String userName = payload.getUserName();
 
             if (actual == null || StringUtils.isEmpty(actual.getNoticeNo())) {
@@ -1935,7 +1945,7 @@ public class MeterWorkCarActualServiceImpl extends BaseServiceImpl<MeterWorkCarA
     public MeterWorkCarActual insertByScale(MeterWorkCarActual actual) {
         try {
             UserPayload payload = UserPayload.getCurrUser();
-            String userId = payload.getId();
+            String userId = payload.getUserCode();
             String userName = payload.getUserName();
 
             if (actual == null || StringUtils.isEmpty(actual.getPredictionNo())) {
@@ -2029,7 +2039,7 @@ public class MeterWorkCarActualServiceImpl extends BaseServiceImpl<MeterWorkCarA
         int num = 0;
         try {
             UserPayload payload = UserPayload.getCurrUser();
-            String userId = payload.getId();
+            String userId = payload.getUserCode();
             String userName = payload.getUserName();
             List<PreTrackScale> scaleList = new ArrayList<PreTrackScale>();
             for (MeterWorkCarActual model : models) {
@@ -2088,7 +2098,7 @@ public class MeterWorkCarActualServiceImpl extends BaseServiceImpl<MeterWorkCarA
         int num = 0;
         try {
             UserPayload payload = UserPayload.getCurrUser();
-            String userId = payload.getId();
+            String userId = payload.getUserCode();
             String userName = payload.getUserName();
             for (MeterWorkCarActual model : models) {
                 if (model == null || StringUtils.isEmpty(model.getPredictionNo())) {
@@ -2140,7 +2150,7 @@ public class MeterWorkCarActualServiceImpl extends BaseServiceImpl<MeterWorkCarA
         try{
             int num = 0;
             UserPayload payload = UserPayload.getCurrUser();
-            String userId = payload.getId();
+            String userId = payload.getUserCode();
             String userName = payload.getUserName();
             if(model.getGrossWeight() == null || model.getGrossWeight().equals(""))
             {
@@ -2349,7 +2359,7 @@ public class MeterWorkCarActualServiceImpl extends BaseServiceImpl<MeterWorkCarA
             String predictionNo = model.getPredictionNo();
 
             /*UserPayload payload = UserPayload.getCurrUser();
-            String userId = payload.getId();
+            String userId = payload.getUserCode();
             String userName = payload.getUserName();*/
 
             //毛重

src/main/java/com/steerinfo/meterwork/meterworkcaractualbak/service/impl/MeterWorkCarActualBakServiceImpl.java

@@ -296,7 +296,7 @@ public class MeterWorkCarActualBakServiceImpl extends BaseServiceImpl<MeterWorkC
             throw new MarkerMetException(500, "车号不能为空");
         }
         UserPayload payload = UserPayload.getCurrUser();
-        String userId = payload.getId();
+        String userId = payload.getUserCode();
         String userName = payload.getUserName();
         model.setUpdateManName(userName);
         model.setUpdateManNo(userId);
@@ -800,7 +800,7 @@ public class MeterWorkCarActualBakServiceImpl extends BaseServiceImpl<MeterWorkC
         String userName;
         try{
             UserPayload payload = UserPayload.getCurrUser();
-            userId = payload.getId();
+            userId = payload.getUserCode();
             userName = payload.getUserName();
         }catch(Exception e) {
             userId = "admin";
@@ -821,7 +821,7 @@ public class MeterWorkCarActualBakServiceImpl extends BaseServiceImpl<MeterWorkC
         String userName;
         try{
             UserPayload payload = UserPayload.getCurrUser();
-            userId = payload.getId();
+            userId = payload.getUserCode();
             userName = payload.getUserName();
         }catch(Exception e) {
             userId = "admin";
@@ -840,7 +840,7 @@ public class MeterWorkCarActualBakServiceImpl extends BaseServiceImpl<MeterWorkC
         String userName;
         try{
             UserPayload payload = UserPayload.getCurrUser();
-            userId = payload.getId();
+            userId = payload.getUserCode();
             userName = payload.getUserName();
         }catch(Exception e) {
             userId = "admin";
@@ -1121,7 +1121,7 @@ public class MeterWorkCarActualBakServiceImpl extends BaseServiceImpl<MeterWorkC
                 }
             }
             UserPayload payload = UserPayload.getCurrUser();
-            String userId = payload.getId();
+            String userId = payload.getUserCode();
             String userName = payload.getUserName();
             /*String userId = "systems";
             String userName = "systems";*/
@@ -1200,7 +1200,7 @@ public class MeterWorkCarActualBakServiceImpl extends BaseServiceImpl<MeterWorkC
         }
 
         UserPayload payload = UserPayload.getCurrUser();
-        String userId = payload.getId();
+        String userId = payload.getUserCode();
         String userName = payload.getUserName();
 
         // 处理一次计量数据
@@ -1397,7 +1397,7 @@ public class MeterWorkCarActualBakServiceImpl extends BaseServiceImpl<MeterWorkC
         if (model.getActualNo() == null && model.getUploadFlag() == null)
             model.setUploadFlag(DbConstants.INVALID);
         UserPayload payload = UserPayload.getCurrUser();
-        String userId = payload.getId();
+        String userId = payload.getUserCode();
         String userName = payload.getUserName();
         model.setUploadFlag("1");
         if (model.getActualNo() == null) {
@@ -1442,7 +1442,7 @@ public class MeterWorkCarActualBakServiceImpl extends BaseServiceImpl<MeterWorkC
         if (model.getActualNo() == null && model.getUploadFlag() == null)
             model.setUploadFlag("2");
         UserPayload payload = UserPayload.getCurrUser();
-        String userId = payload.getId();
+        String userId = payload.getUserCode();
         String userName = payload.getUserName();
         model.setUploadFlag("1");
         SimpleDateFormat sdf = new SimpleDateFormat("yyyyMMdd");
@@ -1640,7 +1640,7 @@ public class MeterWorkCarActualBakServiceImpl extends BaseServiceImpl<MeterWorkC
         BeanUtils.copyProperties(scale, carActual);
 
         UserPayload payload = UserPayload.getCurrUser();
-        String userId = payload.getId();
+        String userId = payload.getUserCode();
         String userName = payload.getUserName();
         if (StringUtils.isNotEmpty(userName)) {
             scale.setCreateManNo(userId);
@@ -1709,7 +1709,7 @@ public class MeterWorkCarActualBakServiceImpl extends BaseServiceImpl<MeterWorkC
     public MeterWorkCarActualBak insertByNotice(MeterWorkCarActualBak actual) {
         try {
             UserPayload payload = UserPayload.getCurrUser();
-            String userId = payload.getId();
+            String userId = payload.getUserCode();
             String userName = payload.getUserName();
 
             if (actual == null || StringUtils.isEmpty(actual.getNoticeNo())) {
@@ -1807,7 +1807,7 @@ public class MeterWorkCarActualBakServiceImpl extends BaseServiceImpl<MeterWorkC
     public MeterWorkCarActualBak insertByScale(MeterWorkCarActualBak actual) {
         try {
             UserPayload payload = UserPayload.getCurrUser();
-            String userId = payload.getId();
+            String userId = payload.getUserCode();
             String userName = payload.getUserName();
 
             if (actual == null || StringUtils.isEmpty(actual.getPredictionNo())) {
@@ -1901,7 +1901,7 @@ public class MeterWorkCarActualBakServiceImpl extends BaseServiceImpl<MeterWorkC
         int num = 0;
         try {
             UserPayload payload = UserPayload.getCurrUser();
-            String userId = payload.getId();
+            String userId = payload.getUserCode();
             String userName = payload.getUserName();
             List<PreTrackScale> scaleList = new ArrayList<PreTrackScale>();
             for (MeterWorkCarActualBak model : models) {
@@ -1960,7 +1960,7 @@ public class MeterWorkCarActualBakServiceImpl extends BaseServiceImpl<MeterWorkC
         int num = 0;
         try {
             UserPayload payload = UserPayload.getCurrUser();
-            String userId = payload.getId();
+            String userId = payload.getUserCode();
             String userName = payload.getUserName();
             for (MeterWorkCarActualBak model : models) {
                 if (model == null || StringUtils.isEmpty(model.getPredictionNo())) {
@@ -2012,7 +2012,7 @@ public class MeterWorkCarActualBakServiceImpl extends BaseServiceImpl<MeterWorkC
         try{
             int num = 0;
             UserPayload payload = UserPayload.getCurrUser();
-            String userId = payload.getId();
+            String userId = payload.getUserCode();
             String userName = payload.getUserName();
             if(model.getGrossWeight() == null || model.getGrossWeight().equals(""))
             {
@@ -2221,7 +2221,7 @@ public class MeterWorkCarActualBakServiceImpl extends BaseServiceImpl<MeterWorkC
             String predictionNo = model.getPredictionNo();
 
             /*UserPayload payload = UserPayload.getCurrUser();
-            String userId = payload.getId();
+            String userId = payload.getUserCode();
             String userName = payload.getUserName();*/
 
             //毛重

src/main/java/com/steerinfo/meterwork/meterworkcaractualfirst/controller/MeterWorkCarActualFirstController.java

@@ -234,7 +234,7 @@ public class MeterWorkCarActualFirstController extends BaseRESTfulController {
             String userName = null;
             try{
                 UserPayload payload = UserPayload.getCurrUser();
-                userId = payload.getId();
+                userId = payload.getUserCode();
                 userName = payload.getUserName();
             }catch(Exception e) {
                 userId = "admin";

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

@@ -270,7 +270,7 @@ public class MeterWorkCarActualFirstServiceImpl extends BaseServiceImpl<MeterWor
             ckeckcar(model);
 
             UserPayload payload = UserPayload.getCurrUser();
-            String userId = payload.getId();
+            String userId = payload.getUserCode();
             String userName = payload.getUserName();
             model.setUpdateTime(new Date());
             model.setUpdateManNo(userId);
@@ -308,7 +308,7 @@ public class MeterWorkCarActualFirstServiceImpl extends BaseServiceImpl<MeterWor
 //            String no = meterWorkCarActualFirstMapper.getNewID(afl);
 //            model.setActualFirstNo(sdf.format(new Date()) + no);
             UserPayload payload = UserPayload.getCurrUser();
-            String userId = payload.getId();
+            String userId = payload.getUserCode();
             String userName = payload.getUserName();
             Assert.isTrue(model.getCreateTime() != null && StringUtils.isNotEmpty(model.getCreateTime().toString()), "计量时间不能为空");
             HashMap<String, Object> obj = new HashMap<>();
@@ -743,6 +743,7 @@ public class MeterWorkCarActualFirstServiceImpl extends BaseServiceImpl<MeterWor
             Assert.isTrue(StringUtils.isNotEmpty(predictionNo), "预报编号为空");
             PreTrackScale pts = preTrackScaleMapper.selectByPrimaryKey(predictionNo);
             Assert.isTrue(pts != null, "委托编号：" + predictionNo + "未查询到有效委托信息");
+            Assert.isTrue(!pts.getValueFlag().equals("9"), "委托编号：" + predictionNo + "已结算不允许匹配委托");
             MeterWorkCarActualFirst model = meterWorkCarActualFirstMapper.selectByPrimaryKey(actualFirstNo);
             Assert.isTrue(model != null, "一次数据不存在");
             Assert.isTrue(!model.getValueFlag().equals("2"), "一次数据已结净,不允许匹配委托，请在洁净数据维护中进行洁净匹配委托");
@@ -1044,7 +1045,7 @@ public class MeterWorkCarActualFirstServiceImpl extends BaseServiceImpl<MeterWor
             throw new MarkerMetException(500, "计量点名称不能为空");
         }
         UserPayload payload = UserPayload.getCurrUser();
-        String userId = payload.getId();
+        String userId = payload.getUserCode();
         String userName = payload.getUserName();
         if (StringUtils.isEmpty(model.getActualFirstNo())) {
             model.setCreateManNo(userId);
@@ -1072,7 +1073,7 @@ public class MeterWorkCarActualFirstServiceImpl extends BaseServiceImpl<MeterWor
             throw new MarkerMetException(500, "车号不能为空");
         }
         UserPayload payload = UserPayload.getCurrUser();
-        String userId = payload.getId();
+        String userId = payload.getUserCode();
         String userName = payload.getUserName();
         model.setUpdateTime(new Date());
         model.setUpdateManNo(userId);

src/main/java/com/steerinfo/meterwork/meterworkcaractualfirstbak/controller/MeterWorkCarActualFirstBakController.java

@@ -216,7 +216,7 @@ public class MeterWorkCarActualFirstBakController extends BaseRESTfulController
                 if((model.getCreateManNo() == null || StringUtils.isEmpty(model.getCreateManNo()))
                         || (model.getCreateManName() == null || StringUtils.isEmpty(model.getCreateManName()))) {
                     UserPayload payload = UserPayload.getCurrUser();
-                    userId = payload.getId();
+                    userId = payload.getUserCode();
                     userName = payload.getUserName();
                 }else {
                     userId = model.getCreateManNo();

src/main/java/com/steerinfo/meterwork/meterworkcaractualfirstbak/service/impl/MeterWorkCarActualFirstBakServiceImpl.java

@@ -270,7 +270,7 @@ public class MeterWorkCarActualFirstBakServiceImpl extends BaseServiceImpl<Meter
 //            String userName = "";
 //            try{
 //                UserPayload payload = UserPayload.getCurrUser();
-//                userId = payload.getId();
+//                userId = payload.getUserCode();
 //                userName = payload.getUserName();
 //            }catch(Exception e) {
 //                userId = "admin";
@@ -919,7 +919,7 @@ public class MeterWorkCarActualFirstBakServiceImpl extends BaseServiceImpl<Meter
             throw new MarkerMetException(500, "计量点名称不能为空");
         }
         UserPayload payload = UserPayload.getCurrUser();
-        String userId = payload.getId();
+        String userId = payload.getUserCode();
         String userName = payload.getUserName();
         if (StringUtils.isEmpty(model.getActualFirstNo())) {
             model.setCreateManNo(userId);
@@ -947,7 +947,7 @@ public class MeterWorkCarActualFirstBakServiceImpl extends BaseServiceImpl<Meter
             throw new MarkerMetException(500, "车号不能为空");
         }
         UserPayload payload = UserPayload.getCurrUser();
-        String userId = payload.getId();
+        String userId = payload.getUserCode();
         String userName = payload.getUserName();
         model.setUpdateTime(new Date());
         model.setUpdateManNo(userId);

src/main/java/com/steerinfo/meterwork/meterworkcarcheck/service/impl/MeterWorkCarCheckServiceImpl.java

@@ -259,7 +259,7 @@ public class MeterWorkCarCheckServiceImpl extends BaseServiceImpl<MeterWorkCarCh
             String no=meterWorkCarCheckMapper.GetNewID1();
             model.setPredictionNo(new SimpleDateFormat("yyyyMMdd").format(new Date()) +no);
 //            UserPayload payload = UserPayload.getCurrUser();
-//            String userId = payload.getId();
+//            String userId = payload.getUserCode();
 //            String userName = payload.getUserName();
             check(model);
             if  (model.getValueFlag().equals(DbConstants.INFlAG)) {
@@ -349,7 +349,7 @@ public class MeterWorkCarCheckServiceImpl extends BaseServiceImpl<MeterWorkCarCh
 
     private void getUse(MeterWorkCarCheck model){
         UserPayload payload = UserPayload.getCurrUser();
-        String userId = payload.getId();
+        String userId = payload.getUserCode();
         String userName = payload.getUserName();
         if (model.getValueFlag().equals(DbConstants.INFlAG)){
             model.setEnterCheckTime(new Date());

src/main/java/com/steerinfo/meterwork/meterworkgrabactual/service/impl/MeterWorkGrabActualServiceImpl.java

@@ -88,7 +88,7 @@ public class MeterWorkGrabActualServiceImpl extends BaseServiceImpl<MeterWorkGra
             throw new MarkerMetException(500, "计量操作人员不能为空");
         }
         UserPayload payload = UserPayload.getCurrUser();
-        String userId = payload.getId();
+        String userId = payload.getUserCode();
         String userName = payload.getUserName();
         if (StringUtils.isEmpty(model.getActualNo())) {
             model.setCreateManNo(userId);

src/main/java/com/steerinfo/meterwork/meterworkhookactfirst/service/impl/MeterWorkHookActFirstServiceImpl.java

@@ -141,7 +141,7 @@ public class MeterWorkHookActFirstServiceImpl extends BaseServiceImpl<MeterWorkH
             throw new MarkerMetException(500, "计量点名称不能为空");
         }
         UserPayload payload = UserPayload.getCurrUser();
-        String userId = payload.getId();
+        String userId = payload.getUserCode();
         String userName = payload.getUserName();
         if (StringUtils.isEmpty(model.getActualFirstNo())) {
             model.setCreateManNo(userId);
@@ -255,7 +255,7 @@ public class MeterWorkHookActFirstServiceImpl extends BaseServiceImpl<MeterWorkH
             throw new MarkerMetException(500, "火车号不能为空");
         }
         UserPayload payload = UserPayload.getCurrUser();
-        String userId = payload.getId();
+        String userId = payload.getUserCode();
         String userName = payload.getUserName();
         model.setUpdateTime(new Date());
         model.setUpdateManNo(userId);
@@ -468,7 +468,7 @@ public class MeterWorkHookActFirstServiceImpl extends BaseServiceImpl<MeterWorkH
             pls.setPredictionNo(model.getPredictionNo());
 
             UserPayload payload = UserPayload.getCurrUser();
-            String userId = payload.getId();
+            String userId = payload.getUserCode();
             String userName = payload.getUserName();
             model.setUpdateManNo(userId);
             pls.setUpdateManName(userName);

src/main/java/com/steerinfo/meterwork/meterworkhookactual/service/impl/MeterWorkHookActualServiceImpl.java

@@ -77,7 +77,7 @@ public class MeterWorkHookActualServiceImpl extends BaseServiceImpl<MeterWorkHoo
             throw new MarkerMetException(500, "不存在对应的毛重数据");
         }
         UserPayload payload = UserPayload.getCurrUser();
-        String userId = payload.getId();
+        String userId = payload.getUserCode();
         String userName = payload.getUserName();
 
         // 处理一次计量数据
@@ -164,7 +164,7 @@ public class MeterWorkHookActualServiceImpl extends BaseServiceImpl<MeterWorkHoo
 
         UserPayload userPayload = new UserPayload();
         String userName = userPayload.getUserName();
-        String userId = userPayload.getId();
+        String userId = userPayload.getUserCode();
         model.setValueFlag("2");
         model.setUpdateTime(new Date());
         model.setUpdateManName(userName);
@@ -192,7 +192,7 @@ public class MeterWorkHookActualServiceImpl extends BaseServiceImpl<MeterWorkHoo
 
         UserPayload userPayload = new UserPayload();
         String userName = userPayload.getUserName();
-        String userId = userPayload.getId();
+        String userId = userPayload.getUserCode();
         model.setValueFlag("1");
         model.setUpdateTime(new Date());
         model.setUpdateManName(userName);
@@ -223,7 +223,7 @@ public class MeterWorkHookActualServiceImpl extends BaseServiceImpl<MeterWorkHoo
                 MeterWorkHookActFirst grossrow = meterWorkHookActFirstMapper.selectAndRemove(model.getActualFirst1No());
                 grossrow.setValueFlag("3");
                 UserPayload payload = UserPayload.getCurrUser();
-                String userId = payload.getId();
+                String userId = payload.getUserCode();
                 String userName = payload.getUserName();
                 grossrow.setUpdateManNo(userId);
                 grossrow.setUpdateManName(userName);
@@ -415,7 +415,7 @@ public class MeterWorkHookActualServiceImpl extends BaseServiceImpl<MeterWorkHoo
         if (model.getActualNo() == null && model.getUploadFlag() == null)
             model.setUploadFlag(DbConstants.INVALID);
         UserPayload payload = UserPayload.getCurrUser();
-        String userId = payload.getId();
+        String userId = payload.getUserCode();
         String userName = payload.getUserName();
         if (model.getActualNo() == null) {
             model.setNetTime(new Date());
@@ -450,7 +450,7 @@ public class MeterWorkHookActualServiceImpl extends BaseServiceImpl<MeterWorkHoo
             throw new MarkerMetException(500, "结净数据中车号和预报中车号不一致，不允许进行匹配委托操作");
         }
         UserPayload payload = UserPayload.getCurrUser();
-        String userId = payload.getId();
+        String userId = payload.getUserCode();
         String userName = payload.getUserName();
 
         // 处理一次计量数据
@@ -500,7 +500,7 @@ public class MeterWorkHookActualServiceImpl extends BaseServiceImpl<MeterWorkHoo
             throw new MarkerMetException(500, "不存在对应的结净数据");
         }
         UserPayload payload = UserPayload.getCurrUser();
-        String userId = payload.getId();
+        String userId = payload.getUserCode();
         String userName = payload.getUserName();
 
         // 处理一次计量数据
@@ -561,7 +561,7 @@ public class MeterWorkHookActualServiceImpl extends BaseServiceImpl<MeterWorkHoo
             }
 
             /*UserPayload payload = UserPayload.getCurrUser();
-            String userId = payload.getId();
+            String userId = payload.getUserCode();
             String userName = payload.getUserName();*/
             //毛重
             //毛重

src/main/java/com/steerinfo/meterwork/meterworkmeterlink/service/impl/MeterWorkMeterLinkServiceImpl.java

@@ -118,7 +118,7 @@ public class MeterWorkMeterLinkServiceImpl extends BaseServiceImpl<MeterWorkMete
             throw new MarkerMetException(500, "序号不能为空");
         }
         UserPayload payload = UserPayload.getCurrUser();
-        String userId = payload.getId();
+        String userId = payload.getUserCode();
         String userName = payload.getUserName();
         if (model.getLinkNo() == null || model.getLinkNo().equals("")) {
             model.setCreateTime(new Date());

src/main/java/com/steerinfo/meterwork/meterworkmeterprocess/service/impl/MeterWorkMeterProcessServiceImpl.java

@@ -153,7 +153,7 @@ public class MeterWorkMeterProcessServiceImpl extends BaseServiceImpl<MeterWorkM
         if (model.getProcessNo() == null || model.getProcessNo().equals(""))
             model.setValueFlag(DbConstants.VALID);
         UserPayload payload = UserPayload.getCurrUser();
-        String userId = payload.getId();
+        String userId = payload.getUserCode();
         String userName = payload.getUserName();
         if (model.getProcessNo() == null || model.getProcessNo().equals("")) {
             model.setCreateTime(new Date());

src/main/java/com/steerinfo/meterwork/meterworkmeterscene/service/impl/MeterWorkMeterSceneServiceImpl.java

@@ -106,7 +106,7 @@ public class MeterWorkMeterSceneServiceImpl extends BaseServiceImpl<MeterWorkMet
             throw new MarkerMetException(500, "序号不能为空");
         }
         UserPayload payload = UserPayload.getCurrUser();
-        String userId = payload.getId();
+        String userId = payload.getUserCode();
         String userName = payload.getUserName();
         if (model.getSceneNo() == null || model.getSceneNo().equals("")) {
             model.setCreateTime(new Date());

src/main/java/com/steerinfo/meterwork/meterworkrailwayactfirst/controller/MeterWorkRailwayActFirstController.java

@@ -742,7 +742,7 @@ throw new MarkerMetException(500, "操作异常！！");
             String userName = "";
             if(StringUtils.isEmpty(model.getTwo().get(0).getCreateManNo())){
                 UserPayload payload = UserPayload.getCurrUser();
-                userId = payload.getId();
+                userId = payload.getUserCode();
                 userName = payload.getUserName();
             }
 

src/main/java/com/steerinfo/meterwork/meterworkrailwayactfirst/service/impl/MeterWorkRailwayActFirstServiceImpl.java

@@ -520,7 +520,7 @@ public class MeterWorkRailwayActFirstServiceImpl extends BaseServiceImpl<MeterWo
             throw new MarkerMetException(500, "火车号不能为空");
         }
         UserPayload payload = UserPayload.getCurrUser();
-        String userId = payload.getId();
+        String userId = payload.getUserCode();
         String userName = payload.getUserName();
         model.setUpdateTime(new Date());
         model.setUpdateManNo(userId);
@@ -3353,7 +3353,7 @@ public class MeterWorkRailwayActFirstServiceImpl extends BaseServiceImpl<MeterWo
             }*/
 
             /*UserPayload payload = UserPayload.getCurrUser();
-            String userId = payload.getId();
+            String userId = payload.getUserCode();
             String userName = payload.getUserName();*/
 
             //毛重
@@ -3738,7 +3738,7 @@ public class MeterWorkRailwayActFirstServiceImpl extends BaseServiceImpl<MeterWo
             throw new MarkerMetException(500, "计量点名称不能为空");
         }
         UserPayload payload = UserPayload.getCurrUser();
-        String userId = payload.getId();
+        String userId = payload.getUserCode();
         String userName = payload.getUserName();
         if (StringUtils.isEmpty(model.getActualFirstNo())) {
             model.setCreateManNo(userId);
@@ -5142,7 +5142,7 @@ public class MeterWorkRailwayActFirstServiceImpl extends BaseServiceImpl<MeterWo
             String userId = "", userName = "";
             try {
                 UserPayload payload = UserPayload.getCurrUser();
-                userId = payload.getId();
+                userId = payload.getUserCode();
                 userName = payload.getUserName();
             } catch (Exception ex) {
             }
@@ -5275,7 +5275,7 @@ public class MeterWorkRailwayActFirstServiceImpl extends BaseServiceImpl<MeterWo
             String userId = "", userName = "";
             try {
                 UserPayload payload = UserPayload.getCurrUser();
-                userId = payload.getId();
+                userId = payload.getUserCode();
                 userName = payload.getUserName();
             } catch (Exception ex) {
                 userId = "admin";
@@ -5488,7 +5488,7 @@ public class MeterWorkRailwayActFirstServiceImpl extends BaseServiceImpl<MeterWo
             String userId = "", userName = "";
             try {
                 UserPayload payload = UserPayload.getCurrUser();
-                userId = payload.getId();
+                userId = payload.getUserCode();
                 userName = payload.getUserName();
             } catch (Exception ex) {
             }
@@ -5638,7 +5638,7 @@ public class MeterWorkRailwayActFirstServiceImpl extends BaseServiceImpl<MeterWo
             String userId = "", userName = "";
             try {
                 UserPayload payload = UserPayload.getCurrUser();
-                userId = payload.getId();
+                userId = payload.getUserCode();
                 userName = payload.getUserName();
             } catch (Exception ex) {
                 userId = "admin";
@@ -5877,7 +5877,7 @@ public class MeterWorkRailwayActFirstServiceImpl extends BaseServiceImpl<MeterWo
             String userId = "", userName = "";
             try {
                 UserPayload payload = UserPayload.getCurrUser();
-                userId = payload.getId();
+                userId = payload.getUserCode();
                 userName = payload.getUserName();
             } catch (Exception ex) {
                 userId = "admin";

src/main/java/com/steerinfo/meterwork/meterworkrailwayactfirstbak/controller/MeterWorkRailwayActFirstBakController.java

@@ -233,7 +233,7 @@ throw new MarkerMetException(500, "操作异常！！");
             String userName = null;
             try{
                 UserPayload payload = UserPayload.getCurrUser();
-                userId = payload.getId();
+                userId = payload.getUserCode();
                 userName = payload.getUserName();
             }catch(Exception e) {
                 userId = "admin";
@@ -786,7 +786,7 @@ throw new MarkerMetException(500, "操作异常！！");
             String userName = "";
             if(StringUtils.isEmpty(model.getTwo().get(0).getCreateManNo())){
                 UserPayload payload = UserPayload.getCurrUser();
-                userId = payload.getId();
+                userId = payload.getUserCode();
                 userName = payload.getUserName();
             }
 

src/main/java/com/steerinfo/meterwork/meterworkrailwayactfirstbak/service/impl/MeterWorkRailwayActFirstBakServiceImpl.java

@@ -486,7 +486,7 @@ public class MeterWorkRailwayActFirstBakServiceImpl extends BaseServiceImpl<Mete
             throw new MarkerMetException(500, "火车号不能为空");
         }
         UserPayload payload = UserPayload.getCurrUser();
-        String userId = payload.getId();
+        String userId = payload.getUserCode();
         String userName = payload.getUserName();
         model.setUpdateTime(new Date());
         model.setUpdateManNo(userId);
@@ -3022,7 +3022,7 @@ public class MeterWorkRailwayActFirstBakServiceImpl extends BaseServiceImpl<Mete
             }*/
 
             /*UserPayload payload = UserPayload.getCurrUser();
-            String userId = payload.getId();
+            String userId = payload.getUserCode();
             String userName = payload.getUserName();*/
 
             //毛重
@@ -3371,7 +3371,7 @@ public class MeterWorkRailwayActFirstBakServiceImpl extends BaseServiceImpl<Mete
             throw new MarkerMetException(500, "计量点名称不能为空");
         }
         UserPayload payload = UserPayload.getCurrUser();
-        String userId = payload.getId();
+        String userId = payload.getUserCode();
         String userName = payload.getUserName();
         if (StringUtils.isEmpty(model.getActualFirstNo())) {
             model.setCreateManNo(userId);
@@ -4705,7 +4705,7 @@ public class MeterWorkRailwayActFirstBakServiceImpl extends BaseServiceImpl<Mete
             String userId = "", userName = "";
             try {
                 UserPayload payload = UserPayload.getCurrUser();
-                userId = payload.getId();
+                userId = payload.getUserCode();
                 userName = payload.getUserName();
             } catch (Exception ex) {
             }
@@ -4834,7 +4834,7 @@ public class MeterWorkRailwayActFirstBakServiceImpl extends BaseServiceImpl<Mete
             String userId = "", userName = "";
             try {
                 UserPayload payload = UserPayload.getCurrUser();
-                userId = payload.getId();
+                userId = payload.getUserCode();
                 userName = payload.getUserName();
             } catch (Exception ex) {
                 userId = "admin";
@@ -5043,7 +5043,7 @@ public class MeterWorkRailwayActFirstBakServiceImpl extends BaseServiceImpl<Mete
             String userId = "", userName = "";
             try {
                 UserPayload payload = UserPayload.getCurrUser();
-                userId = payload.getId();
+                userId = payload.getUserCode();
                 userName = payload.getUserName();
             } catch (Exception ex) {
             }
@@ -5187,7 +5187,7 @@ public class MeterWorkRailwayActFirstBakServiceImpl extends BaseServiceImpl<Mete
             String userId = "", userName = "";
             try {
                 UserPayload payload = UserPayload.getCurrUser();
-                userId = payload.getId();
+                userId = payload.getUserCode();
                 userName = payload.getUserName();
             } catch (Exception ex) {
                 userId = "admin";
@@ -5418,7 +5418,7 @@ public class MeterWorkRailwayActFirstBakServiceImpl extends BaseServiceImpl<Mete
             String userId = "", userName = "";
             try {
                 UserPayload payload = UserPayload.getCurrUser();
-                userId = payload.getId();
+                userId = payload.getUserCode();
                 userName = payload.getUserName();
             } catch (Exception ex) {
                 userId = "admin";

src/main/java/com/steerinfo/meterwork/meterworkrailwayactual/service/impl/MeterWorkRailwayActualServiceImpl.java

@@ -156,10 +156,14 @@ public class MeterWorkRailwayActualServiceImpl extends BaseServiceImpl<MeterWork
         if (model.getPredictionNo() == null || "".equals(model.getPredictionNo()) || "1".equals(model.getValueFlag())) {
             throw new MarkerMetException(500, "只有已匹配委托且已发布的数据才能进行撤销发布操作");
         }
+        PreRailwayScale scale = preRailwayScaleMapper.selectByPrimaryKey(model.getPredictionNo());
+        if(scale != null && scale.getValueFlag().equals("9")) {
+            throw new MarkerMetException(500, "只有未结算的洁净数据才能进行撤销发布操作");
+        }
 
         UserPayload userPayload = new UserPayload();
         String userName = userPayload.getUserName();
-        String userId = userPayload.getId();
+        String userId = userPayload.getUserCode();
         model.setValueFlag("1");
         model.setUploadFlag("1");
         model.setUpdateTime(new Date());
@@ -187,10 +191,14 @@ public class MeterWorkRailwayActualServiceImpl extends BaseServiceImpl<MeterWork
                 if (modelTemp.getPredictionNo() == null || "".equals(modelTemp.getPredictionNo()) || "1".equals(modelTemp.getValueFlag())) {
                     throw new MarkerMetException(500, "只有已匹配委托且已发布的数据才能进行撤销发布操作");
                 }
+                PreRailwayScale scale = preRailwayScaleMapper.selectByPrimaryKey(model.getPredictionNo());
+                if(scale != null && scale.getValueFlag().equals("9")) {
+                    throw new MarkerMetException(500, "只有未结算的洁净数据才能进行撤销发布操作");
+                }
             }
             UserPayload userPayload = new UserPayload();
             String userName = userPayload.getUserName();
-            String userId = userPayload.getId();
+            String userId = userPayload.getUserCode();
             int count = 0;
             for (MeterWorkRailwayActual model: models){
                 MeterWorkRailwayActual modelTemp = meterWorkRailwayActualMapper.selectByPrimaryKey(model.getActualNo());
@@ -300,6 +308,7 @@ public class MeterWorkRailwayActualServiceImpl extends BaseServiceImpl<MeterWork
                 MeterWorkRailwayActual actualRow = meterWorkRailwayActualMapper.cleanPredcition(model.getActualNo());
                 actualRow.setUploadFlag("1");
                 actualRow.setValueFlag("0");
+                actualRow.setIsPreSacale("0");
                 meterWorkRailwayActualMapper.updateByPrimaryKey(actualRow);
 
                 MeterBaseOperationLog logModel = new MeterBaseOperationLog();
@@ -341,7 +350,7 @@ public class MeterWorkRailwayActualServiceImpl extends BaseServiceImpl<MeterWork
 
         UserPayload userPayload = new UserPayload();
         String userName = userPayload.getUserName();
-        String userId = userPayload.getId();
+        String userId = userPayload.getUserCode();
         model.setValueFlag("2");
         model.setUploadFlag("1");
         model.setUpdateTime(new Date());
@@ -369,7 +378,7 @@ public class MeterWorkRailwayActualServiceImpl extends BaseServiceImpl<MeterWork
             }
             UserPayload userPayload = new UserPayload();
             String userName = userPayload.getUserName();
-            String userId = userPayload.getId();
+            String userId = userPayload.getUserCode();
             int count = 0;
             for (MeterWorkRailwayActual model: models){
                 MeterWorkRailwayActual modelTemp = meterWorkRailwayActualMapper.selectByPrimaryKey(model.getActualNo());
@@ -779,6 +788,8 @@ public class MeterWorkRailwayActualServiceImpl extends BaseServiceImpl<MeterWork
         PreRailwayScale prerow = preRailwayScaleMapper.selectByPrimaryKey(predictionNo);
         if (prerow == null) {
             throw new MarkerMetException(500, "不存在对应的委托数据");
+        } else if (prerow.getValueFlag().equals("9")) {
+            throw new MarkerMetException(500, "该委托已结算不能进行匹配委托操作");
         } else if (!prerow.getValueFlag().equals("1")) {
             throw new MarkerMetException(500, "只有未使用的委托才能进行匹配委托操作");
         }
@@ -789,7 +800,7 @@ public class MeterWorkRailwayActualServiceImpl extends BaseServiceImpl<MeterWork
         String userName;
         try{
             UserPayload payload = UserPayload.getCurrUser();
-            userId = payload.getId();
+            userId = payload.getUserCode();
             userName = payload.getUserName();
         }catch (Exception e){
             userId = "admin";
@@ -874,7 +885,7 @@ public class MeterWorkRailwayActualServiceImpl extends BaseServiceImpl<MeterWork
             throw new MarkerMetException(500, "不存在对应的毛重数据");
         }
         UserPayload payload = UserPayload.getCurrUser();
-        String userId = payload.getId();
+        String userId = payload.getUserCode();
         String userName = payload.getUserName();
 
         // 处理一次计量数据
@@ -983,7 +994,7 @@ public class MeterWorkRailwayActualServiceImpl extends BaseServiceImpl<MeterWork
         }
 
         UserPayload payload = UserPayload.getCurrUser();
-        String userId = payload.getId();
+        String userId = payload.getUserCode();
         String userName = payload.getUserName();
 
         // 处理一次计量数据
@@ -1189,7 +1200,7 @@ public class MeterWorkRailwayActualServiceImpl extends BaseServiceImpl<MeterWork
             String userId, userName;
             try{
                 UserPayload payload = UserPayload.getCurrUser();
-                userId = payload.getId();
+                userId = payload.getUserCode();
                 userName = payload.getUserName();
             }catch (Exception e){
                 userId = "admin";
@@ -1682,7 +1693,7 @@ public class MeterWorkRailwayActualServiceImpl extends BaseServiceImpl<MeterWork
         if (model.getActualNo() == null && model.getUploadFlag() == null)
             model.setUploadFlag(DbConstants.VALID);
         UserPayload payload = UserPayload.getCurrUser();
-        String userId = payload.getId();
+        String userId = payload.getUserCode();
         String userName = payload.getUserName();
         if (model.getActualNo() == null) {
             model.setNetTime(new Date());
@@ -1734,7 +1745,7 @@ public class MeterWorkRailwayActualServiceImpl extends BaseServiceImpl<MeterWork
         if (model.getActualNo() == null && model.getUploadFlag() == null)
             model.setUploadFlag(DbConstants.VALID);
         UserPayload payload = UserPayload.getCurrUser();
-        String userId = payload.getId();
+        String userId = payload.getUserCode();
         String userName = payload.getUserName();
         if (model.getActualNo() == null) {
             model.setNetTime(new Date());
@@ -2177,7 +2188,7 @@ public class MeterWorkRailwayActualServiceImpl extends BaseServiceImpl<MeterWork
         try{
             int num = 0;
             UserPayload payload = UserPayload.getCurrUser();
-            String userId = payload.getId();
+            String userId = payload.getUserCode();
             String userName = payload.getUserName();
 //            String userId = "admin";
 //            String userName = "admins";
@@ -2402,7 +2413,7 @@ public class MeterWorkRailwayActualServiceImpl extends BaseServiceImpl<MeterWork
                 }
             }
             /*UserPayload payload = UserPayload.getCurrUser();
-            String userId = payload.getId();
+            String userId = payload.getUserCode();
             String userName = payload.getUserName();*/
 
             //毛重
@@ -2763,7 +2774,7 @@ public class MeterWorkRailwayActualServiceImpl extends BaseServiceImpl<MeterWork
         String userName;
         try{
             UserPayload payload = UserPayload.getCurrUser();
-            userId = payload.getId();
+            userId = payload.getUserCode();
             userName = payload.getUserName();
         }catch(Exception e) {
             userId = "admin";
@@ -2784,7 +2795,7 @@ public class MeterWorkRailwayActualServiceImpl extends BaseServiceImpl<MeterWork
         String userName;
         try{
             UserPayload payload = UserPayload.getCurrUser();
-            userId = payload.getId();
+            userId = payload.getUserCode();
             userName = payload.getUserName();
         }catch(Exception e) {
             userId = "admin";
@@ -2803,7 +2814,7 @@ public class MeterWorkRailwayActualServiceImpl extends BaseServiceImpl<MeterWork
         String userName;
         try{
             UserPayload payload = UserPayload.getCurrUser();
-            userId = payload.getId();
+            userId = payload.getUserCode();
             userName = payload.getUserName();
         }catch(Exception e) {
             userId = "admin";
@@ -3598,6 +3609,18 @@ public class MeterWorkRailwayActualServiceImpl extends BaseServiceImpl<MeterWork
                 meterWorkRailwayActualMapper.updateByPrimaryKey(actualRow);
 //                meterWorkRailwayActualMapper.deleteByPrimaryKey(actualRow.getActualNo());
 
+                if(modelTemp.getPredictionNo() != null) {
+                    PreRailwayScale scale = preRailwayScaleMapper.selectByPrimaryKey(modelTemp.getPredictionNo());
+                    if(scale != null) {
+                        scale.setValueFlag("1");
+                        scale.setUploadFlag("0");
+                        scale.setUpdateManNo(userId);
+                        scale.setUpdateManName(userName);
+                        scale.setUpdateTime(new Date());
+                        preRailwayScaleMapper.updateByPrimaryKeySelective(scale);
+                    }
+                }
+
                 MeterBaseOperationLog logModel = new MeterBaseOperationLog();
                 logModel.setId(PublicMethod.IdCreate(2));
                 logModel.setCreateManNo(userId);
@@ -3640,7 +3663,8 @@ public class MeterWorkRailwayActualServiceImpl extends BaseServiceImpl<MeterWork
                     res.add(model);
                 }else {
                     MeterWorkRailwayActual up = new MeterWorkRailwayActual();
-                    up.setUploadFlag("2");
+                    up.setValueFlag("2");
+                    up.setUploadFlag("1");
                     up.setActualNo(model.getActualNo());
                     int re = meterWorkRailwayActualMapper.updateByPrimaryKeySelective(up);
                     count++;
@@ -3684,6 +3708,7 @@ public class MeterWorkRailwayActualServiceImpl extends BaseServiceImpl<MeterWork
                 }else {
                     MeterWorkRailwayActual up = new MeterWorkRailwayActual();
                     up.setUploadFlag("1");
+                    up.setValueFlag("2");
                     up.setActualNo(model.getActualNo());
                     int re = meterWorkRailwayActualMapper.updateByPrimaryKeySelective(up);
                     count++;

src/main/java/com/steerinfo/meterwork/meterworkrailwayactualbak/service/impl/MeterWorkRailwayActualBakServiceImpl.java

@@ -169,7 +169,7 @@ public class MeterWorkRailwayActualBakServiceImpl extends BaseServiceImpl<MeterW
 
         UserPayload userPayload = new UserPayload();
         String userName = userPayload.getUserName();
-        String userId = userPayload.getId();
+        String userId = userPayload.getUserCode();
         model.setValueFlag("1");
         model.setUpdateTime(new Date());
         model.setUpdateManName(userName);
@@ -197,7 +197,7 @@ public class MeterWorkRailwayActualBakServiceImpl extends BaseServiceImpl<MeterW
 
         UserPayload userPayload = new UserPayload();
         String userName = userPayload.getUserName();
-        String userId = userPayload.getId();
+        String userId = userPayload.getUserCode();
         model.setValueFlag("2");
         model.setUploadFlag("1");
         model.setUpdateTime(new Date());
@@ -564,7 +564,7 @@ public class MeterWorkRailwayActualBakServiceImpl extends BaseServiceImpl<MeterW
         String userName;
         try{
             UserPayload payload = UserPayload.getCurrUser();
-            userId = payload.getId();
+            userId = payload.getUserCode();
             userName = payload.getUserName();
         }catch (Exception e){
             userId = "admin";
@@ -649,7 +649,7 @@ public class MeterWorkRailwayActualBakServiceImpl extends BaseServiceImpl<MeterW
             throw new MarkerMetException(500, "不存在对应的毛重数据");
         }
         UserPayload payload = UserPayload.getCurrUser();
-        String userId = payload.getId();
+        String userId = payload.getUserCode();
         String userName = payload.getUserName();
 
         // 处理一次计量数据
@@ -751,7 +751,7 @@ public class MeterWorkRailwayActualBakServiceImpl extends BaseServiceImpl<MeterW
         }
 
         UserPayload payload = UserPayload.getCurrUser();
-        String userId = payload.getId();
+        String userId = payload.getUserCode();
         String userName = payload.getUserName();
 
         // 处理一次计量数据
@@ -940,7 +940,7 @@ public class MeterWorkRailwayActualBakServiceImpl extends BaseServiceImpl<MeterW
             String userId, userName;
             try{
                 UserPayload payload = UserPayload.getCurrUser();
-                userId = payload.getId();
+                userId = payload.getUserCode();
                 userName = payload.getUserName();
             }catch (Exception e){
                 userId = "admin";
@@ -1429,7 +1429,7 @@ public class MeterWorkRailwayActualBakServiceImpl extends BaseServiceImpl<MeterW
         if (model.getActualNo() == null && model.getUploadFlag() == null)
             model.setUploadFlag(DbConstants.VALID);
         UserPayload payload = UserPayload.getCurrUser();
-        String userId = payload.getId();
+        String userId = payload.getUserCode();
         String userName = payload.getUserName();
         if (model.getActualNo() == null) {
             model.setNetTime(new Date());
@@ -1481,7 +1481,7 @@ public class MeterWorkRailwayActualBakServiceImpl extends BaseServiceImpl<MeterW
         if (model.getActualNo() == null && model.getUploadFlag() == null)
             model.setUploadFlag(DbConstants.VALID);
         UserPayload payload = UserPayload.getCurrUser();
-        String userId = payload.getId();
+        String userId = payload.getUserCode();
         String userName = payload.getUserName();
         if (model.getActualNo() == null) {
             model.setNetTime(new Date());
@@ -1924,7 +1924,7 @@ public class MeterWorkRailwayActualBakServiceImpl extends BaseServiceImpl<MeterW
         try{
             int num = 0;
             UserPayload payload = UserPayload.getCurrUser();
-            String userId = payload.getId();
+            String userId = payload.getUserCode();
             String userName = payload.getUserName();
 //            String userId = "admin";
 //            String userName = "admins";
@@ -2136,7 +2136,7 @@ public class MeterWorkRailwayActualBakServiceImpl extends BaseServiceImpl<MeterW
                 }
             }
             /*UserPayload payload = UserPayload.getCurrUser();
-            String userId = payload.getId();
+            String userId = payload.getUserCode();
             String userName = payload.getUserName();*/
 
             //毛重
@@ -2485,7 +2485,7 @@ public class MeterWorkRailwayActualBakServiceImpl extends BaseServiceImpl<MeterW
         String userName;
         try{
             UserPayload payload = UserPayload.getCurrUser();
-            userId = payload.getId();
+            userId = payload.getUserCode();
             userName = payload.getUserName();
         }catch(Exception e) {
             userId = "admin";
@@ -2506,7 +2506,7 @@ public class MeterWorkRailwayActualBakServiceImpl extends BaseServiceImpl<MeterW
         String userName;
         try{
             UserPayload payload = UserPayload.getCurrUser();
-            userId = payload.getId();
+            userId = payload.getUserCode();
             userName = payload.getUserName();
         }catch(Exception e) {
             userId = "admin";
@@ -2525,7 +2525,7 @@ public class MeterWorkRailwayActualBakServiceImpl extends BaseServiceImpl<MeterW
         String userName;
         try{
             UserPayload payload = UserPayload.getCurrUser();
-            userId = payload.getId();
+            userId = payload.getUserCode();
             userName = payload.getUserName();
         }catch(Exception e) {
             userId = "admin";

src/main/java/com/steerinfo/meterwork/meterworksceneregister/service/impl/MeterWorkSceneRegisterServiceImpl.java

@@ -159,7 +159,7 @@ public class MeterWorkSceneRegisterServiceImpl extends BaseServiceImpl<MeterWork
         if(model.getSceneCode() == null || model.getSceneCode().equals(""))
             model.setValueFlag(DbConstants.VALID);
         UserPayload payload = UserPayload.getCurrUser();
-        String userId = payload.getId();
+        String userId = payload.getUserCode();
         String userName = payload.getUserName();
         if(model.getSceneCode() == null || model.getSceneCode().equals("")) {
             model.setCreateTime(new Date());

src/main/java/com/steerinfo/meterwork/meterworkstorageactual/service/impl/MeterWorkStorageActualServiceImpl.java

@@ -180,7 +180,7 @@ public class MeterWorkStorageActualServiceImpl extends BaseServiceImpl<MeterWork
 
     private void check(MeterWorkStorageActual model) {
         UserPayload payload = UserPayload.getCurrUser();
-        String userId = payload.getId();
+        String userId = payload.getUserCode();
         String userName = payload.getUserName();
         if (StringUtils.isEmpty(model.getActualNo())) {
             model.setCreateManNo(userId);
@@ -261,7 +261,7 @@ public class MeterWorkStorageActualServiceImpl extends BaseServiceImpl<MeterWork
     @Transactional(rollbackFor = Exception.class)
     public int doUpdateWf(List<MeterWorkStorageActual> model) {
         UserPayload payload = UserPayload.getCurrUser();
-        String userId = payload.getId();
+        String userId = payload.getUserCode();
         String userName = payload.getUserName();
 
         for (MeterWorkStorageActual mw : model) {

src/main/java/com/steerinfo/pretrack/peraddweight/service/impl/PerAddWeightServiceImpl.java

@@ -122,7 +122,7 @@ public class PerAddWeightServiceImpl extends BaseServiceImpl<PerAddWeight, Strin
             throw new MarkerMetException(500, "预报编号不能为空");
         }
         UserPayload payload = UserPayload.getCurrUser();
-        String userId = payload.getId();
+        String userId = payload.getUserCode();
         String userName = payload.getUserName();
         if (StringUtils.isEmpty(model.getPerdictionAddNo())) {
             model.setCreateManNo(userId);

src/main/java/com/steerinfo/pretrack/prerailwayscale/service/impl/PreRailwayScaleServiceImpl.java

@@ -119,7 +119,7 @@ public class PreRailwayScaleServiceImpl extends BaseServiceImpl<PreRailwayScale,
         //更新人信息
         /*if (UserPayload.getCurrUser() != null) {
             UserPayload payload = UserPayload.getCurrUser();
-            userId = payload.getId();
+            userId = payload.getUserCode();
             userName = payload.getUserName();
         }*/
 
@@ -271,7 +271,7 @@ public class PreRailwayScaleServiceImpl extends BaseServiceImpl<PreRailwayScale,
             model.setUploadFlag("1");
         }
         UserPayload payload = UserPayload.getCurrUser();
-        String userId = payload.getId();
+        String userId = payload.getUserCode();
         String userName = payload.getUserName();
         if (model.getPredictionNo() == null || model.getPredictionNo().equals("")) {
             model.setCreateTime(new Date());

src/main/java/com/steerinfo/pretrack/pretracknotice/service/impl/PreTrackNoticeServiceImpl.java

@@ -275,7 +275,7 @@ public class PreTrackNoticeServiceImpl extends BaseServiceImpl<PreTrackNotice, S
             throw new MarkerMetException(500, "业务类型名称不允许为空!!");
         }
         UserPayload payload = UserPayload.getCurrUser();
-        String userId = payload.getId();
+        String userId = payload.getUserCode();
         String userName = payload.getUserName();
         if (StringUtils.isEmpty(model.getNoticeNo())) {
             model.setCreateTime(new Date());

src/main/java/com/steerinfo/pretrack/pretrackscale/service/impl/PreTrackScaleServiceImpl.java

@@ -174,7 +174,7 @@ public class PreTrackScaleServiceImpl extends BaseServiceImpl<PreTrackScale, Str
 
         if (StringUtils.isEmpty(scale.getCreateManNo())) {
             UserPayload payload = UserPayload.getCurrUser();
-            String userId = payload.getId();
+            String userId = payload.getUserCode();
             String userName = payload.getUserName();
             scale.setCreateTime(new Date());
             scale.setCreateManNo(userId);
@@ -226,7 +226,7 @@ public class PreTrackScaleServiceImpl extends BaseServiceImpl<PreTrackScale, Str
         }
         if (StringUtils.isEmpty(model.getPredictionNo())) {
             UserPayload payload = UserPayload.getCurrUser();
-            String userId = payload.getId();
+            String userId = payload.getUserCode();
             String userName = payload.getUserName();
             model.setCreateTime(new Date());
             model.setCreateManNo(userId);

src/main/resources/application-dev.properties

@@ -79,7 +79,7 @@ multiple.datasource.master.password=lims_2021
 
 multiple.datasource.master.initial-size=15
 multiple.datasource.master.min-idle=15
-multiple.datasource.master.maxActive=15
+multiple.datasource.master.maxActive=30
 multiple.datasource.master.maxWait=1000
 multiple.datasource.master.timeBetweenEvictionRunsMillis=60000
 multiple.datasource.master.minEvictableIdleTimeMillis=300000

src/main/resources/application-prod.properties

@@ -79,7 +79,7 @@ multiple.datasource.master.password=lims_2021
 
 multiple.datasource.master.initial-size=15
 multiple.datasource.master.min-idle=15
-multiple.datasource.master.maxActive=15
+multiple.datasource.master.maxActive=30
 multiple.datasource.master.maxWait=1000
 multiple.datasource.master.timeBetweenEvictionRunsMillis=60000
 multiple.datasource.master.minEvictableIdleTimeMillis=300000

src/main/resources/application.properties

@@ -79,7 +79,7 @@ multiple.datasource.master.password=lims_2021
 
 multiple.datasource.master.initial-size=15
 multiple.datasource.master.min-idle=15
-multiple.datasource.master.maxActive=15
+multiple.datasource.master.maxActive=30
 multiple.datasource.master.maxWait=1000
 multiple.datasource.master.timeBetweenEvictionRunsMillis=60000
 multiple.datasource.master.minEvictableIdleTimeMillis=300000