后端提交

src/main/java/com/steerinfo/baseinfo/meterbasecar/service/impl/MeterBaseCarServiceImpl.java

@@ -12,6 +12,7 @@ import com.steerinfo.baseinfo.meterbasecar.mapper.MeterBaseCarMapper;
 import com.steerinfo.baseinfo.meterbasecar.service.IMeterBaseCarService;
 import com.steerinfo.framework.service.pagehelper.PageHelper;
 import com.steerinfo.framework.service.pagehelper.PageList;
+import com.steerinfo.framework.user.UserPayload;
 import com.steerinfo.meterwork.meterworkcaractual.mapper.MeterWorkCarActualMapper;
 import com.steerinfo.meterwork.meterworkcaractual.model.MeterWorkCarActual;
 import com.steerinfo.util.*;
@@ -153,6 +154,16 @@ public class MeterBaseCarServiceImpl extends BaseServiceImpl<MeterBaseCar, Strin
         rm.setCode("500");
         rm.setMessage("操作失败！！");
         try{
+            UserPayload userPayload = UserPayload.getCurrUser();
+            String userId = null;
+            String userName = null;
+            try {
+                userId = userPayload.getUserCode();
+                userName = userPayload.getUserName();
+            }catch (Exception e) {
+                userId = "admin";
+                userName = "admins";
+            }
             int count = 0;
             for(HashMap model: models) {
                 if(model.get("carNo") == null || model.get("carNo").equals("")){
@@ -164,7 +175,7 @@ public class MeterBaseCarServiceImpl extends BaseServiceImpl<MeterBaseCar, Strin
                     return rm;
                 }
                 if(model.get("carTypeNo") == null || model.get("carTypeNo").equals("")){
-                    rm.setMessage("车辆类型编号不嫩为空！！");
+                    rm.setMessage("车辆类型编号不能为空！！");
                     return rm;
                 }
                 if(model.get("carTypeName") == null || model.get("carTypeName").equals("")){
@@ -282,9 +293,6 @@ public class MeterBaseCarServiceImpl extends BaseServiceImpl<MeterBaseCar, Strin
                                 car.setCarSelfWeight(new BigDecimal(model.get("carSelfWeight").toString()));
                             }
                         }
-                        car.setCreateManNo("admin");
-                        car.setCreateManName("admins");
-                        car.setCreateTime(new Date());
                         car.setValidFlag("0");
                         // 将sso id写入车辆表，便于以后删除和重置密码
                         if(ssoMap.get("data") != null && StringUtils.isNotEmpty(ssoMap.get("data").toString())) {
@@ -293,18 +301,27 @@ public class MeterBaseCarServiceImpl extends BaseServiceImpl<MeterBaseCar, Strin
                         HashMap<String, Object> map = new HashMap<>();
                         map.put("carNo", carNo);
                         List<MeterBaseCar> carModels = meterBaseCarMapper.selectByParameters(map);
-                        if(models.size() >= 1) {
+                        if(carModels.size() >= 1) {
                             car.setPkNo(carModels.get(0).getPkNo());
+                            car.setUpdateManNo(userId);
+                            car.setUpdateManName(userName);
+                            car.setUpdateTime(new Date());
                             meterBaseCarMapper.updateByPrimaryKeySelective(car);
                         }else {
 //                            String no=meterBaseCarMapper.GetNewID(new SimpleDateFormat("yyyyMMdd").format(new Date()));
 //                            car.setId(new SimpleDateFormat("yyyyMMdd").format(new Date())+no);
-
+                            car.setCreateManNo(userId);
+                            car.setCreateManName(userName);
+                            car.setCreateTime(new Date());
                             String no =  PublicMethod.IdCreate(3);
                             car.setId(no);
                             car.setPkNo(no);
                             meterBaseCarMapper.insertSelective(car);
                         }
+                        if (car.getSsoId() != null && car.getCarTypeNo().equals("001004003")) {
+                            // SSO重置密码
+                            ssoUtil.ssoResetPwd(car.getSsoId(), "123456", "");
+                        }
                 }
                 //将司机信息写入司机表
                 MeterBaseDriver driver = new MeterBaseDriver();
@@ -320,14 +337,19 @@ public class MeterBaseCarServiceImpl extends BaseServiceImpl<MeterBaseCar, Strin
                         driver.setTelNum(model.get("telNum").toString());
                     }
                 }
-                driver.setCreateManNo("admins");
-                driver.setCreateManName("admins");
-                driver.setCreateTime(new Date());
                 driver.setCarId(carNo);
                 driver.setValidFlag("0");
                 MeterBaseDriver findCar = meterBaseDriverMapper.selectByPrimaryKey(driver.getDriverNo());
                 if(findCar == null) {
+                    driver.setUpdateManNo(userId);
+                    driver.setUpdateManName(userName);
+                    driver.setCreateTime(new Date());
                     meterBaseDriverMapper.insertSelective(driver);
+                }else {
+                    driver.setCreateManNo(userId);
+                    driver.setCreateManName(userName);
+                    driver.setCreateTime(new Date());
+                    meterBaseDriverMapper.updateByPrimaryKeySelective(driver);
                 }
                 count ++;
             }

src/main/java/com/steerinfo/meterwork/meterworkcaractual/mapper/MeterWorkCarActualMapper.java

@@ -57,4 +57,6 @@ public interface MeterWorkCarActualMapper extends IBaseMapper<MeterWorkCarActual
     List<MeterWorkCarActual> likeByDesc(Map<String, Object> params);
 
     List<MeterWorkCarActual> selectByMap(Map<String, Object> params);
