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

youxiw2000
2 parents 7559d99e 59fcd076
Showing 11 changed files with 185 additions and 20 deletions
trash-admin/src/main/resources/application-dev.yml
trash-framework/src/main/java/com/trash/framework/config/SecurityConfig.java
trash-garbage/src/main/java/com/trash/garbage/controller/GarQRController.java
trash-garbage/src/main/java/com/trash/garbage/controller/GarbageOrderController.java
trash-garbage/src/main/java/com/trash/garbage/global/GlobalStatus.java
trash-garbage/src/main/java/com/trash/garbage/service/GarQRCodeService.java
trash-garbage/src/main/java/com/trash/garbage/service/impl/GarQRCodeServiceImpl.java
trash-garbage/src/main/java/com/trash/garbage/utils/QRCodeUtil.java
trash-ui/src/views/unit/enterprise/info.vue
trash-unit/src/main/java/com/trash/enterprise/domain/TransportationEnterprise.java
trash-unit/src/main/resources/mapper/unit/TransportationEnterpriseMapper.xml
@@ -9,8 +9,9 @@ trash:
     # 实例演示开关
     demoEnabled: true
     # 文件路径 示例（ Windows配置D:/trash/uploadPath，Linux配置 /home/trash/uploadPath，存储桶 trash/uploadPath,nginx配置 /trash/upload）
+    profile: D:/trash/uploadPath
 #    profile: E:/trash/uploadPath
-    profile: F:/work/project/Documents/uploadPath/trash
+#    profile: F:/work/project/Documents/uploadPath/trash
 #     获取ip地址开关
     addressEnabled: false
     # 验证码类型 math 数组计算 char 字符验证
@@ -127,4 +128,8 @@ huawei:
 nginx:
     enabled: false
     path:
-    url:
 \ No newline at end of file
+    url:
+
+# 生成二维码 前端地址
+front:
+    url: "http://61.169.120.202:5173/pages/order/guest/index?orderId="
 \ No newline at end of file
@@ -118,6 +118,7 @@ public class SecurityConfig extends WebSecurityConfigurerAdapter
 //                .antMatchers("/druid/**").anonymous()
                 .antMatchers("/webjars/**").anonymous()
                 .antMatchers("/user/login").anonymous()
+                .antMatchers("/order/webDetail/**").anonymous()
                 .antMatchers("/user/send/verify").anonymous()
 //                .antMatchers("/user/logout").anonymous()
                 .antMatchers("/system/post/all").anonymous()
+package com.trash.garbage.controller;
+
+import com.trash.garbage.global.Result;
+import com.trash.garbage.service.GarQRCodeService;
+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 javax.servlet.http.HttpServletResponse;
+
+@RestController
+@RequestMapping("/QRCode")
+public class GarQRController {
+
+    @Autowired
+    private GarQRCodeService qrCodeService;
+
+    /**
+     * 生成订单详情二维码
+     */
+    @GetMapping("/create/{orderId}")
+    public Result<String> createQRCode(@PathVariable("orderId") String orderId, HttpServletResponse response){
+        return Result.OK(qrCodeService.createQRCode(orderId,response));
+    }
+
+
+}
@@ -112,7 +112,6 @@ public class GarbageOrderController {
         return Result.OK(garOrderService.queryOrderListByGarOrderPage(dto));
     }
  
