后端修改

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

@@ -567,10 +567,10 @@ public class MeterBaseCarController extends BaseRESTfulController {
         RESTfulResult rm = failed();
 
         rm.setMessage("");
-        String carNo = params.get("carNo").toString();
-        String telNum = params.get("telNum").toString();
-        String passWord = params.get("password").toString();
-        String passCode = params.get("code").toString();
+        String carNo = params.get("carNo") == null? "": params.get("carNo").toString();
+        String telNum = params.get("telNum") == null? "": params.get("telNum").toString();
+        String passWord = params.get("password") == null? "": params.get("password").toString();
+        String passCode = params.get("code")== null? "": params.get("code").toString();
         try {
             if (carNo == null || com.steerinfo.util.StringUtils.isEmpty(carNo)) {
                 rm.setMessage("车号不能为空！！");
@@ -585,6 +585,14 @@ public class MeterBaseCarController extends BaseRESTfulController {
                 rm.setMessage("验证码不能为空！！");
                 return rm;
             } else {
+                HashMap<String, Object> carMap = new HashMap<>();
+                carMap.put("carNo", carNo);
+                carMap.put("carTypeNo", "001004003");
+                List<MeterBaseCar> carModel = meterBaseCarMapper.selectByParameters(carMap);
+                if(carModel.size() >= 1) {
+                    rm.setMessage("内倒车辆不允许重置密码！！");
+                    return rm;
+                }
                 HashMap<String, Object> map = new HashMap<>();
                 map.put("carNo", carNo);
                 map.put("telNum", telNum);

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

@@ -326,6 +326,16 @@ public class MeterWorkCarActualServiceImpl extends BaseServiceImpl<MeterWorkCarA
                     throw new MarkerMetException(500, "选中的两条一次计量数据已经匹配委托，请正确选择数据！！！");
                 }
             }
+            String userId = "";
+            String userName = "";
+            try{
+                UserPayload userPayload = UserPayload.getCurrUser();
+                userId = userPayload.getUserCode();
+                userName = userPayload.getUserName();
+            }catch(Exception e) {
+                userId =  "admin";
+                userName = "admins";
+            }
 
             MeterWorkCarActual actualRow = new MeterWorkCarActual();
             if(StringUtils.isNotEmpty(predictionNo)){
@@ -335,9 +345,10 @@ public class MeterWorkCarActualServiceImpl extends BaseServiceImpl<MeterWorkCarA
                 BeanUtils.copyProperties(first2, mwcaf2);
 
                 mwcaf1.setValueFlag(DbConstants.NET);
-                mwcaf1.setUpdateManName("system");
-                mwcaf1.setUpdateManName("二次计量结净更新");
+                mwcaf1.setUpdateManName(userId);
+                mwcaf1.setUpdateManName(userName);
                 mwcaf1.setUpdateTime(new Date());
+                mwcaf1.setNote("网页手动计量结净");
                 mwcaf1.setIsPreScale("1");
                 mwcaf1.setPredictionNo(predictionNo);
                 mwcaf1.setPredictionType("1");
@@ -345,9 +356,10 @@ public class MeterWorkCarActualServiceImpl extends BaseServiceImpl<MeterWorkCarA
 
                 // 皮重数据处理
                 mwcaf2.setValueFlag(DbConstants.NET);
-                mwcaf2.setUpdateManName("system");
-                mwcaf2.setUpdateManName("二次计量结净更新");
+                mwcaf2.setUpdateManName(userId);
+                mwcaf2.setUpdateManName(userName);
                 mwcaf2.setUpdateTime(new Date());
+                mwcaf2.setNote("网页手动计量结净");
                 mwcaf2.setPredictionNo(predictionNo);
                 mwcaf2.setPredictionType("1");
                 meterWorkCarActualFirstMapper.updateByPrimaryKey(mwcaf2);
@@ -385,6 +397,9 @@ public class MeterWorkCarActualServiceImpl extends BaseServiceImpl<MeterWorkCarA
                     actualRow.setCreateTime(actualRow.getTareTime());
                     actualRow.setCreateManName(actualRow.getTareManName());
                 }
+                actualRow.setUpdateManNo(userId);
+                actualRow.setUpdateManName(userName);
+                actualRow.setUpdateTime(new Date());
                 meterWorkCarActualMapper.insertSelective(actualRow);
 
                 PreTrackScale scale = preTrackScaleMapper.selectByPrimaryKey(predictionNo);
@@ -415,9 +430,10 @@ public class MeterWorkCarActualServiceImpl extends BaseServiceImpl<MeterWorkCarA
                         BeanUtils.copyProperties(first2, mwcaf2);
 
                         mwcaf1.setValueFlag(DbConstants.NET);
-                        mwcaf1.setUpdateManName("system");
-                        mwcaf1.setUpdateManName("二次计量结净更新");
+                        mwcaf1.setUpdateManName(userId);
+                        mwcaf1.setUpdateManName(userName);
                         mwcaf1.setUpdateTime(new Date());
+                        mwcaf1.setNote("网页手动计量结净");
                         mwcaf1.setIsPreScale("1");
                         mwcaf1.setPredictionNo(scale.getPredictionNo());
                         mwcaf1.setPredictionType("1");
@@ -425,9 +441,10 @@ public class MeterWorkCarActualServiceImpl extends BaseServiceImpl<MeterWorkCarA
 
                         // 皮重数据处理
                         mwcaf2.setValueFlag(DbConstants.NET);
-                        mwcaf2.setUpdateManName("system");
-                        mwcaf2.setUpdateManName("二次计量结净更新");
+                        mwcaf2.setUpdateManName(userId);
+                        mwcaf2.setUpdateManName(userName);
                         mwcaf2.setUpdateTime(new Date());
+                        mwcaf2.setNote("网页手动计量结净");
                         mwcaf2.setIsPreScale("1");
                         mwcaf2.setPredictionNo(scale.getPredictionNo());
                         mwcaf2.setPredictionType("1");
@@ -468,6 +485,9 @@ public class MeterWorkCarActualServiceImpl extends BaseServiceImpl<MeterWorkCarA
                             actualRow.setCreateTime(actualRow.getTareTime());
                             actualRow.setCreateManName(actualRow.getTareManName());
                         }
+                        actualRow.setUpdateManNo(userId);
+                        actualRow.setUpdateManName(userName);
+                        actualRow.setUpdateTime(new Date());
                         meterWorkCarActualMapper.insertSelective(actualRow);
 
                         scale.setValueFlag(DbConstants.NET);
@@ -488,17 +508,19 @@ public class MeterWorkCarActualServiceImpl extends BaseServiceImpl<MeterWorkCarA
                 MeterWorkCarActualFirst first2 = meterWorkCarActualFirstMapper.selectByPrimaryKey(dataNo);
 
                 first1.setValueFlag(DbConstants.NET);
-                first1.setUpdateManName("system");
-                first1.setUpdateManName("二次计量结净更新");
-                first1.setUpdateTime(new Date());
+                mwcaf1.setUpdateManName(userId);
+                mwcaf1.setUpdateManName(userName);
+                mwcaf1.setUpdateTime(new Date());
+                mwcaf1.setNote("网页手动计量结净");
                 first1.setIsPreScale("0");
                 meterWorkCarActualFirstMapper.updateByPrimaryKey(first1);
 
                 // 皮重数据处理
                 first2.setValueFlag(DbConstants.NET);
-                first2.setUpdateManName("system");
-                first2.setUpdateManName("二次计量结净更新");
+                first2.setUpdateManName(userId);
+                first2.setUpdateManName(userName);
                 first2.setUpdateTime(new Date());
+                first2.setNote("网页手动计量结净");
                 first2.setIsPreScale("0");
                 meterWorkCarActualFirstMapper.updateByPrimaryKey(first2);
 
@@ -536,6 +558,9 @@ public class MeterWorkCarActualServiceImpl extends BaseServiceImpl<MeterWorkCarA
                     actualRow.setCreateTime(actualRow.getTareTime());
                     actualRow.setCreateManName(actualRow.getTareManName());
                 }
+                actualRow.setUpdateManNo(userId);
+                actualRow.setUpdateManName(userName);
+                actualRow.setUpdateTime(new Date());
                 meterWorkCarActualMapper.insertSelective(actualRow);
             }
             return actualRow;