后端修改

src/main/java/com/steerinfo/baseinfo/appverificationcode/service/impl/AppVerificationCodeServiceImpl.java

@@ -64,9 +64,12 @@ public class AppVerificationCodeServiceImpl extends BaseServiceImpl<AppVerificat
         HttpPostSmsClient client = new HttpPostSmsClient();
         client.setServerUrl("http://10.99.200.19:10086/router");
         //f2e0d49b4f7c4735a0e3e3b9d173e5e4]
-        client.setAppKey("53e548b23a784379b6c30ec88b28c801");
-        client.setAppSecret("c339eaa1099449fba94751649f185f63");
-
+        //以前的
+//        client.setAppKey("53e548b23a784379b6c30ec88b28c801");
+//        client.setAppSecret("c339eaa1099449fba94751649f185f63");
+        // 任学宏发我的
+        client.setAppKey("dfaeca54542e4eb99e93973aa145e82b");
+        client.setAppSecret("1c080c93037243618d5497611c21ccdb");
 
         //构造短信发送器（平台－》用户手机）
         //SmsSenderImpl smsSender = new SmsSenderImpl(client);

src/main/java/com/steerinfo/meterwork/meterworkcaractualbak/controller/MeterWorkCarActualBakController.java

@@ -962,40 +962,42 @@ public class MeterWorkCarActualBakController extends BaseRESTfulController {
         carMap.put("carNo", carNo);
         List<MeterBaseCar> carModels = meterBaseCarMapper.selectByParameters(carMap);
 
-        if (carModels.size() < 1){
-            return failed(null,"车号不存在");
-        }
-        MeterBaseCar meterBaseCar = carModels.get(0);
-        String carTypeNo = null;
-        if (meterBaseCar.getCarTypeNo() != null){
-            carTypeNo = meterBaseCar.getCarTypeNo();
-        }else{
-            return failed(null,"车型为空");
-        }
-
-        //内倒
-        if ("001004003".equals(carTypeNo)){
-            try {
-                meterWorkCarActualBakService.ndCopyToActual(ids,carNo);
-            } catch (Exception e) {
-                e.printStackTrace();
-                return failed(null,"复制失败");
+        if(carModels.size() >= 1) {
+            MeterBaseCar meterBaseCar = carModels.get(0);
+            String carTypeNo = null;
+            if (meterBaseCar.getCarTypeNo() != null){
+                carTypeNo = meterBaseCar.getCarTypeNo();
+            }else{
+                return failed(null,"车型为空");
             }
 
-            return success(null,"复制成功");
-        }else if ("001004002".equals(carTypeNo)){//外进外发
+            //内倒
+            if ("001004003".equals(carTypeNo)){
+                try {
+                    meterWorkCarActualBakService.ndCopyToActual(ids,carNo);
+                } catch (Exception e) {
+                    e.printStackTrace();
+                    return failed(null,"复制失败");
+                }
+            }else if ("001004002".equals(carTypeNo)){//外进外发
+                try {
+                    meterWorkCarActualBakService.wwCopyToActual(ids,carNo);
+                } catch (Exception e) {
+                    e.printStackTrace();
+                    return failed(null,"复制失败");
+                }
+            }else{
+                return failed(null,"车型编号错误，不存在对应车型");
+            }
+        }else {
             try {
                 meterWorkCarActualBakService.wwCopyToActual(ids,carNo);
             } catch (Exception e) {
                 e.printStackTrace();
                 return failed(null,"复制失败");
             }
-
-            return success(null,"复制成功");
-        }else{
-            return failed(null,"车型编号错误，不存在对应车型");
         }
-
+        return success(null,"复制成功");
     }
 
 }

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

@@ -1336,40 +1336,43 @@ public class MeterWorkCarActualFirstBakController extends BaseRESTfulController
         HashMap<String, Object> carMap = new HashMap<>();
         carMap.put("carNo", carNo);
         List<MeterBaseCar> carModels = meterBaseCarMapper.selectByParameters(carMap);
-        if (carModels.size() < 1){
-            return failed(null,"车号不存在");
-        }
-        MeterBaseCar meterBaseCar = carModels.get(0);
-        String carTypeNo = null;
-        if (meterBaseCar.getCarTypeNo() != null){
-            carTypeNo = meterBaseCar.getCarTypeNo();
-        }else{
-            return failed(null,"车型为空");
-        }
 
-        //内倒
-        if ("001004003".equals(carTypeNo)){
-            try {
-                meterWorkCarActualFirstBakService.ndCopyToFirst(ids,carNo);
-            } catch (Exception e) {
-                e.printStackTrace();
-                return failed(null,e.getMessage());
-            }
 
-            return success(null,"复制成功");
-        }else if ("001004002".equals(carTypeNo)){//外进外发
+        if(carModels.size() >= 1) {
+            MeterBaseCar meterBaseCar = carModels.get(0);
+            String carTypeNo = null;
+            if (meterBaseCar.getCarTypeNo() != null){
+                carTypeNo = meterBaseCar.getCarTypeNo();
+            }else{
+                return failed(null,"车型为空");
+            }
+            //内倒
+            if ("001004003".equals(carTypeNo)){
+                try {
+                    meterWorkCarActualFirstBakService.ndCopyToFirst(ids,carNo);
+                } catch (Exception e) {
+                    e.printStackTrace();
+                    return failed(null,e.getMessage());
+                }
+            }else if ("001004002".equals(carTypeNo)){//外进外发
+                try {
+                    meterWorkCarActualFirstBakService.wwCopyToFirst(ids,carNo);
+                } catch (Exception e) {
+                    e.printStackTrace();
+                    return failed(null,e.getMessage());
+                }
+            }else{
+                return failed(null,"车型编号错误，不存在对应车型");
+            }
+        }else {
             try {
                 meterWorkCarActualFirstBakService.wwCopyToFirst(ids,carNo);
             } catch (Exception e) {
                 e.printStackTrace();
                 return failed(null,e.getMessage());
             }
-
-            return success(null,"复制成功");
-        }else{
-            return failed(null,"车型编号错误，不存在对应车型");
         }
-
+        return success(null,"复制成功");
     }
 
 

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

@@ -422,6 +422,8 @@ public class MeterWorkImageServiceImpl extends BaseServiceImpl<MeterWorkImage, S
         return rm;
     }
 