-
     @GetMapping("/webDetail/{id}")
     public Result<OrderDetailVo> queryOrderWebDetail(@PathVariable("id") String id) {
         return Result.OK(garOrderService.queryOrderWebDetail(id));
@@ -37,7 +37,7 @@ public class GlobalStatus {
          */
         NORMAL_LOGIN(0, "普通登录"),
         NORMAL_USER(0, "居民用户"),
-        DRIVER_USER(1, "管理负责人");
+        DRIVER_USER(1, "司机");
  
         private Integer status;
         private String description;
+package com.trash.garbage.service;
+
+import javax.servlet.http.HttpServletResponse;
+
+public interface GarQRCodeService {
+
+    String createQRCode(String orderId, HttpServletResponse response);
+}
+package com.trash.garbage.service.impl;
+
+import com.google.zxing.WriterException;
+import com.trash.garbage.service.GarQRCodeService;
+import com.trash.garbage.utils.QRCodeUtil;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.stereotype.Service;
+
+import javax.imageio.ImageIO;
+import javax.servlet.ServletOutputStream;
+import javax.servlet.http.HttpServletResponse;
+import java.awt.image.BufferedImage;
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.io.OutputStream;
+import java.util.Base64;
+
+
+@Service
+public class GarQRCodeServiceImpl implements GarQRCodeService {
+
+    @Value("${front.url}")
+    private String url;
+
+    @Override
+    public String createQRCode(String orderId, HttpServletResponse response) {
+        String base64 = "";
+        try {
+            BufferedImage image = QRCodeUtil.createQRCode(url + orderId, 200);
+            base64 = bufferedImageToBase64(image);
+        } catch (WriterException e) {
+            throw new RuntimeException(e);
+        } catch (IOException e) {
+            throw new RuntimeException(e);
+        }
+
+        return base64;
+    }
+    private String bufferedImageToBase64(BufferedImage image) throws IOException {
+        // 创建一个字节数组输出流
+        ByteArrayOutputStream baos = new ByteArrayOutputStream();
+
+        // 将BufferedImage写入字节数组输出流
+        ImageIO.write(image, "jpg", baos);
+
+        // 转换为字节数组
+        byte[] imageBytes = baos.toByteArray();
+
+        // 使用Base64编码
+        String base64String = Base64.getEncoder().encodeToString(imageBytes);
+
+        // 关闭字节数组输出流
+        baos.close();
+
+        return "data:image/jpg;base64," + base64String;
+    }
+
+}
+package com.trash.garbage.utils;
+
+import com.google.zxing.BarcodeFormat;
+import com.google.zxing.EncodeHintType;
+import com.google.zxing.WriterException;
+import com.google.zxing.common.BitMatrix;
+import com.google.zxing.qrcode.QRCodeWriter;
+
+import javax.imageio.ImageIO;
+import java.awt.*;
+import java.awt.image.BufferedImage;
+import java.io.File;
+import java.io.IOException;
+import java.util.HashMap;
+
+public class QRCodeUtil {
+
+    /**
+     * 生成指定网址大小及图片格式的二维码
+     *
+     * @param url      网址
+     * @param size     尺寸
+     */
+    public static BufferedImage createQRCode(String url, int size)
+            throws WriterException, IOException {
+
+        HashMap<EncodeHintType, Object> hintMap = new HashMap<EncodeHintType, Object>();
+        hintMap.put(EncodeHintType.CHARACTER_SET, "UTF-8");
+
+        QRCodeWriter qrCodeWriter = new QRCodeWriter();
+        BitMatrix bitMatrix = qrCodeWriter.encode(url, BarcodeFormat.QR_CODE, size, size, hintMap);
+
+        int matrixWidth = bitMatrix.getWidth();
+        BufferedImage image = new BufferedImage(matrixWidth, matrixWidth, BufferedImage.TYPE_INT_RGB);
+        image.createGraphics();
+
+        Graphics2D graphics = (Graphics2D) image.getGraphics();
+        graphics.setColor(Color.WHITE);
+        graphics.fillRect(0, 0, matrixWidth, matrixWidth);
+        graphics.setColor(Color.BLACK);
+
+        for (int i = 0; i < matrixWidth; i++) {
+            for (int j = 0; j < matrixWidth; j++) {
+                if (bitMatrix.get(i, j)) {
+                    graphics.fillRect(i, j, 1, 1);
+                }
+            }
+        }
+        return image;
+//        ImageIO.write(image, fileType, qrFile);
+    }
+}
 \ No newline at end of file
@@ -113,10 +113,8 @@
           </el-form-item>
         </el-col>
         <el-col :span="7">
-          <el-form-item label="经营单位" prop="parentId">
-            <el-select v-model="form.parentId" placeholder="请选择经营单位" clearable style="width: 100%;">
-              <el-option v-for="(item,index) in enterpriseList" :label="item.name" :value="item.id" :key="index"/>
-            </el-select>
+          <el-form-item label="服务电话" prop="servicePhone">
+            <el-input v-model="form.servicePhone" placeholder="请输入企业服务电话"   :maxlength="11" show-word-limit/>
           </el-form-item>
         </el-col>
         <el-col :span="7">
@@ -417,6 +415,14 @@ export default {
         safetyPeopleName: [
           {required: true, message: "请输入安全管理人员", trigger: "blur"}
         ],
+        servicePhone: [
+          {required: true, message: "请输入企业服务手机号码", trigger: "blur"},
+          {
+            pattern: /^1(3|4|5|7|8|9)\d{9}$/,
+            message: '手机号格式错误',
+            trigger: 'change'
+          }
+        ],
       },
       areas:[],
       // 企业道路运输经营许可证
@@ -85,31 +85,24 @@ public class TransportationEnterprise extends BaseEntity
     private String legalRepresentativePhone;
  
     /** 安全管理人员 */
-    @Excel(name = "安全管理人员")
     private String safetyPeopleName;
  
     /** 企业道路运输经营许可证 */
-    @Excel(name = "企业道路运输经营许可证")
     private String transportPermission;
  
     /** 企业营业执照 */
-    @Excel(name = "企业营业执照")
     private String enterpriseBusinessLicense;
  
     /** 安全员考核合格证明 */
-    @Excel(name = "安全员考核合格证明")
     private String safetyOfficerQualificationCertificate;
  
     /** 企业负责人安全考核证 */
-    @Excel(name = "企业负责人安全考核证")
     private String safetyCertificate;
  
     /** 停车场全景图 */
-    @Excel(name = "停车场全景图")
     private String carParkPanorama;
  
     /** 经营单位 */
-    @Excel(name = "经营单位")
     private String businessUnit;
  
     /** 审批状态,0=审批中,1=审批通过,2=被驳回 */
@@ -117,7 +110,6 @@ public class TransportationEnterprise extends BaseEntity
     private Integer status;
  
     /** 父公司id */
-    @Excel(name = "父公司id")
     private Long parentId;
  
     /** 公司类型（0经营单位，1运输公司） */
@@ -125,14 +117,24 @@ public class TransportationEnterprise extends BaseEntity
     private Integer companyType;
  
     /** 信用状态 */
-    @Excel(name = "信用状态")
     private String creditStatus;
  
     /** 二维码 */
-    @Excel(name = "二维码")
     private String qrCode;
  
-    public void setId(Long id) 
+    /** 企业服务电话 */
+    @Excel(name = "公司类型")
+    private String servicePhone;
+
+    public String getServicePhone() {
+        return servicePhone;
+    }
+
+    public void setServicePhone(String servicePhone) {
+        this.servicePhone = servicePhone;
+    }
+
+    public void setId(Long id)
     {
         this.id = id;
     }
@@ -38,10 +38,11 @@ PUBLIC &quot;-//mybatis.org//DTD Mapper 3.0//EN&quot;
         <result property="companyType"    column="company_type"    />
         <result property="creditStatus"    column="credit_status"    />
         <result property="qrCode"    column="qr_code"    />
+        <result property="servicePhone"   column="service_phone"    />
     </resultMap>
  
     <sql id="selectTransportationEnterpriseVo">
-        select id, name, abbreviation, registration_area, transport_permission_date, enter_date, business_license_date, office_address, parking_lot_location, parking_area, (select count(id) from car_info where company_id = te.id) car_number, safety_manager_name, safety_manager_phone, social_uniform_credit_code_number, legal_representative, legal_representative_phone, safety_people_name, remark, transport_permission, enterprise_business_license, safety_officer_qualification_certificate, safety_certificate, car_park_panorama, business_unit, status, create_time, create_by, update_time, update_by, parent_id, company_type, credit_status, qr_code from transportation_enterprise te
+        select id, name, abbreviation, registration_area, transport_permission_date, enter_date, business_license_date, office_address, parking_lot_location, parking_area, (select count(id) from car_info where company_id = te.id) car_number, safety_manager_name, safety_manager_phone, social_uniform_credit_code_number, legal_representative, legal_representative_phone, safety_people_name, remark, transport_permission, enterprise_business_license, safety_officer_qualification_certificate, safety_certificate, car_park_panorama, business_unit, status, create_time, create_by, update_time, update_by, parent_id, company_type, credit_status, qr_code,service_phone from transportation_enterprise te
     </sql>
  
     <select id="selectTransportationEnterpriseList" parameterType="TransportationEnterprise" resultMap="TransportationEnterpriseResult">
@@ -74,6 +75,7 @@ PUBLIC &quot;-//mybatis.org//DTD Mapper 3.0//EN&quot;
             <if test="companyType != null "> and company_type = #{companyType}</if>
             <if test="creditStatus != null  and creditStatus != ''"> and credit_status = #{creditStatus}</if>
             <if test="qrCode != null  and qrCode != ''"> and qr_code = #{qrCode}</if>
+            <if test="servicePhone != null  and servicePhone != ''"> and service_phone = #{servicePhone}</if>
         </where>
     </select>
  
@@ -117,6 +119,7 @@ PUBLIC &quot;-//mybatis.org//DTD Mapper 3.0//EN&quot;
             <if test="companyType != null">company_type,</if>
             <if test="creditStatus != null">credit_status,</if>
             <if test="qrCode != null">qr_code,</if>
+            <if test="servicePhone != null">service_phone,</if>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="name != null">#{name},</if>
@@ -151,6 +154,7 @@ PUBLIC &quot;-//mybatis.org//DTD Mapper 3.0//EN&quot;
             <if test="companyType != null">#{companyType},</if>
             <if test="creditStatus != null">#{creditStatus},</if>
             <if test="qrCode != null">#{qrCode},</if>
+            <if test="servicePhone != null">#{servicePhone},</if>
          </trim>
     </insert>
  
@@ -189,6 +193,7 @@ PUBLIC &quot;-//mybatis.org//DTD Mapper 3.0//EN&quot;
             <if test="companyType != null">company_type = #{companyType},</if>
             <if test="creditStatus != null">credit_status = #{creditStatus},</if>
             <if test="qrCode != null">qr_code = #{qrCode},</if>
+            <if test="servicePhone != null">service_phone = #{servicePhone},</if>
         </trim>
         where id = #{id}
     </update>