Merge branch 'dev' of http://61.169.120.202:8888/youxiw20000/trash into dev

youxiw2000
2 parents f7be3b86 dbf598be
Showing 9 changed files with 149 additions and 14 deletions
trash-garbage/pom.xml
trash-garbage/src/main/java/com/trash/garbage/controller/GarQRController.java
trash-garbage/src/main/java/com/trash/garbage/controller/GarbageCarController.java
trash-garbage/src/main/java/com/trash/garbage/pojo/domain/DockingQRCodeEntity.java
trash-garbage/src/main/java/com/trash/garbage/pojo/vo/DispatchDisposalVo.java
trash-garbage/src/main/java/com/trash/garbage/service/impl/GarOrderMatchDisposalServiceImpl.java
trash-garbage/src/main/java/com/trash/garbage/utils/HttpUtil.java
trash-garbage/src/main/resources/mapper/GarOrderMapper.xml
trash-ui/src/views/unit/dropPointInfo/index.vue
@@ -16,7 +16,29 @@
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     </properties>
     <dependencies>
-       <dependency>
+        <dependency>
+            <groupId>com.google.zxing</groupId>
+            <artifactId>javase</artifactId>
+            <version>3.5.3</version>
+        </dependency>
+
+        <dependency>
+            <groupId>com.google.zxing</groupId>
+            <artifactId>core</artifactId>
+            <version>3.5.3</version>
+        </dependency>
+
+        <!-- https://mvnrepository.com/artifact/QRCode/QRCode -->
+        <dependency>
+            <groupId>com.github</groupId>
+            <artifactId>QRCode</artifactId>
+            <version>1.0.0</version>
+            <classifier>sources</classifier>
+            <type>java-source</type>
+        </dependency>
+
+
+        <dependency>
             <groupId>com.trash</groupId>
            <artifactId>trash-common</artifactId>
        </dependency>
 package com.trash.garbage.controller;
  
+import cn.hutool.extra.qrcode.BufferedImageLuminanceSource;
+import com.google.zxing.*;
+import com.google.zxing.common.HybridBinarizer;
+import com.google.zxing.qrcode.QRCodeReader;
 import com.trash.garbage.global.Result;
 import com.trash.garbage.service.GarQRCodeService;
+import org.apache.commons.io.IOUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
  
+import javax.imageio.ImageIO;
 import javax.servlet.http.HttpServletResponse;
+import java.awt.image.BufferedImage;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.InputStream;
+import java.util.HashMap;
+import java.util.Map;
  
 @RestController
 @RequestMapping("/QRCode")
