后端修改

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

@@ -281,9 +281,18 @@ public class MeterBaseCarController extends BaseRESTfulController {
                         }
                     }
                     // 将sso id写入车辆表，便于以后删除和重置密码
-                    if(!ssoMap.get("code").toString().equals("1")){
+//                    if(!ssoMap.get("code").toString().equals("1")){
+//                        car.setSsoId(ssoMap.get("data").toString());
+//                    }else{
+//                        msg = ssoUtil.ssoResetPwd(car.getSsoId(), params.get("password").toString(), "");
+//                    }
+                    if(ssoMap.get("code").equals("1")) {
+                        HashMap<String, Object> carTemp = new HashMap<>();
+                        carTemp.put("userCode", params.get("carNo").toString());
+                        String ssoId = meterBaseCarMapper.ssoIdBySysUser(carTemp);
+                        car.setSsoId(ssoId);
+                    }else if(ssoMap.get("code").equals("0")) {
                         car.setSsoId(ssoMap.get("data").toString());
-                    }else{
                         msg = ssoUtil.ssoResetPwd(car.getSsoId(), params.get("password").toString(), "");
                     }
                     car.setCreateManNo("admin");

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

@@ -429,8 +429,9 @@ public class MeterWorkImageServiceImpl extends BaseServiceImpl<MeterWorkImage, S
      */
     public RESTfulResult doSaveWf(MeterWorkImage mwi){
         RESTfulResult rm = new RESTfulResult();
+        rm.setSucceed();
+        rm.setCode("200");
         try{
-            rm.setCode("200");
             String strCar = null;
             if(mwi.getImageFile2()!=null && StringUtils.isNotEmpty(mwi.getImageFile2())) {
                 strCar = getStrEmpty(mwi.getImageFile2());
@@ -503,6 +504,9 @@ public class MeterWorkImageServiceImpl extends BaseServiceImpl<MeterWorkImage, S
                 imageTemp.setValueFlag("1");
                 meterWorkImageTempMapper.updateByPrimaryKeySelective(imageTemp);
             }
+            rm.setSucceed(true);
+            rm.setMessage("操作成功");
+            rm.setCode("200");
         }catch (Exception e) {
             e.printStackTrace();
             rm.setMessage("图片信息写入表异常：" + e.getMessage());

src/main/java/com/steerinfo/meterwork/meterworkimagetemp/service/impl/MeterWorkImageTempServiceImpl.java

@@ -68,7 +68,7 @@ public class MeterWorkImageTempServiceImpl extends BaseServiceImpl<MeterWorkImag
             meterWorkImageTempMapper.insertSelective(mwi);
             rm.setSucceed(true);
             rm.setMessage("操作成功");
-            rm.setData(mwi);
+            rm.setData(mwi.toString());
         }catch(Exception ex){
             rm.setMessage("图片信息写入表异常："+ex.getMessage());
         }
@@ -94,19 +94,19 @@ public class MeterWorkImageTempServiceImpl extends BaseServiceImpl<MeterWorkImag
             HashMap<String, Object> imageMap = new HashMap();
             imageMap.put("startTime", startTime);
             imageMap.put("endTime", endTime);
-            imageMap.put("valueFlag", "1");
-
+            imageMap.put("valueFlag", "0");
             //查询图片中间表 当前时间-baseInfo.getBaseName()至当前时间的图片信息
             List<MeterWorkImageTemp> imageTemps = meterWorkImageTempMapper.imageQuery(imageMap);
+
             if(imageTemps.size() >= 1) {
                 for(MeterWorkImageTemp imageTemp: imageTemps) {
-                    Date createTime = new Date();
+                    Date createTime = imageTemp.getImageTime();
                     Calendar beforeDTemp = Calendar.getInstance();
                     Calendar afterDTemp = Calendar.getInstance();
                     beforeDTemp.setTime(createTime);
                     afterDTemp.setTime(createTime);
-                    beforeD.add(Calendar.MINUTE, -6);
-                    afterD.add(Calendar.MINUTE, 0);
+                    beforeDTemp.add(Calendar.MINUTE, -6);
+                    afterDTemp.add(Calendar.MINUTE, 0);
                     String startTimeTemp = sdf.format(beforeDTemp.getTime());
                     String endTimeTemp = sdf.format(afterDTemp.getTime());
                     HashMap<String, Object> receivedMap = new HashMap();
@@ -125,7 +125,17 @@ public class MeterWorkImageTempServiceImpl extends BaseServiceImpl<MeterWorkImag
                                 image.setImageFile4(imageTemp.getImageUrl1());
                             }
                             meterWorkImageMapper.updateByPrimaryKeySelective(image);
-
+                            imageTemp.setValueFlag("1");
+                            meterWorkImageTempMapper.updateByPrimaryKeySelective(imageTemp);
+                        }else {
+                            MeterWorkImage imageModel = new MeterWorkImage();
+                            imageModel.setActualFirstNo(receiveds.get(0).getActualFirstNo());
+                            if(imageTemp.getImageUrl1().indexOf("P1") != -1) {
+                                imageModel.setImageFile3(imageTemp.getImageUrl1());
+                            }else if(imageTemp.getImageUrl1().indexOf("P2") != -1) {
+                                imageModel.setImageFile4(imageTemp.getImageUrl1());
+                            }
+                            meterWorkImageMapper.insertSelective(imageModel);
                             imageTemp.setValueFlag("1");
                             meterWorkImageTempMapper.updateByPrimaryKeySelective(imageTemp);
                         }