+
+    List<HashMap> selectOldAndNew(Map<String, Object> params);
 }

src/main/java/com/steerinfo/meterwork/meterworkcaractual/mapper/MeterWorkCarActualMapper.xml

@@ -3895,5 +3895,52 @@
     and value_flag != '0'
     order by ACTUAL_NO desc
   </select>
-  
+
+  <select id="selectOldAndNew" parameterType="java.util.HashMap" resultType="HashMap">
+    SELECT *
+       FROM (
+    select ACTUAL_NO,CAR_NO,
+           GROSS_WEIGHT,
+           BASE_SPOT1_NAME,
+           GROSS_TIME,
+           TARE_WEIGHT,
+           BASE_SPOT2_NAME,
+           TARE_TIME,
+           NET_WEIGHT,
+           NET_SPOT3_NAME,
+           NET_TIME,
+           FORWARDING_UNIT_NAME,
+           RECEIVING_UINT_NAME,
+           MATTER_NAME,
+           '新系统' REMARK from METER_WORK_CAR_ACTUAL
+     where IS_PRE_SCALE='1'
+           and VALUE_FLAG='1'
+           and UPLOAD_FLAG='2'
+           and NET_TIME > to_date('2022-01-01'，'YYYY-MM-DD')
+           union
+               select FS_WEIGHTNO as ACTUAL_NO,REPLACE(FS_CARNO,'-','') as CAR_NO,
+                      FS_GROSSWEIGHT * 1000 as GROSS_WEIGHT,
+                      FS_GROSSPOINTNAME as BASE_SPOT1_NAME,
+                      FS_GROSSWEIGHTTIME as GROSS_TIME,
+                      FS_TAREWEIGHT * 1000 as TARE_WEIGHT,
+                      FS_TAREPOINTNAME as BASE_SPOT2_NAME,
+                      FS_TAREWEIGHTTIME as TARE_TIME,
+                      FS_NETWEIGHT * 1000 as NET_WEIGHT,
+                      FS_NETPOINTNAME as NET_SPOT3_NAME,
+                      FS_NETWEIGHTTIME as NET_TIME,
+                      FS_SENDERNAME as FORWARDING_UNIT_NAME,
+                      FS_RECEIVERNAME as RECEIVING_UINT_NAME,
+                      FS_MATERIALNAME as MATTER_NAME,
+                      '老系统' REMARK
+                from jgweight.view_car_net @MCMS
+                   where FS_NETWEIGHTTIME > to_date('2022-01-01'，'YYYY-MM-DD') AND FS_DELETEDTAG='N'
+             ) A
+     where 1 = 1
+        <if test="startTime != null and endTime != null and startTime != '' and endTime != ''">
+          and  net_time  >= TO_DATE(#{startTime}, 'yyyy-MM-dd HH24:mi:ss') and net_time  &lt;=  TO_DATE(#{endTime}, 'yyyy-MM-dd HH24:mi:ss')
+        </if>
+        <if test="carNo != null and carNo != ''">
+          and car_no like '%${carNo}%'
+        </if>
+  </select>
 </mapper>

src/main/java/com/steerinfo/meterwork/meterworkoldandnew/controller/MeterWorkOldAndNew.java

@@ -0,0 +1,50 @@
+package com.steerinfo.meterwork.meterworkoldandnew.controller;
+
+
+import com.steerinfo.baseinfo.meterbasecar.mapper.MeterBaseCarMapper;
+import com.steerinfo.baseinfo.meterbasecar.model.MeterBaseCar;
+import com.steerinfo.framework.controller.BaseRESTfulController;
+import com.steerinfo.framework.controller.RESTfulResult;
+import com.steerinfo.framework.service.pagehelper.PageHelper;
+import com.steerinfo.framework.service.pagehelper.PageList;
+import com.steerinfo.meterwork.meterworkcaractual.mapper.MeterWorkCarActualMapper;
+import com.steerinfo.meterwork.meterworkcaractual.model.MeterWorkCarActual;
+import com.steerinfo.meterwork.meterworkcaractualfirst.mapper.MeterWorkCarActualFirstMapper;
+import com.steerinfo.meterwork.meterworkcaractualfirst.model.MeterWorkCarActualFirst;
+import com.steerinfo.meterwork.meterworkmonitor.dto.MeterWorkMonitorDto;
+import com.steerinfo.meterwork.meterworkmonitor.model.MeterWorkMonitor;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.annotation.Resource;
+import java.util.HashMap;
+import java.util.List;
+
+@RestController
+@RequestMapping("/${api.version}/meterworkoldandnews")
+public class MeterWorkOldAndNew extends BaseRESTfulController {
+    @Resource
+    MeterWorkCarActualMapper meterWorkCarActualMapper;
+
+    @ApiOperation(value="查询老系统和新系统", notes="返回List<HashMap>对象")
+    @PostMapping(value = "/doQueryOldAndNew")
+    public RESTfulResult HasPermissionGivenByJL(@RequestBody HashMap params) {
+        RESTfulResult rm = success();
+        try {
+            PageHelper.startPage(Integer.parseInt(params.get("pageNum").toString()), Integer.parseInt(params.get("pageSize").toString()));
+            List<HashMap> oldAndNewList = meterWorkCarActualMapper.selectOldAndNew(params);
+            PageList pageInfo = new PageList(oldAndNewList);
+            rm.setCode("200");
+            rm.setMessage("操作成功！！");
+            rm.setData(pageInfo);
+        }catch (Exception e) {
+            e.printStackTrace();
+            rm.setMessage("操作异常:>>>" + e.getMessage());
+        }
+        return rm;
+    }
+
+}