Merge branch 'master' of https://git.steerinfo.com/caol/jg_wzjl_api.git

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

@@ -35,6 +35,8 @@ import org.springframework.transaction.interceptor.TransactionAspectSupport;
 import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
+import java.text.DecimalFormat;
+import java.text.SimpleDateFormat;
 import java.util.*;
 import java.math.BigDecimal;
 
@@ -271,7 +273,7 @@ public class MeterBaseCarController extends BaseRESTfulController {
                     car.setCreateManName("admins");
                     car.setCreateTime(new Date());
 
-                    meterBaseCarService.add(car);
+                    meterBaseCarService.checkandadd(car);
                 }else if(queryList02.size() >= 1){
                     for (MeterBaseCar model: queryList02) {
                         HashMap map = new HashMap();
@@ -329,7 +331,7 @@ public class MeterBaseCarController extends BaseRESTfulController {
                     query.put("telNum", driver.getTelNum());
                     query.put("validFlag", "0");
 
-                    List<MeterBaseCusSupCar> list = meterBaseDriverService.query(query);
+                    List<MeterBaseDriver> list = meterBaseDriverService.query(query);
                     // 司机表已存在时，跳过
                     if (list.size() == 0) {
                         // 将司机信息加入实体
@@ -349,7 +351,7 @@ public class MeterBaseCarController extends BaseRESTfulController {
 
                         MeterBaseDriver list1 = meterBaseDriverMapper.selectByPrimaryKey(pkNO);
                         if(list1 == null){
-                            meterBaseDriverService.add(driver);
+                            meterBaseDriverService.checkandadd(driver);
                         }
                         else {
                             list1.setValidFlag("0");
@@ -872,7 +874,7 @@ public class MeterBaseCarController extends BaseRESTfulController {
                     driver.setCreateManNo("admin");
                     driver.setCreateManName("admins");
                     driver.setCreateTime(new Date());
-                    meterBaseDriverService.add(driver);
+                    meterBaseDriverService.checkandadd(driver);
                 }
                 if (com.steerinfo.util.StringUtils.isNotEmpty(msg)) {
                     TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
@@ -974,5 +976,37 @@ public class MeterBaseCarController extends BaseRESTfulController {
         }
     }
 
+    @ApiOperation(value = "主键ID重新生成", notes = "主键ID重新生成")
+    //@RequiresPermissions("meterbasecar:view")
+    @PostMapping(value = "/reNewID")
+    public RESTfulResult newId() {
+        try {
+            HashMap<String, Object> map = new HashMap<>();
+            map.put("valueFlag", "0");
+            List<MeterBaseCar> carList = meterBaseCarMapper.selectByParameters(map);
+            int count = 0;
+            if(carList.size() >= 1) {
+                int i = 0;
+
+                for(MeterBaseCar car: carList) {
+                    i++;
+                    DecimalFormat decimalFormat = new DecimalFormat("00000");
+                    String numFormat= decimalFormat .format(i);
+                    car.setPkNo(new SimpleDateFormat("yyyyMMdd").format(new Date())+numFormat);
+
+                    int j = meterBaseCarMapper.reNewID(car);
+                    if(j >= 1) {
+                        count ++;
+                    }
+                }
+            }
+            RESTfulResult rm = success();
+            rm.setData(count);
+            return rm;
+        } catch (Exception ex) {
+            ex.printStackTrace();
+            throw new MarkerMetException(500, "操作异常！！");
+        }
+    }
 
 }

src/main/java/com/steerinfo/baseinfo/meterbasecar/mapper/MeterBaseCarMapper.java

@@ -26,4 +26,6 @@ public interface MeterBaseCarMapper extends IBaseMapper<MeterBaseCar, String> {
     int updateValidFlagById(Map<String, Object> parameters);
 
     List<MeterBaseCar> selectByParametersNoPage(Map<String, Object> parmas);
+
+    int reNewID(MeterBaseCar map);
 }

src/main/java/com/steerinfo/baseinfo/meterbasecar/mapper/MeterBaseCarMapper.xml

@@ -910,7 +910,7 @@
   <!-- 友情提示！！！-->
   <!-- 请将自己写的代码放在此标签之下，方便以后粘贴复制。-->
   <select id="GetNewID" parameterType="java.lang.String" resultType="java.lang.String">
-    SELECT LPAD(NVL(MAX(TO_NUMBER(SUBSTR(PK_NO, LENGTH(PK_NO) -3))),0) + 1,4,'0') PK_NO
+    SELECT LPAD(NVL(MAX(TO_NUMBER(SUBSTR(PK_NO, LENGTH(PK_NO) -4))),0) + 1,5,'0') PK_NO
     FROM METER_BASE_CAR
   </select>
 
@@ -958,4 +958,107 @@
       and car_type_no = '001004003'
     </if>
   </select>
+
+  <update id="reNewID" parameterType="com.steerinfo.baseinfo.meterbasecar.model.MeterBaseCar">
+    update METER_BASE_CAR
+    <set>
+      <if test="pkNo != null">
+        pk_no = #{pkNo,jdbcType=VARCHAR},
+      </if>
+      <if test="carNo != null">
+        CAR_NO = #{carNo,jdbcType=VARCHAR},
+      </if>
+      <if test="mnemonicCode != null">
+        MNEMONIC_CODE = #{mnemonicCode,jdbcType=VARCHAR},
+      </if>
+      <if test="customerSupplierNo != null">
+        CUSTOMER_SUPPLIER_NO = #{customerSupplierNo,jdbcType=VARCHAR},
+      </if>
+      <if test="customerSupplierName != null">
+        CUSTOMER_SUPPLIER_NAME = #{customerSupplierName,jdbcType=VARCHAR},
+      </if>
+      <if test="carTypeNo != null">
+        CAR_TYPE_NO = #{carTypeNo,jdbcType=VARCHAR},
+      </if>
+      <if test="carTypeName != null">
+        CAR_TYPE_NAME = #{carTypeName,jdbcType=VARCHAR},
+      </if>
+      <if test="carCarrierWeight != null">
+        CAR_CARRIER_WEIGHT = #{carCarrierWeight,jdbcType=DECIMAL},
+      </if>
+      <if test="carSelfWeight != null">
+        CAR_SELF_WEIGHT = #{carSelfWeight,jdbcType=DECIMAL},
+      </if>
+      <if test="memo != null">
+        MEMO = #{memo,jdbcType=VARCHAR},
+      </if>
+      <if test="validFlag != null">
+        VALID_FLAG = #{validFlag,jdbcType=VARCHAR},
+      </if>
+      <if test="createManNo != null">
+        CREATE_MAN_NO = #{createManNo,jdbcType=VARCHAR},
+      </if>
+      <if test="createManName != null">
+        CREATE_MAN_NAME = #{createManName,jdbcType=VARCHAR},
+      </if>
+      <if test="createTime != null">
+        CREATE_TIME = #{createTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="updateManNo != null">
+        UPDATE_MAN_NO = #{updateManNo,jdbcType=VARCHAR},
+      </if>
+      <if test="updateManName != null">
+        UPDATE_MAN_NAME = #{updateManName,jdbcType=VARCHAR},
+      </if>
+      <if test="updateTime != null">
+        UPDATE_TIME = #{updateTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="deleteManNo != null">
+        DELETE_MAN_NO = #{deleteManNo,jdbcType=VARCHAR},
+      </if>
+      <if test="deleteManName != null">
+        DELETE_MAN_NAME = #{deleteManName,jdbcType=VARCHAR},
+      </if>
+      <if test="deleteTime != null">
+        DELETE_TIME = #{deleteTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="ssoId != null">
+        SSO_ID = #{ssoId,jdbcType=VARCHAR},
+      </if>
+      <if test="vehicleType != null">
+        VEHICLE_TYPE = #{vehicleType,jdbcType=VARCHAR},
+      </if>
+      <if test="belongUnitTypeNo != null">
+        BELONG_UNIT_TYPE_NO = #{belongUnitTypeNo,jdbcType=VARCHAR},
+      </if>
+      <if test="belongUnitTypeName != null">
+        BELONG_UNIT_TYPE_NAME = #{belongUnitTypeName,jdbcType=VARCHAR},
+      </if>
+      <if test="usetDepartment != null">
+        USET_DEPARTMENT = #{usetDepartment,jdbcType=VARCHAR},
+      </if>
+      <if test="vehicleIdentifyNo != null">
+        VEHICLE_IDENTIFY_NO = #{vehicleIdentifyNo,jdbcType=VARCHAR},
+      </if>
+      <if test="fillingDepartment != null">
+        FILLING_DEPARTMENT = #{fillingDepartment,jdbcType=VARCHAR},
+      </if>
+      <if test="fillingUser != null">
+        FILLING_USER = #{fillingUser,jdbcType=VARCHAR},
+      </if>
+      <if test="isInsurance != null">
+        IS_INSURANCE = #{isInsurance,jdbcType=VARCHAR},
+      </if>
+      <if test="otherInsurance != null">
+        OTHER_INSURANCE = #{otherInsurance,jdbcType=VARCHAR},
+      </if>
+      <if test="isSpecialunit != null">
+        IS_SPECIALUNIT = #{isSpecialunit,jdbcType=VARCHAR},
+      </if>
+      <if test="usetDepartmentNo != null">
+        USET_DEPARTMENT_NO = #{usetDepartmentNo,jdbcType=VARCHAR},
+      </if>
+    </set>
+    where CAR_NO = #{carNo,jdbcType=VARCHAR}
+  </update>
 </mapper>

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

@@ -77,7 +77,7 @@ public class MeterBaseCarServiceImpl extends BaseServiceImpl<MeterBaseCar, Strin
 //            return "该车号已存在！";
 //        }
         String no=meterBaseCarMapper.GetNewID();
-        model.setId(new SimpleDateFormat("yyyyMMdd").format(new Date())+no);
+        model.setPkNo(new SimpleDateFormat("yyyyMMdd").format(new Date())+no);
         meterBaseCarMapper.insert(model);
         return "";
     }

src/main/java/com/steerinfo/baseinfo/meterbasedriver/service/impl/MeterBaseDriverServiceImpl.java

@@ -12,6 +12,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.interceptor.TransactionAspectSupport;
 
+import javax.annotation.Resource;
 import java.text.SimpleDateFormat;
 import java.util.Date;
 import java.math.BigDecimal;
@@ -33,7 +34,7 @@ import java.util.List;
 @Service(value = "meterBaseDriverService")
 public class MeterBaseDriverServiceImpl extends BaseServiceImpl<MeterBaseDriver, String> implements IMeterBaseDriverService {
 
-    @Autowired
+    @Resource
     private MeterBaseDriverMapper meterBaseDriverMapper;
 
     @Override
@@ -52,12 +53,12 @@ public class MeterBaseDriverServiceImpl extends BaseServiceImpl<MeterBaseDriver,
         String no=model.getCarId()+model.getTelNum();
         model.setDriverNo(no);
 
-        UserPayload payload = UserPayload.getCurrUser();
+        /*UserPayload payload = UserPayload.getCurrUser();
         String userId = payload.getId();
         String userName = payload.getUserName();
 
         model.setCreateManNo(userId);
-        model.setCreateManName(userName);
+        model.setCreateManName(userName);*/
         model.setCreateTime(new Date());
         model.setValidFlag("0");//服役
 

src/main/java/com/steerinfo/meterwork/meterworkrailwayactfirst/controller/MeterWorkRailwayActFirstController.java

@@ -1054,4 +1054,23 @@ throw new MarkerMetException(500, "操作异常！！");
         }
     }
 
+    @ApiOperation(value = "动态衡维护界面--毛皮匹配洁净保存", notes = "根据毛皮的List<MeterWorkRailwayActFirst>对象进行批量匹配洁净保存")
+    @PostMapping(value = "/selfServiceMeasurement")
+    public RESTfulResult selfServiceMeasurement(@RequestBody MeterWorkRailwayActFirst first) {
+        RESTfulResult rm = failed();
+        try {
+
+            if(first != null) {
+                rm = meterWorkRailwayActFirstService.selfServiceMeasurement(first);
+            }else {
+                rm.setMessage("至少需要穿一条一次数据进行匹配洁净保存，请确认！！！！");
+            }
+            return rm;
+        }catch (Exception e) {
+            e.printStackTrace();
+            rm.setMessage("操作异常，请确认！>>>>" + e.getMessage());
+            return rm;
+        }
+    }
+
 }

src/main/java/com/steerinfo/meterwork/meterworkrailwayactfirst/service/IMeterWorkRailwayActFirstService.java

@@ -109,5 +109,7 @@ public interface IMeterWorkRailwayActFirstService extends IBaseService<MeterWork
     RESTfulResult supplementaryData(MeterWorkRailwayActFirst model);
     RESTfulResult doAddRailWf(List<MeterWorkRailwayActFirst> models);
     RESTfulResult doAddRailNetWf(List<MeterWorkRailwayMotorialReceived> grossModels, List<MeterWorkRailwayActFirst> tareModels);
+
+    RESTfulResult selfServiceMeasurement(MeterWorkRailwayActFirst first);
 }
 

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

@@ -3928,6 +3928,11 @@ public class MeterWorkRailwayActFirstServiceImpl extends BaseServiceImpl<MeterWo
         return rm;
     }
 
+    @Override
+    public RESTfulResult selfServiceMeasurement(MeterWorkRailwayActFirst first) {
+        return null;
+    }
+
     public static void main(String[] args) {
         BigDecimal a = new BigDecimal(95120);
         BigDecimal b = a.divide(new BigDecimal(1000));