接口问题处理;

Liu Haoyu
1 parent fddd4673
Showing 35 changed files with 91 additions and 277 deletions
.gitignore
pom.xml
src/main/java/com/objecteye/VehicleApplication.java
src/main/java/com/objecteye/config/AuthenticationHeadFilter.java
src/main/java/com/objecteye/controller/DeployController.java
src/main/java/com/objecteye/controller/FeatureController.java
src/main/java/com/objecteye/controller/PersonnelController.java
src/main/java/com/objecteye/controller/UploadFileController.java
src/main/java/com/objecteye/controller/VehicleController.java
src/main/java/com/objecteye/controller/VehicleDbController.java
src/main/java/com/objecteye/controller/VehicleViolationsController.java
src/main/java/com/objecteye/dao/MongoTemplates.java.old
src/main/java/com/objecteye/entity/SyDeploy.java
src/main/java/com/objecteye/entity/SyVehicleForbidenTask.java
src/main/java/com/objecteye/pojo/RabbitMqVehicleViolation.java
src/main/java/com/objecteye/service/DeployService.java
src/main/java/com/objecteye/service/FeatureService.java
src/main/java/com/objecteye/service/IVehicleViolationsService.java
src/main/java/com/objecteye/service/PersonnelService.java
src/main/java/com/objecteye/service/VehicleDbService.java
 /vehicle-simple.iml
 /.idea/
 /target/
+/picture/
@@ -117,7 +117,11 @@
         <dependency>
             <groupId>com.alibaba</groupId>
             <artifactId>fastjson</artifactId>
-            <version>1.2.54</version>
+            <version>1.2.57</version>
+        </dependency>
+        <dependency>
+            <groupId>commons-codec</groupId>
+            <artifactId>commons-codec</artifactId>
         </dependency>
         <dependency>
             <groupId>org.apache.httpcomponents</groupId>
@@ -10,10 +10,8 @@ import org.springframework.scheduling.annotation.EnableScheduling;
 import org.springframework.scheduling.concurrent.ThreadPoolTaskScheduler;
 import org.springframework.security.config.annotation.method.configuration.EnableGlobalMethodSecurity;
 import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity;
-import org.springframework.transaction.annotation.EnableTransactionManagement;
 @SpringBootApplication
-@EnableTransactionManagement
 @EnableScheduling
 @EnableWebSecurity
 @EnableGlobalMethodSecurity(prePostEnabled = true)
