后端修改

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

@@ -724,6 +724,16 @@ public class MeterBaseCarController extends BaseRESTfulController {
         //重置密码信息报错
         String msg = "";
         try {
+            String userId = "";
+            String userName = "";
+            try {
+                UserPayload userPayload = UserPayload.getCurrUser();
+                userId = userPayload.getUserCode();
+                userName = userPayload.getUserName();
+            }catch (Exception e) {
+                userId = "admin";
+                userName = "admins";
+            }
             // 检查车辆是否存在
             HashMap query = new HashMap();
             query.put("carNo", params.get("carNo").toString());
@@ -757,18 +767,44 @@ public class MeterBaseCarController extends BaseRESTfulController {
                     car.setCarTypeNo(params.get("carTypeNo").toString());
                     car.setCarTypeName(params.get("carTypeName").toString());
                     car.setValidFlag("0");
+                    //自重
                     if(params.get("carSelfWeight") != null ) {
                         if(!StringUtils.isEmpty(params.get("carSelfWeight").toString())) {
                             car.setCarSelfWeight(new BigDecimal(params.get("carSelfWeight").toString()));
                         }
                     }
+                    //载重
                     if(params.get("carCarrierWeight") != null ) {
                         if(!StringUtils.isEmpty(params.get("carCarrierWeight").toString())) {
                             car.setCarCarrierWeight(new BigDecimal(params.get("carCarrierWeight").toString()));
                         }
                     }
-                    car.setCreateManNo("admin");
-                    car.setCreateManName("admins");
+                    //挂号
+                    if(params.get("mnemonicCode") != null ) {
+                        if(!StringUtils.isEmpty(params.get("mnemonicCode").toString())) {
+                            car.setMnemonicCode(params.get("mnemonicCode").toString());
+                        }
+                    }
+                    //备注
+                    if(params.get("memo") != null ) {
+                        if(!StringUtils.isEmpty(params.get("memo").toString())) {
+                            car.setMemo(params.get("memo").toString());
+                        }
+                    }
+                    //客商编号
+                    if(params.get("customerSupplierNo") != null ) {
+                        if(!StringUtils.isEmpty(params.get("customerSupplierNo").toString())) {
+                            car.setCustomerSupplierNo(params.get("customerSupplierNo").toString());
+                        }
+                    }
+                    //客商名称
+                    if(params.get("customerSupplierName") != null ) {
+                        if(!StringUtils.isEmpty(params.get("customerSupplierName").toString())) {
+                            car.setCustomerSupplierName(params.get("customerSupplierName").toString());
+                        }
+                    }
+                    car.setCreateManNo(userId);
+                    car.setCreateManName(userName);
                     car.setCreateTime(new Date());
                     // 将sso id写入车辆表，便于以后删除和重置密码
                     if(ssoMap.get("code").equals("1")) {
@@ -802,18 +838,44 @@ public class MeterBaseCarController extends BaseRESTfulController {
                 }else{
                     msg = "特殊单位表未找到相应的单位";
                 }
+                //自重
                 if(params.get("carSelfWeight") != null ) {
                     if(!StringUtils.isEmpty(params.get("carSelfWeight").toString())) {
                         car.setCarSelfWeight(new BigDecimal(params.get("carSelfWeight").toString()));
                     }
                 }
+                //载重
                 if(params.get("carCarrierWeight") != null ) {
                     if(!StringUtils.isEmpty(params.get("carCarrierWeight").toString())) {
                         car.setCarCarrierWeight(new BigDecimal(params.get("carCarrierWeight").toString()));
                     }
                 }
-                car.setUpdateManNo("admin");
-                car.setUpdateManName("admins");
+                //挂号
+                if(params.get("mnemonicCode") != null ) {
+                    if(!StringUtils.isEmpty(params.get("mnemonicCode").toString())) {
+                        car.setMnemonicCode(params.get("mnemonicCode").toString());
+                    }
+                }
+                //备注
+                if(params.get("memo") != null ) {
+                    if(!StringUtils.isEmpty(params.get("memo").toString())) {
+                        car.setMemo(params.get("memo").toString());
+                    }
+                }
+                //客商编号
+                if(params.get("customerSupplierNo") != null ) {
+                    if(!StringUtils.isEmpty(params.get("customerSupplierNo").toString())) {
+                        car.setCustomerSupplierNo(params.get("customerSupplierNo").toString());
+                    }
+                }
+                //客商名称
+                if(params.get("customerSupplierName") != null ) {
+                    if(!StringUtils.isEmpty(params.get("customerSupplierName").toString())) {
+                        car.setCustomerSupplierName(params.get("customerSupplierName").toString());
+                    }
+                }
+                car.setUpdateManNo(userId);
+                car.setUpdateManName(userName);
                 car.setUpdateTime(new Date());
                 // 将sso id写入车辆表，便于以后删除和重置密码
                 if (StringUtils.isNotEmpty(car.getSsoId())) {

src/main/java/com/steerinfo/filter/SecurityFilter.java

@@ -49,7 +49,7 @@ public class SecurityFilter implements Filter {
         //网页代理ip：https://jgwzjl.jiugang.com/icore.icp.web/pass/systemBase/v1/meterbasecars/applogin
         //本地：http://10.104.4.105:9004/v1/meterbasecars/applogin
         if(request.getRemoteAddr().equals("10.1.201.188")
-//                ||request.getRemoteAddr().equals("10.104.4.105")
+                ||request.getRemoteAddr().equals("10.104.4.105")
                 ||request.getRemoteAddr().equals("0:0:0:0:0:0:0:1")
                 ||request.getRemoteAddr().equals("10.104.0.1")
             ) {

src/main/java/com/steerinfo/meterwork/meterworkimage/controller/MeterWorkImageController.java

@@ -226,4 +226,15 @@ public class MeterWorkImageController extends BaseRESTfulController {
         }
     }
 
+    @ApiOperation(value = "C#创建", notes = "根据MeterWorkImage对象创建")
+    @PostMapping(value = "/doSaveRailwayWf", produces = "application/json;charset=UTF-8")
+    public RESTfulResult doSaveRailwayWf(@RequestBody MeterWorkImage model) {
+        try {
+            return meterWorkImageService.doSaveRailwayWf(model);
+        } catch (Exception ex) {
+            ex.printStackTrace();
+            throw new MarkerMetException(500, "操作异常！！");
+        }
+    }
+
 }

src/main/java/com/steerinfo/meterwork/meterworkimage/service/IMeterWorkImageService.java

@@ -31,5 +31,6 @@ public interface IMeterWorkImageService extends IBaseService<MeterWorkImage, Str
     RESTfulResult getRailwayActualImageUrl(HashMap<String, Object> map);
 
     RESTfulResult doSaveWf(MeterWorkImage mwi);
+    RESTfulResult doSaveRailwayWf(MeterWorkImage mwi);
 
 }

src/main/java/com/steerinfo/meterwork/meterworkimage/service/impl/MeterWorkImageServiceImpl.java

@@ -20,6 +20,7 @@ import com.steerinfo.util.PublicMethod;
 import com.steerinfo.util.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 
 import javax.annotation.Resource;
 import java.lang.reflect.Array;
@@ -482,6 +483,33 @@ public class MeterWorkImageServiceImpl extends BaseServiceImpl<MeterWorkImage, S
         return rm;
     }
 
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public RESTfulResult doSaveRailwayWf(MeterWorkImage mwi) {
+        RESTfulResult rm = new RESTfulResult();
+        rm.setFailed();
+        try{
+            MeterWorkImage image = meterWorkImageMapper.selectByPrimaryKey(mwi.getActualFirstNo());
+            if(image != null) {
+                image.setImageFile3(mwi.getImageFile3());
+                image.setImageFile4(mwi.getImageFile4());
+                meterWorkImageMapper.updateByPrimaryKeySelective(image);
+            }else {
+                mwi.setImageFile8("");
+                meterWorkImageMapper.insertSelective(mwi);
+            }
+            MeterWorkImageTemp imageTemp = meterWorkImageTempMapper.selectByPrimaryKey(mwi.getImageFile8());
+            if(imageTemp != null) {
+                imageTemp.setValueFlag("1");
+                meterWorkImageTempMapper.updateByPrimaryKeySelective(imageTemp);
+            }
+        }catch (Exception e) {
+            e.printStackTrace();
+            rm.setMessage("图片信息写入表异常：" + e.getMessage());
+        }
+        return rm;
+    }
+
     private String getStrEmpty(String mwi) {
         String strCar;
         String[] strImage = mwi.split("/");

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

@@ -294,8 +294,23 @@ public class MeterWorkRailwayActFirstServiceImpl extends BaseServiceImpl<MeterWo
             }
             int count = 0;
             for (MeterWorkRailwayActFirst model: models) {
+                MeterWorkRailwayActFirst afterModel = meterWorkRailwayActFirstMapper.selectByPrimaryKey(model.getActualFirstNo());
                 meterWorkRailwayActFirstMapper.updateByPrimaryKeySelective(model);
                 count ++;
+
+                MeterBaseOperationLog logModel = new MeterBaseOperationLog();
+                logModel.setId(PublicMethod.IdCreate(2));
+                logModel.setCreateManNo(model.getUpdateManNo());
+                logModel.setCreateManName(model.getUpdateManName());
+                logModel.setCreateTime(new Date());
+                logModel.setOperationPage("一次数据维护");
+                logModel.setOperationFunction("修改");
+                logModel.setOperationId(model.getActualFirstNo());
+                logModel.setOperationPredictionNo(model.getPredictionNo());
+                logModel.setOperationCarnNo(model.getRailwayNo());
+                logModel.setOperationBeforeFix(afterModel.toString());
+                logModel.setOperationAfterFix(model.toString());
+                meterBaseOperationLogMapper.insertSelective(logModel);
             }
             rm.setSucceed();
             rm.setMessage("操作成功，共有" + count + "条数据更新成功");

src/main/java/com/steerinfo/meterwork/meterworkrailwayreceived/service/impl/MeterWorkRailwayReceivedServiceImpl.java

@@ -114,14 +114,17 @@ public class MeterWorkRailwayReceivedServiceImpl extends BaseServiceImpl<MeterWo
             SimpleDateFormat sdf = new SimpleDateFormat("yyyyMMdd");
             for (MeterWorkRailwayReceived model: models) {
                 if(model.getMemo() != null && StringUtils.isNotEmpty(model.getMemo())) {
+                    MeterWorkRailwayReceived received = meterWorkRailwayReceivedMapper.selectByPrimaryKey(model.getActualFirstNo());
                     MeterBaseOperationLog note = new MeterBaseOperationLog();
                     String no = PublicMethod.IdCreate(3);
                     note.setId(no);
-                    note.setCreateManNo(model.getCreateManNo());
-                    note.setCreateManName(model.getCreateManName());
+                    note.setCreateManNo(model.getUpdateManNo());
+                    note.setCreateManName(model.getUpdateManName());
                     note.setCreateTime(new Date());
                     note.setOperationPage("终端-轨道衡从表数据维护");
                     note.setOperationFunction("修改");
+                    note.setOperationBeforeFix(received.toString());
+                    note.setOperationAfterFix(model.toString());
                     note.setOperationCarnNo(model.getRailwayNo());
                     meterBaseOperationLogMapper.insertSelective(note);
                     model.setMemo("");

src/main/java/com/steerinfo/meterwork/meterworkznlc/service/impl/MeterWorkZnlcService.java

@@ -12,6 +12,7 @@ import com.steerinfo.meterwork.meterworkznlc.service.IMeterWorkZnlcService;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
+import java.math.BigDecimal;
 import java.util.HashMap;
 import java.util.List;
 
@@ -31,16 +32,15 @@ public class MeterWorkZnlcService implements IMeterWorkZnlcService {
 
     @Override
     public Boolean getNewActual(RESTfulResult rm, HashMap<String, Object> map, HashMap<String, Object> param) {
-
         //根据委托号查询洁净数据（新系统）
         List<MeterWorkCarActual> actualList = meterWorkCarActualMapper.selectByParameters(map);
         if(actualList.size() >= 1) {
             param.put("DeviceNo", actualList.get(0).getNetSpot3No());    //计量设备号
             param.put("WeightVoucherNo", actualList.get(0).getPredictionNo()); //检斤委托号
             param.put("ConveyanceNo", actualList.get(0).getCarNo());   //车牌号
-            param.put("GrossWeight", actualList.get(0).getGrossWeight());    //过磅量
-            param.put("TareWeight", actualList.get(0).getTareWeight());     //空车重
-            param.put("NetWeight", actualList.get(0).getNetWeight());      //过磅净重
+            param.put("GrossWeight", actualList.get(0).getGrossWeight().divide(new BigDecimal(1000)));    //过磅量
+            param.put("TareWeight", actualList.get(0).getTareWeight().divide(new BigDecimal(1000)));     //空车重
+            param.put("NetWeight", actualList.get(0).getNetWeight().divide(new BigDecimal(1000)));      //过磅净重
             param.put("MeteringTime", actualList.get(0).getNetTime());   //计量时刻
             param.put("MetringPerson", actualList.get(0).getNetManName());  //计量人
             rm.setData(param);
@@ -52,7 +52,7 @@ public class MeterWorkZnlcService implements IMeterWorkZnlcService {
                 param.put("DeviceNo", firstList.get(0).getBaseSpotNo());    //计量设备号
                 param.put("WeightVoucherNo", firstList.get(0).getPredictionNo()); //检斤委托号
                 param.put("ConveyanceNo", firstList.get(0).getCarNo());   //车牌号
-                param.put("GrossWeight", firstList.get(0).getMeterWeight());    //过磅量
+                param.put("GrossWeight", firstList.get(0).getMeterWeight().divide(new BigDecimal(1000)));    //过磅量
                 param.put("TareWeight", null);     //空车重
                 param.put("NetWeight", null);      //过磅净重
                 param.put("MeteringTime", firstList.get(0).getCreateTime());   //计量时刻