Merge branch 'master' of https://git.steerinfo.com/DAL-DAZHOU/DAL-DAZHOU-RMS-API

src/main/java/com/steerinfo/dil/controller/RmsCarDriverController.java

@@ -168,21 +168,6 @@ public class RmsCarDriverController extends BaseRESTfulController {
       return success(carrierName);
   }
 
-
-  /*
-  * 图片上传
-  *
-   */
-    @PostMapping("/upload")
-    public RESTfulResult upLoadPhoto(@RequestParam("file") MultipartFile file)  {
-        String str="行驶证";
-        int result=rmsCarDriverService.uploadPhoto(file,str);
-        if (result==-1){
-            return failed();
-        }
-        return success(result);
-    }
-
     //根据司机id查询承运商
     @PostMapping(value = "/getCarrierNameByDriverId/{id}")
     public RESTfulResult getCarrierNameByDriverId(@PathVariable("id") BigDecimal id){

src/main/java/com/steerinfo/dil/service/IRmsCarDriverService.java

@@ -31,7 +31,6 @@ public interface IRmsCarDriverService  {
 
     List<Map<String, Object>> getCarrierName(String state);
 
-    int uploadPhoto(MultipartFile file, String str);
 
     Map<String, Object> getCarrierNameByDriverId(BigDecimal id);
 }

src/main/java/com/steerinfo/dil/service/impl/RmsCarDriverServiceImpl.java

@@ -119,50 +119,6 @@ public class RmsCarDriverServiceImpl implements IRmsCarDriverService {
         state = "%"+state+"%";
         return rmsCarDriverMapper.getCarrierName(state);
     }
-    //
-    @Override
-    public int uploadPhoto(MultipartFile file, String str) {
-        int result = 0;
-//        根据str判断当前照片类型f
-        String name = file.getName();
-        Long workId = 0L;
-        Long datacenterId = 0L;
-        byte[] fileNames=null;
-//        id自动生成器
-        IdGenerator idGenerator = new IdGenerator(workId, datacenterId);
-//        图片存储的地址
-        String uploadPath = "C:/workspaces/stworkspace/image/";
-//        图片名称默认为空
-        String imagePath = str;
-//        创建一个map用来存储四张照片的地址
-        Map<String, Object> map=new HashMap<>();
-        String FileNames = UploadUtils.uploadFile(file, idGenerator, uploadPath, imagePath);
-        System.out.println(FileNames);
-        //         判断照片是否能上传成功
-        if (FileNames!=null){
-            fileNames = UploadUtils.imageToByte(FileNames);
-            map.put(str,fileNames);
-//             将照片的二进制插入到数据库
-            RmsCarDriver rmsCarDriver=new RmsCarDriver();
-            rmsCarDriver.setDriverId(rmsCarDriverMapper.getMaxDriveId());
-            if (map.get("行驶证")!=null){
-                rmsCarDriver.setDriverPermitPhoto((String) map.get("行驶证"));
-            }
-            if (map.get("驾驶证")!=null){
-                rmsCarDriver.setDriverLisencePhoto((String)map.get("驾驶证"));
-            }
-            if (map.get("运输证")!=null){
-                rmsCarDriver.setDriverLisencePhoto((String)map.get("运输证"));
-            }
-            if(map.get("从业资格证")!=null){
-                rmsCarDriver.setDriverLisencePhoto((String)map.get("从业资格证"));
-            }
-            result+=rmsCarDriverMapper.insertSelective(rmsCarDriver);
-        }else{
-            result=-1;
-        }
-        return result;
-    }
 
     //根据司机id查询承运商
     @Override

src/main/resources/com/steerinfo/dil/mapper/RmsCarDriverMapper.xml

@@ -951,11 +951,7 @@
     RCD.DRIVER_IDENTITY_CARD AS "driverIdentityCard",
     RCD.DRIVER_PHONE AS "driverPhone",
     RTT.TYPE_NAME AS "typeName",
-    RC.CARRIER_NAME AS "carrierName",
-    RCD.DRIVING_PERMIT_NO AS "driverPermitNo",
-    RCD.DRIVING_LICENCE AS "driverLicence1",
-    RCD.DRIVING_LICENCE AS "driverLicence2",
-    RCD.DRIVING_LICENCE AS "driverLicence3"
+    RC.CARRIER_NAME AS "carrierName"
     FROM RMS_CAR_DRIVER RCD
     LEFT JOIN RMS_CARRIER RC
     ON RCD.CARRIER_ID=RC.CARRIER_ID
@@ -1015,29 +1011,6 @@
           "carrierName" in #{item}
         </foreach>
       </if>
-      <if test="driverPermitNo!= null">
-        and
-        <foreach collection="driverPermitNo" item="item" open="(" separator="," close=")">
-          "driverPermitNo" in #{item}
-        </foreach>
-      </if>
-      <if test="driverLicence1!= null">
-        and
-        <foreach collection="driverLicence1" item="item" open="(" separator="," close=")">
-          "driverLicence1" in #{item}
-        </foreach>
-      </if>
-      <if test="driverLicence2!= null">
-        and
-        <foreach collection="driverLicence2" item="item" open="(" separator="," close=")">
-          "driverLicence2" in #{item}
-        </foreach>
-      </if> <if test="driverLicence3!= null">
-      and
-      <foreach collection="driverLicence3" item="item" open="(" separator="," close=")">
-        "driverLicence3" in #{item}
-      </foreach>
-    </if>
     </where>
     <include refid="orderBy"></include>
   </select>
@@ -1095,7 +1068,7 @@
   </select>
 
   <select id="getMaxDriveId" resultType="DECIMAL">
-    select max(RCD.DRIVER_ID+1) from RMS_CAR_DRIVER RCD
+    select max(RCD.DRIVER_ID) from RMS_CAR_DRIVER RCD
   </select>
 
   <select id="getCarrierNameByDriverId" resultType="java.util.Map" parameterType="java.math.BigDecimal">