+    @Resource
+    MeterWorkImageTempMapper tempMapper;
     /**
      * 图片新增操作
      * @param mwi
@@ -466,6 +468,31 @@ public class MeterWorkImageServiceImpl extends BaseServiceImpl<MeterWorkImage, S
                     }else{
                         meterWorkImageMapper.insertSelective(mwi);
                     }
+                }else{
+                    String url="";
+                    if(StringUtils.isNotEmpty(mwi.getImageFile3())){
+                        url=mwi.getImageFile3();
+                    }
+                    if(StringUtils.isNotEmpty(mwi.getImageFile4()))
+                        url=mwi.getImageFile4();
+
+                    if(StringUtils.isNotEmpty(url)){
+                        //http://10.99.81.20/icore.icp.web/pass/file/download/2022-08-21/DTJB420220821060550_0946046_P1.jpeg
+                        MeterWorkImageTemp temp=new MeterWorkImageTemp();
+                        temp.setImageNo(UUID.randomUUID().toString());
+                        temp.setValueFlag("0");
+                        temp.setImageUrl1(url);
+                        temp.setImageTime(imageTime);
+                        String[] strs=url.split("/");
+                        String[] str2=strs[strs.length-1].split("_");
+                        if(str2.length>1){
+                            temp.setRailwayNo(str2[1]);
+                            if(str2[0].length()>5) {
+                                temp.setBaseSpotNo(str2[0].substring(0, 5));
+                                tempMapper.insert(temp);
+                            }
+                        }
+                    }
                 }
             }else {
                 MeterWorkImage mw= meterWorkImageMapper.selectByPrimaryKey(mwi.getActualFirstNo());

src/main/java/com/steerinfo/pretrack/pretrackscale/mapper/PreTrackScaleMapper.xml

@@ -3450,10 +3450,10 @@
     <include refid="select"/>
     <where> 1 = 1
       <if test="carNo != null and carNo != ''">
-        and car_no = #{carNo}
+        and car_no like '%${carNo}%'
       </if>
       <if test="predictionNo != null and predictionNo != ''">
-        and prediction_no = #{predictionNo}
+        and prediction_no like '%${predictionNo}%'
       </if>
       <if test="startTime != null and startTime!='' and endTime != null and endTime!=''">
         and TRUST_DATE_TIME between to_date(#{startTime},'yyyy-MM-dd HH24:mi:ss') and to_date(#{endTime},'yyyy-MM-dd HH24:mi:ss')