@@ -40,6 +40,7 @@ public class AuthenticationHeadFilter extends OncePerRequestFilter {
             String claims = jwt.getClaims();
             user = JSON.parseObject(claims, TokenUser.class);
         } catch (Exception e) {
+            e.printStackTrace();
             httpServletResponse.setContentType("application/json;charset=UTF-8");
             httpServletResponse.getWriter().write("Useless token...");
             return;
@@ -155,7 +155,7 @@ public class DeployController {
     @RequestMapping(value = "/delete", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"})
     public CommonResult delete(@RequestBody Map<String, Object> map) {
         try {
-            String[] ids = (String[]) map.get("ids");
+            List<String> ids = (List<String>) map.get("ids");
             deployService.delete(ids);
             return CommonResult.success("操作成功");
         } catch (Exception e) {
@@ -99,7 +99,7 @@ public class FeatureController {
     @RequestMapping(value = "/delete", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"})
     public CommonResult delete(@RequestBody Map<String, Object> map) {
         try {
-            String[] ids = (String[]) map.get("ids");
+            List<String> ids = (List<String>) map.get("ids");
             featureService.delete(ids);
             return CommonResult.success("操作成功");
         } catch (RuntimeException e) {
@@ -11,6 +11,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
+import java.util.List;
 import java.util.Map;
@@ -98,7 +99,7 @@ public class PersonnelController {
     @RequestMapping(value = "/delete", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"})
     public CommonResult delete(@RequestBody Map<String, Object> map) {
         try {
-            String[] ids = (String[]) map.get("ids");
+            List<String> ids = (List<String>) map.get("ids");
             personnelService.delete(ids);
             return CommonResult.success("操作成功");
         } catch (Exception e) {
 package com.objecteye.controller;
 import com.objecteye.common.CommonResult;
+import com.objecteye.service.IUploadFileService;
 import com.objecteye.utils.GlobalUtil;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
+import java.io.IOException;
+
 @RestController
 @RequestMapping("uploadDbMongo")
 @Api(value = "UploadFileController", description = "上传文件解析保存到mongo库,代替ftp")
 @CrossOrigin
-public class UploadFileController {
+public class UploadFileController extends BasicController {
+
+    @Autowired
+    private IUploadFileService iUploadFileService;
     @ApiOperation("上传文件到mongo")
     @RequestMapping(value = "uploadToMongo", method = RequestMethod.POST, produces = GlobalUtil.COMMON_HEADER_CONTENT_TYPE)
-    public CommonResult uploadToMongo(@RequestParam MultipartFile multipartFile) {
-        return CommonResult.success("");
+    public CommonResult uploadToMongo(@RequestParam MultipartFile multipartFile) throws IOException {
+        return jsonObjectResultHandle(iUploadFileService.uploadFile2Mongo(multipartFile));
     }
 }
@@ -57,10 +57,9 @@ public class VehicleController {
      */
     @ApiOperation("批量删除")
     @RequestMapping(value = "/delete", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"})
-    public CommonResult delete(@RequestBody Map<String, String[]> map) {
+    public CommonResult delete(@RequestBody Map<String, Object> map) {
         try {
-            String[] ids = map.get("ids");
-            //int vehicleId= (int) map.get("vehicleId");
+            List<String> ids = (List<String>) map.get("ids");
             vehicleService.delete(ids);
             return CommonResult.success("操作成功");
         } catch (Exception e) {
@@ -99,7 +99,7 @@ public class VehicleDbController {
     @RequestMapping(value = "/delete", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"})
     public CommonResult delete(@RequestBody Map<String, Object> map) {
         try {
-            String[] ids = (String[]) map.get("ids");
+            List<String> ids = (List<String>) map.get("ids");
             vehicleDbService.delete(ids);
             return CommonResult.success("");
         } catch (Exception e) {
@@ -10,6 +10,7 @@ import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
+import java.util.List;
 import java.util.Map;
 @CrossOrigin
@@ -85,8 +86,8 @@ public class VehicleViolationsController {
      */
     @ApiOperation("禁行任务维护- 删除接口")
     @RequestMapping(value = "forbiddenTaskDelete", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"})
-    public CommonResult forbiddenTaskDelete(@RequestBody Map<String, String[]> queryParams) {
-        String[] ids = queryParams.get("ids");
+    public CommonResult forbiddenTaskDelete(@RequestBody Map<String, Object> queryParams) {
+        List<String> ids = (List<String>) queryParams.get("ids");
         int resultStatus = vehicleViolationsService.forbiddenTaskDelete(ids);
         return resultStatus > 0 ? CommonResult.success("success") : CommonResult.success(201, "操作失败", 0);
     }
-package com.objecteye.dao;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.data.mongodb.core.MongoTemplate;
-import org.springframework.data.mongodb.core.geo.GeoJson;
-import org.springframework.data.mongodb.core.query.Criteria;
-import org.springframework.stereotype.Component;
-
-import java.util.List;
-
-@Component
-public class MongoTemplates {
-    @Autowired
-    private MongoTemplate mongoTemplate;
-
-    public void save(Polygon polygon){
-        mongoTemplate.save(polygon);
-    }
-
-    public void saveRegions(List<GisRegion> gisRegionList){
-        mongoTemplate.insert(gisRegionList,GisRegion.class);
-    }
-
-    public <T> T findById(Class<T> entityClass, String id) {
-        return mongoTemplate.findById(id, entityClass);
-    }
-
-    public <T> List<T> findAll(Class<T> entityClass) {
-        return mongoTemplate.findAll(entityClass);
-    }
-
-    public <T> void remove(T entity) {
-        mongoTemplate.remove(entity);
-    }
-
-    public <T> void add(T entity) {
-        mongoTemplate.insert(entity);
-    }
-
-    public <T> void addAll(List<T> entity) {
-        mongoTemplate.insertAll(entity);
-    }
-
-    public <T> void saveOrUpdate(T entity) {
-        mongoTemplate.save(entity);
-    }
-
-    public <T> T findOne(Class<T> entityClass) {
-        return mongoTemplate.findOne(new Query(), entityClass);
-    }
-
-    public List<Polygon> findIntersective(GeoJson geoJson){
-        Query query=new Query(Criteria.where("geometry").intersects(geoJson));
-        List<Polygon> list=mongoTemplate.find(query,Polygon.class);
-        return list;
-    }
-
-    public boolean isExistIntersective(GeoJson geoJson){
-        Query query=new Query(Criteria.where("geometry").intersects(geoJson).and("_id").is(100000));
-        boolean res=mongoTemplate.exists(query,GisRegion.class);
-        return res;
-    }
-
-     /*public <T> T findBy(Class<T> entityClass, String id) {
-
-            Criteria cri = new Criteria();
-            // 设置条件（注意：设置查询的值类型必须和mongodb中类型一致）
-            cri.and("status").is("0"); // 类型为String，类似sql中 status = '0'
-            cri.and("boolRelation").is(0D); // 类型为Double，类似sql中 boolRelation = 0
-            cri.and("enforType").regex("01.*"); // 正则表达匹配，类似右模糊查询，sql中 like '01%'
-
-    //        lt gt lte gte
-
-            return null;
-        }*/
-
-        //mongodb查询根据指定条件对象
-       /* public <T> T findQuery(Class<T> entityClass, BasicDBObject basicDBObject) {
-    //       分、 排序、按时间查询
-
-            Query query = new Query();
-            //必须条件
-    //        Criteria c = Criteria.where("VINID").is(Map.get(vin));
-            Criteria c = new Criteria();
-            //范围条件
-            if (!StringUtils.isEmpty(start) && StringUtils.isEmpty(end)) {
-                c.and("TIME1").gte(GetTime1(start));
-            } else if (StringUtils.isEmpty(start) && !StringUtils.isEmpty(end)) {
-                c.and("TIME1").lte(GetTime1(end));
-            } else if (!StringUtils.isEmpty(start) && !StringUtils.isEmpty(end)) {
-                //对同一个属性加两次限制需这样操作
-                c.andOperator(
-                        c.where("TIME1").gte(GetTime1(start)),
-                        c.where("TIME1").lte(GetTime1(end))
-                );
-            }
-            query.addCriteria(c);
-            //总数
-            int num = (int) mongoTemplate.count(query, CarDataEx.class, "jmevTest");
-            System.out.println("总数:" + num);
-            //分页
-            query.skip((page - 1) * rows).limit(rows);
-            //排序
-            query.with(new Sort(Sort.Direction.DESC, "TIME1","TIME2"));
-            //query.with(new Sort(properties));
-            List<T> jmevTest = (List<T>) mongoTemplate.find(query, CarDataEx.class, "jmevTest");
-        }*/
-
-}
@@ -32,9 +32,6 @@ public class SyDeploy implements Serializable {
     private String description;
-    @ApiModelProperty(value = "布控设备id以逗号分隔")
-    private String deployEquip;
-
     @ApiModelProperty(value = "布控库")
     private String deployLib;
@@ -54,10 +51,6 @@ public class SyDeploy implements Serializable {
     @ApiModelProperty(value = "人像/车辆id")
     private String singleId;
-    /**
-     * 设备名称
-     */
-    private String areaName;
     private static final long serialVersionUID = 1L;
 }
 \ No newline at end of file
@@ -19,7 +19,7 @@ public class SyVehicleForbidenTask implements Serializable {
     private static final long serialVersionUID = -8007441463935902798L;
     @ApiModelProperty(value = "任务id, 自增主键")
-    private Integer id;
+    private String id;
     @ApiModelProperty(value = "任务名称")
     private String name;
@@ -48,9 +48,5 @@ public class RabbitMqVehicleViolation implements Serializable {
     /**
      * 是否违规
      */
-    private Integer taskId;
-    /**
-     * 设备名称
-     */
-    private String equipmentName;
+    private String taskId;
 }
@@ -96,7 +96,7 @@ public interface DeployService {
      *
      * @param ids
      */
-    void delete(String[] ids);
+    void delete(List<String> ids);
     /**
      * 布控任务查询列表- 分页
@@ -59,7 +59,7 @@ public interface FeatureService {
      *
      * @param ids
      */
-    void delete(String[] ids);
+    void delete(List<String> ids);
     /**
      * 分页
@@ -5,6 +5,8 @@ import com.objecteye.entity.SyVehicleForbidenTask;
 import com.objecteye.entity.VehicleViolationsForbidenTaskQueryParams;
 import com.objecteye.pojo.RabbitMQVehicle;
+import java.util.List;
+
 /**
  * 车辆违规模块
  *
@@ -52,7 +54,7 @@ public interface IVehicleViolationsService {
      * @param ids 请求参数
      * @return 结果集
      */
-    int forbiddenTaskDelete(String[] ids);
+    int forbiddenTaskDelete(List<String> ids);
     /**
      * 布控任务监控
@@ -66,7 +66,7 @@ public interface PersonnelService {
      * @param ids
      */
-    void delete(String[] ids);
+    void delete(List<String> ids);
     /**
@@ -57,7 +57,7 @@ public interface VehicleDbService {
      *
      * @param ids
      */
-    void delete(String[] ids);
+    void delete(List<String> ids);
     /**
      * 分页
@@ -20,7 +20,7 @@ public interface VehicleService {
      */
     PageResult findPage(int vehicleId, String picName, int pageNum, int pageSize);
-    void delete(String[] ids);
+    void delete(List<String> ids);
     void update(UploadVehicleDbResult uploadVehicleDbResult);
@@ -19,10 +19,10 @@ import org.springframework.data.mongodb.core.aggregation.Aggregation;
 import org.springframework.data.mongodb.core.aggregation.AggregationResults;
 import org.springframework.data.mongodb.core.query.Criteria;
 import org.springframework.data.mongodb.core.query.Query;
+import org.springframework.data.mongodb.core.query.Update;
 import org.springframework.data.redis.core.RedisTemplate;
 import org.springframework.scheduling.annotation.Scheduled;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
+import org.springframework.stereotype.Component;
 import java.math.BigDecimal;
 import java.math.RoundingMode;
@@ -35,7 +35,7 @@ import java.util.stream.Collectors;
  *
  * @author Administrator
  */
-@Service
+@Component
 @Slf4j
 public class DeployServiceImpl implements DeployService {
     @Autowired
@@ -60,6 +60,9 @@ public class DeployServiceImpl implements DeployService {
     @Override
     public Integer cancelOrReNewDeployTask(int deployId) {
         SyDeploy syDeploy = mongoTemplate.findOne(Query.query(Criteria.where("id").is(deployId)), SyDeploy.class);
+        if (syDeploy == null) {
+            throw new RuntimeException("未找到对应布控任务");
+        }
         Integer status = syDeploy.getStatus();
         if (status == 0) {
             syDeploy.setStatus(1);
@@ -196,7 +199,6 @@ public class DeployServiceImpl implements DeployService {
      *
      * @param syDeploy
      */
-    @Transactional(rollbackFor = Exception.class)
     @Override
     public void add(SyDeploy syDeploy) {
         // 处理前端传递的时间戳
@@ -220,7 +222,6 @@ public class DeployServiceImpl implements DeployService {
         syDeploy.setDeployLib(featureIds);
-        syDeploy.setSingleId(syDeploy.getDeployEquip());
         mongoTemplate.insert(syDeploy);
         String deployId = syDeploy.getId();
         // 布控库中每一条数据都放到redis中
@@ -275,7 +276,6 @@ public class DeployServiceImpl implements DeployService {
     }
     @Override
-    @Transactional(rollbackFor = Exception.class)
     public void update(SyDeploy deploy) {
         // 处理前端传递的时间戳
         makeTimeLongToTimeStr(deploy);
@@ -304,7 +304,7 @@ public class DeployServiceImpl implements DeployService {
         redisTemplate.opsForHash().put(GlobalUtil.DEPLOY_TYPE, deployId, deployType);
         redisTemplate.opsForHash().put(GlobalUtil.DEPLOYIDANDENDTIME, deployId, endTime);
-        mongoTemplate.save(deploy, "syDeploy");
+        mongoTemplate.save(deploy);
     }
     /**
@@ -350,12 +350,10 @@ public class DeployServiceImpl implements DeployService {
      * @param ids
      */
     @Override
-    public void delete(String[] ids) {
+    public void delete(List<String> ids) {
         for (String id : ids) {
-            SyDeploy syDeploy = mongoTemplate.findOne(Query.query(Criteria.where("id").is(id)), SyDeploy.class);
-            syDeploy.setIsDelete(1);
             deleteRedisWhenUpdateDeploy(id);
-            mongoTemplate.save(syDeploy);
+            mongoTemplate.updateMulti(Query.query(Criteria.where("id").is(id)), Update.update("isDelete", 1), SyDeploy.class);
             redisTemplate.opsForHash().delete(GlobalUtil.DEPLOY_LIB, id);
             redisTemplate.opsForHash().delete(GlobalUtil.DEPLOY_TYPE, id);
             redisTemplate.opsForHash().delete(GlobalUtil.DEPLOYIDANDENDTIME, id);
@@ -534,12 +532,7 @@ public class DeployServiceImpl implements DeployService {
                     mongoTemplate.save(syDeploy);
                 }
             } else if (currentTimeStamp > deployEndTimeStamp) {
-                SyDeploy syDeploy = mongoTemplate.findOne(Query.query(Criteria.where("id").is(integer)), SyDeploy.class);
-                if (syDeploy == null) {
-                    return;
-                }
-                syDeploy.setStatus(1);
-                mongoTemplate.save(syDeploy);
+                mongoTemplate.updateMulti(Query.query(Criteria.where("id").is(integer)), Update.update("status", 1), SyDeploy.class);
                 redisTemplate.opsForHash().delete(GlobalUtil.DEPLOYID_STATRTIME, integer);
             }
         }
@@ -738,7 +731,7 @@ public class DeployServiceImpl implements DeployService {
      */
     private void plateAlarmMsgProducer(PlateAlarmMsg plateAlarmMsg) {
         if (plateAlarmMsg != null) {
-            PlateAlarmMsg save = mongoTemplate.save(plateAlarmMsg);
+            PlateAlarmMsg save = mongoTemplate.insert(plateAlarmMsg);
             String s = JSON.toJSONString(save);
             redisTemplate.opsForList().leftPush("ALARM", s);
         }
@@ -11,13 +11,11 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.mongodb.core.MongoTemplate;
 import org.springframework.data.mongodb.core.query.Criteria;
 import org.springframework.data.mongodb.core.query.Query;
+import org.springframework.data.mongodb.core.query.Update;
 import org.springframework.data.redis.core.RedisTemplate;
 import org.springframework.stereotype.Service;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 /**
  * 服务实现层
@@ -108,16 +106,13 @@ public class FeatureServiceImpl implements FeatureService {
      * @param ids
      */
     @Override
-    public void delete(String[] ids) {
+    public void delete(List<String> ids) {
         for (String id : ids) {
             List<String> deployList = deployService.getDeployListByLibAndDeployType(id, 2);
-            SyFeature syFeature = mongoTemplate.findOne(Query.query(Criteria.where("id").is(id)), SyFeature.class);
-            syFeature.setIsDelete(1);
             List<SyPersonnel> syPersonnels = mongoTemplate.find(Query.query(Criteria.where("fid").is(id)), SyPersonnel.class);
+            mongoTemplate.updateMulti(Query.query(Criteria.where("fid").is(id)), Update.update("status", 1), SyPersonnel.class);
             if (syPersonnels.size() > 0) {
                 for (SyPersonnel syPersonnel : syPersonnels) {
-                    syPersonnel.setStatus(1);
-                    mongoTemplate.save(syPersonnel);
                     redisTemplate.opsForHash().delete("personUrl", syPersonnel.getId());
                 }
             }
@@ -126,11 +121,11 @@ public class FeatureServiceImpl implements FeatureService {
                     String key = deployId + "|" + id;
                     redisTemplate.opsForHash().delete(key);
                     String[] deploy = {deployId};
-                    deployService.delete(deploy);
+                    deployService.delete(Arrays.asList(deploy));
                 }
             }
-            mongoTemplate.save(syFeature);
         }
+        mongoTemplate.updateMulti(Query.query(Criteria.where("id").in(ids)), Update.update("isDelete", 1), SyFeature.class);
     }
@@ -71,7 +71,8 @@ public class LocusOrbitServiceImpl implements ILocusOrbitService {
     @Override
     public List<LocusOrbitResultParams> locusOrbitByPlateNumber(int gcxh, LocusOrbitQueryParams locusOrbitQueryParams, MultipartFile multipartFile) {
         String fileName = multipartFile.getOriginalFilename();
-        String picPath = GlobalUtil.dbPath1() + File.separator + "picture" + File.separator + fileName;
+        String picPath = GlobalUtil.dbPath1() + File.separator + "export" + File.separator + "vehicleProject"
+                + File.separator + "picture" + File.separator + fileName;
         File newFile = new File(picPath);
         try {
             multipartFile.transferTo(newFile);
@@ -17,9 +17,9 @@ import org.springframework.beans.factory.annotation.Value;
 import org.springframework.data.mongodb.core.MongoTemplate;
 import org.springframework.data.mongodb.core.query.Criteria;
 import org.springframework.data.mongodb.core.query.Query;
+import org.springframework.data.mongodb.core.query.Update;
 import org.springframework.data.redis.core.RedisTemplate;
 import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.multipart.MultipartFile;
 import java.io.File;
@@ -129,17 +129,16 @@ public class PersonnelServiceImpl implements PersonnelService {
      */
     @Override
-    @Transactional(rollbackFor = Exception.class)
-    public void delete(String[] ids) {
+    public void delete(List<String> ids) {
         for (String id : ids) {
             SyPersonnel syPersonnel = mongoTemplate.findOne(Query.query(Criteria.where("id").is(id)), SyPersonnel.class);
-            syPersonnel.setStatus(1);
-            mongoTemplate.save(syPersonnel);
+            if (syPersonnel == null) {
+                continue;
+            }
+            mongoTemplate.updateMulti(Query.query(Criteria.where("id").is(id)), Update.update("status", 1), SyPersonnel.class);
             String fid = syPersonnel.getFid();
-            long personCountByFid = findPersonCountByFid(fid);
-            SyFeature syFeature = mongoTemplate.findOne(Query.query(Criteria.where("id").is(fid)), SyFeature.class);
-            syFeature.setCount((int) personCountByFid);
-            mongoTemplate.save(syFeature);
+            int personCountByFid = (int) findPersonCountByFid(fid);
+            mongoTemplate.updateMulti(Query.query(Criteria.where("id").is(fid)), Update.update("count", personCountByFid), SyFeature.class);
             List<String> deployListByLibAndDeployType = deployService.getDeployListByLibAndDeployType(fid, 2);
             if (deployListByLibAndDeployType != null && deployListByLibAndDeployType.size() > 0) {
                 for (String s : deployListByLibAndDeployType) {
@@ -207,7 +206,6 @@ public class PersonnelServiceImpl implements PersonnelService {
      * @return
      */
     @Override
-    @Transactional(rollbackFor = Exception.class)
     public String uploadFiles(MultipartFile[] uploadFiles, String featureId) {
         int count = 0;
         SyFeature one = featureService.findOne(featureId);
@@ -42,7 +42,8 @@ public class UploadFileServiceImpl implements IUploadFileService {
     public JSONObject uploadFile2Mongo(MultipartFile multipartFile) throws IOException {
         // 格式化文件名由format开头, e.g. format-15321354564-12.12654_15.156567.jpg
         String fileName = multipartFile.getOriginalFilename();
-        String picPath = GlobalUtil.dbPath1() + File.separator + "picture" + File.separator + fileName;
+        String picPath = GlobalUtil.dbPath1() + File.separator + "export" + File.separator + "vehicleProject"
+                + File.separator + "picture" + File.separator + fileName;
         File newFile = new File(picPath);
         multipartFile.transferTo(newFile);
@@ -75,8 +76,6 @@ public class UploadFileServiceImpl implements IUploadFileService {
             String s = JSON.toJSONString(uploadVehicleResult);
             rabbitTemplate.convertAndSend(RabbitmqConfig.EXCHANGE_TOPICS_INFORM, "inform.store", s);
         }
-
-
-        return null;
+        return new JSONObject();
     }
 }
@@ -10,13 +10,11 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.mongodb.core.MongoTemplate;
 import org.springframework.data.mongodb.core.query.Criteria;
 import org.springframework.data.mongodb.core.query.Query;
+import org.springframework.data.mongodb.core.query.Update;
 import org.springframework.data.redis.core.RedisTemplate;
 import org.springframework.stereotype.Service;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 /**
  * 服务实现层
@@ -95,7 +93,7 @@ public class VehicleDbServiceImpl implements VehicleDbService {
      * @param ids
      */
     @Override
-    public void delete(String[] ids) {
+    public void delete(List<String> ids) {
         for (String id : ids) {
             List<String> deployList = deployService.getDeployListByLibAndDeployType(id, 2);
             UploadVehicleDbResult uploadVehicleDbResult = mongoTemplate.findOne(Query.query(new Criteria("id").is(id)), UploadVehicleDbResult.class);
@@ -114,13 +112,11 @@ public class VehicleDbServiceImpl implements VehicleDbService {
                     for (int i = 0; i < size; i++) {
                         String deployId = deployList.get(i);
                         String[] deploy = {deployId};
-                        deployService.delete(deploy);
+                        deployService.delete(Arrays.asList(deploy));
                     }
                 }
             }
-            SyVehicleDb syVehicleDb = mongoTemplate.findOne(Query.query(Criteria.where("id").is(id)), SyVehicleDb.class);
-            syVehicleDb.setIsDelete(1);
-            mongoTemplate.save(syVehicleDb);
+            mongoTemplate.updateMulti(Query.query(Criteria.where("id").is(id)), Update.update("isDelete", 1), SyVehicleDb.class);
         }
     }
@@ -324,7 +324,8 @@ public class VehicleFileServiceImpl implements IVehicleFileService {
     @Override
     public VvehicleFilePicQueryResult picQuery(int gcxh, MultipartFile multipartFile) {
         String fileName = multipartFile.getOriginalFilename();
-        String picPath = GlobalUtil.dbPath1() + File.separator + "picture" + File.separator + fileName;
+        String picPath = GlobalUtil.dbPath1() + File.separator + "export" + File.separator + "vehicleProject"
+                + File.separator + "picture" + File.separator + fileName;
         File newFile = new File(picPath);
         try {
             multipartFile.transferTo(newFile);
@@ -79,11 +79,10 @@ public class VehicleServiceImpl implements VehicleService {
     }
     @Override
-    public void delete(String[] ids) {
-        int length = ids.length;
+    public void delete(List<String> ids) {
+        int length = ids.size();
         String vehicleId = null;
-        for (int i = 0; i < length; i++) {
-            String id = ids[i];
+        for (String id : ids) {
             UploadVehicleDbResult uploadVehicleDbResult = mongoTemplate.findOne(Query.query(new Criteria("id").is(id)), UploadVehicleDbResult.class);
             vehicleId = uploadVehicleDbResult.getVehicleId();
             String plateNum = uploadVehicleDbResult.getPlateNum();
@@ -95,7 +95,7 @@ public class VehicleViolationsServiceImpl implements IVehicleViolationsService {
                 continue;
             }
             SyVehicleForbiddenTaskOutput output = new SyVehicleForbiddenTaskOutput();
-            output.setId(String.valueOf(forbiddenTask.getId()));
+            output.setId(forbiddenTask.getId());
             output.setName(forbiddenTask.getName());
             output.setDescription(forbiddenTask.getDescription());
             output.setStatus(null != forbiddenTask.getStatus() && 1 == forbiddenTask.getStatus() ? "工作中" : "已撤销");
@@ -164,7 +164,7 @@ public class VehicleViolationsServiceImpl implements IVehicleViolationsService {
      * @return 结果集
      */
     @Override
-    public int forbiddenTaskDelete(String[] ids) {
+    public int forbiddenTaskDelete(List<String> ids) {
         int effectNum = 0;
         for (String id : ids) {
             if (null == id || "".equals(id)) {
-package com.objecteye.utils;
-
-import org.apache.commons.net.ftp.FTP;
-import org.apache.commons.net.ftp.FTPClient;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.stereotype.Component;
-
-import java.io.IOException;
-import java.net.SocketException;
-import java.nio.charset.Charset;
-
-@Component
-public class FtpUtil {
-
-    private static final Logger log = LoggerFactory.getLogger(FtpUtil.class);
-
-    @Value("${ftp.username}")
-    private String userName;
-
-    @Value("${ftp.password}")
-    private String passWord;
-
-    @Value("${ftp.host}")
-    private String ip;
-
-    @Value("${ftp.port}")
-    private int port;
-
-    private FTPClient ftpClient = new FTPClient();
-
-
-    public FTPClient connect() {
-        try {
-            if (!ftpClient.isConnected()) {
-
-                ftpClient.connect(ip, port);
-                ftpClient.login(userName, passWord);
-                ftpClient.setCharset(Charset.forName("UTF-8"));
-                ftpClient.setControlEncoding("UTF-8");
-                ftpClient.setFileType(FTP.BINARY_FILE_TYPE);
-            }
-            return ftpClient;
-        } catch (SocketException e) {
-            e.printStackTrace();
-        } catch (IOException e) {
-            e.printStackTrace();
-        }
-        return null;
-    }
-}
@@ -438,9 +438,8 @@ public class GlobalUtil {
         if (imgStr == null) {
             return false;
         }
-        BASE64Decoder decoder = new BASE64Decoder();
         try {
-            byte[] bytes = decoder.decodeBuffer(imgStr);
+            byte[] bytes = org.apache.commons.codec.binary.Base64.decodeBase64(imgStr);
             for (int i = 0; i < bytes.length; ++i) {
                 if (bytes[i] < 0) {
                     bytes[i] += 256;
 package com.objecteye.utils;
+import org.apache.commons.codec.binary.Base64;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.http.ResponseEntity;
@@ -7,7 +8,6 @@ import org.springframework.stereotype.Component;
 import org.springframework.web.client.RestTemplate;
 import org.springframework.web.multipart.MultipartFile;
 import sun.misc.BASE64Decoder;
-import sun.misc.BASE64Encoder;
 import javax.imageio.ImageIO;
 import java.awt.image.BufferedImage;
@@ -85,12 +85,10 @@ public class HttpClientUtils {
 	}
 	public String MultipartFileToBase64(MultipartFile file) throws Exception {
-		BASE64Encoder base64Encoder = new BASE64Encoder();
-		String base64EncoderImg = file.getOriginalFilename() + "," + base64Encoder.encode(file.getBytes());
+		String base64EncoderImg = file.getOriginalFilename() + "," + Base64.encodeBase64String(file.getBytes());
 		String[] split = base64EncoderImg.split(",");
 		String split1 = split[1];
-		String base64Value = split1.replaceAll("\r\n|\r|\n", "");
-		return base64Value;
+		return split1.replaceAll("\r\n|\r|\n", "");
 	}
 	//将multipart文件转成车型对象
@@ -112,7 +112,7 @@ public class RabbitMQVehicleTools {
                     GlobalUtil.generateImage(mattingData, path);
                     PersonMsg personMsg = new PersonMsg(null, snapshoturl, captureTime, null, null, null, url, retrieveKey, fea);
-                    PersonMsg save = mongoTemplate.save(personMsg);
+                    PersonMsg save = mongoTemplate.insert(personMsg);
                     String s = JSON.toJSONString(save);
                     rabbitTemplate.convertAndSend(RabbitmqConfig.EXCHANGE_TOPICS_INFORM, "inform.person", s);
                 }
@@ -32,23 +32,16 @@ logging:
 #  file: demo_log.log #配置日志生成路径
 #  path: /var/logs #配置日志文件名称
 picture:
-  url: http://192.168.10.153:8880/
-  storePath: /ftpTest
-  http: http://192.168.10.153:8880/
-  snapshotPath: /home/hexy/picture/snapshot/
+  url: http://192.168.10.117:32112/
+  storePath: /home/liuhaoyu/export/vehicleProject/picture/
+  http: http://192.168.10.117:32112/
+  snapshotPath: /home/liuhaoyu/export/vehicleProject/picture/snapshot/
-snapshotPrefix: http://192.168.10.153:8880/snapshot/
+snapshotPrefix: http://192.168.10.117:32112/snapshot/
 server:
-  port: 8080
-  address: 127.0.0.1
-
-ftp:
-  username: officer
-  password: 334554321123211
-  host: 192.168.10.39
-  port: 21
-
+  port: 8845
+  address: 192.168.10.117
 #调用引擎url
 requestFile: http://192.168.10.4:10002/vps/analysisFile