@@ -16,14 +28,53 @@ public class GarQRController {
  
     @Autowired
     private GarQRCodeService qrCodeService;
+    private Logger logger = LoggerFactory.getLogger(GarQRController.class);
  
     /**
      * 生成订单详情二维码
      */
     @GetMapping("/create/{orderId}")
-    public Result<String> createQRCode(@PathVariable("orderId") String orderId, HttpServletResponse response){
-        return Result.OK(qrCodeService.createQRCode(orderId,response));
+    public Result<String> createQRCode(@PathVariable("orderId") String orderId, HttpServletResponse response) {
+        return Result.OK(qrCodeService.createQRCode(orderId, response));
     }
  
+    @PostMapping("/ocr/pric")
+    public String uploadOcrPric(@RequestParam("file") MultipartFile file) {
+        InputStream inputStream = null;
+        BufferedImage image = null;
+        BinaryBitmap binaryBitmap = null;
+        try {
+            inputStream = file.getInputStream();
+            image = ImageIO.read(inputStream);
+            LuminanceSource source = new BufferedImageLuminanceSource(image);
+            Binarizer binarizer = new HybridBinarizer(source);
+            binaryBitmap = new BinaryBitmap(binarizer);
+            Map<DecodeHintType, Object> hints = new HashMap<>();
+            hints.put(DecodeHintType.CHARACTER_SET, "UTF-8");
+            com.google.zxing.Result result = new MultiFormatReader().decode(binaryBitmap, hints);
  
+            image.flush();
+            return result.getText();
+        } catch (Exception e) {
+            logger.error("识别图片错误", e);
+            ocrPric1(binaryBitmap);
+        } finally {
+            IOUtils.closeQuietly(inputStream);
+        }
+        return "";
+    }
+
+    private String ocrPric1(BinaryBitmap binaryBitmap) {
+        try {
+            Map<DecodeHintType, Object> hints = new HashMap<>();
+            hints.put(DecodeHintType.CHARACTER_SET, "UTF-8");
+            hints.put(DecodeHintType.TRY_HARDER,true);
+            hints.put(DecodeHintType.PURE_BARCODE,true);
+            com.google.zxing.Result result = new MultiFormatReader().decode(binaryBitmap, hints);
+            System.out.println(result.getText());
+        } catch (ReaderException e) {
+            logger.error("识别图片错误", e);
+        }
+        return "";
+    }
 }
@@ -3,12 +3,18 @@ package com.trash.garbage.controller;
 import com.trash.common.annotation.Log;
 import com.trash.common.core.domain.AjaxResult;
 import com.trash.common.enums.BusinessType;
+import com.trash.enterprise.domain.TransportationEnterprise;
 import com.trash.garbage.global.Result;
 import com.trash.garbage.pojo.domain.DockingQRCodeEntity;
 import com.trash.garbage.pojo.dto.DockingQRCodeDTO;
 import com.trash.garbage.pojo.dto.OrderDto;
+import com.trash.garbage.pojo.vo.DispatchDisposalVo;
+import com.trash.garbage.service.GarOrderMatchDisposalService;
 import com.trash.garbage.service.GarOrderService;
+import com.trash.garbage.service.GarTransportationEnterpriseService;
+import jdk.nashorn.internal.runtime.options.Option;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.collections4.CollectionUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.BindingResult;
 import org.springframework.validation.annotation.Validated;
@@ -18,6 +24,9 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
  
 import java.util.List;
+import java.util.Objects;
+import java.util.Optional;
+import java.util.stream.Collectors;
  
 @RestController
 @RequestMapping("/car/order")
@@ -25,6 +34,10 @@ import java.util.List;
 public class GarbageCarController {
     @Autowired
     private GarOrderService garOrderService;
+    @Autowired
+    private GarTransportationEnterpriseService garTransportationEnterpriseService;
+    @Autowired
+    private GarOrderMatchDisposalService garOrderMatchDisposalService;
  
     @PostMapping("/processing")
     public Result<?> saveOrder(@Validated @RequestBody DockingQRCodeDTO dto, BindingResult bindingResult) {
@@ -33,6 +46,18 @@ public class GarbageCarController {
         }
         List<DockingQRCodeEntity> entities = garOrderService.queryReportByCarCode(dto.getCarCode());
  
+        List<DispatchDisposalVo> vos = garOrderMatchDisposalService.requestDisposalListWithDispatch();
+        if (CollectionUtils.isNotEmpty(vos) && CollectionUtils.isNotEmpty(entities)) {
+            entities = entities.stream().map(e -> {
+                Optional<DispatchDisposalVo> optional = vos.stream().filter(v -> Objects.equals(v.getGarOrderDisposalCompanyId(), e.getGarOrderDisposalCompanyId())).findFirst();
+                if (optional.isPresent()) {
+                    e.setDsName(optional.get().getGarOrderDisposalCompanyName());
+                    e.setDsAddress(optional.get().getBuildCompanyAddress());
+                }
+                return e;
+            }).collect(Collectors.toList());
+        }
+
         return Result.OK(entities);
     }
 }
@@ -11,6 +11,8 @@ public class DockingQRCodeEntity implements java.io.Serializable {
     private String dsAddress;//场地地址
     private String dsLocalArea;//场地所属区域
     private String dsName;//处置场所名称
+    private String garOrderDisposalCompanyId;
+
  
  
     public String getGarOrderAddress() {
@@ -84,4 +86,12 @@ public class DockingQRCodeEntity implements java.io.Serializable {
     public void setDsName(String dsName) {
         this.dsName = dsName;
     }
+
+    public String getGarOrderDisposalCompanyId() {
+        return garOrderDisposalCompanyId;
+    }
+
+    public void setGarOrderDisposalCompanyId(String garOrderDisposalCompanyId) {
+        this.garOrderDisposalCompanyId = garOrderDisposalCompanyId;
+    }
 }
@@ -24,6 +24,7 @@ public class DispatchDisposalVo {
     private String garOrderDisposalCompanyName;
     private String garOrderDisposalCompanyId;
     private boolean check=false;
+    private String buildCompanyAddress;
  
     public boolean isCheck() {
         return check;
@@ -100,4 +101,11 @@ public class DispatchDisposalVo {
         this.personnelInfo = personnelInfo;
     }
  
+    public String getBuildCompanyAddress() {
+        return buildCompanyAddress;
+    }
+
+    public void setBuildCompanyAddress(String buildCompanyAddress) {
+        this.buildCompanyAddress = buildCompanyAddress;
+    }
 }
@@ -115,6 +115,7 @@ public class GarOrderMatchDisposalServiceImpl extends ServiceImpl&lt;GarOrderMatchD
                 DispatchDisposalVo vo = new DispatchDisposalVo();
                 vo.setGarOrderDisposalCompanyId(obj.getString("id"));
                 vo.setGarOrderDisposalCompanyName(obj.getString("name"));
+                vo.setBuildCompanyAddress(obj.getString("BuildCompanyAddress"));
  
                 List<DispatchDisposalVo.Personnel> personnelInfos = new ArrayList<>();
                 DispatchDisposalVo.Personnel personnel = new DispatchDisposalVo.Personnel();
@@ -62,7 +62,7 @@ public class HttpUtil {
                 .timeout(15000);
  
         json = request.execute().body();
-        LOGGER.info(url + ";,returnJson:[" + json + "]");
+        LOGGER.info(url + ";returnJson:[" + json + "]");
         return json;
     }
  
@@ -260,12 +260,12 @@
     </select>
     <select id="queryReportByCarCode" resultType="com.trash.garbage.pojo.domain.DockingQRCodeEntity">
         select  go2.gar_order_address garOrderAddress ,go2.gar_order_address_details garOrderAddressDetails ,go2.gar_order_agreement_time garOrderAgreementTime,
-        gu.gar_user_name garUserName,gu.gar_user_tel garUserTel,goc.container_volume containerVolume,ds.address dsAddress,ds.local_area dsLocalArea ,ds.name dsName
+        gu.gar_user_name garUserName,gu.gar_user_tel garUserTel,goc.container_volume containerVolume
+        ,gomd.gar_order_disposal_company_id garOrderDisposalCompanyId
         from gar_order go2
         left join gar_user gu  on gu.gar_user_id =go2.gar_order_user_id
         left join gar_order_car goc on goc.gar_order_id =go2.gar_order_id
         left join gar_order_match_disposal gomd on  gomd.gar_order_id=go2.gar_order_id
-        left join disposal_site ds on ds.id = gomd.gar_order_disposal_company_id
         left join gar_order_match_handler gomh on gomh.gar_order_id =go2.gar_order_id
         where gomh.gar_handler_car_code=#{carCode}
          AND gomh.gar_cancel_flag = 0
@@ -93,7 +93,13 @@
             }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="社区" align="center" prop="community"/>
+      <el-table-column label="社区" align="center" prop="community">
+        <template slot-scope="scope">
+          <span>{{
+              communitysInfo(scope.row.community)
+            }}</span>
+          </template>
+      </el-table-column>
       <el-table-column label="小区" align="center" prop="plot"/>
       <el-table-column label="详细地址" align="center" prop="address"/>
       <el-table-column label="投放点形式" align="center" prop="type"/>
@@ -448,19 +454,31 @@ export default {
     dict(code){
       for(let key in this.areas){
         if(this.areas[key].code === code){
+          // this.streets = this.areas[key].items;
           return this.areas[key].name;
         }
       }
     },
     dictInfo(code){
       for(let key in this.areas){
-        for(let keyInfo in this.areas[key].streets){
-          if(this.areas[key].streets[keyInfo].code === code){
-            return this.areas[key].streets[keyInfo].name;
+        for(let key1 in this.areas[key].items){
+          if(this.areas[key].items[key1].code === code){
+            return this.areas[key].items[key1].name;
           }
         }
       }
     },
+    communitysInfo(code){
+      for(let key in this.areas){
+        for(let key1 in this.areas[key].items){
+         for (let key2 in this.areas[key].items[key1].items){
+           if (this.areas[key].items[key1].items[key2].code === code){
+             return this.areas[key].items[key1].items[key2].name;
+           }
+         }
+        }
+      }
+    },
     clearCoordinatePoint(){
       this.center = null;
       this.form.coordinatePoint = null;