调整-11-26

lichao
1 parent 3e354e17
Showing 8 changed files with 74 additions and 9 deletions
trash-admin/src/main/resources/application-dev.yml
trash-garbage/src/main/java/com/trash/garbage/controller/GarbageOrderController.java
trash-garbage/src/main/java/com/trash/garbage/mapper/GarOrderMatchHandlerMapper.java
trash-garbage/src/main/java/com/trash/garbage/pojo/domain/GarOrderMatchHandler.java
trash-garbage/src/main/java/com/trash/garbage/service/GarOrderMatchHandlerService.java
trash-garbage/src/main/java/com/trash/garbage/service/impl/GarOrderMatchHandlerServiceImpl.java
trash-garbage/src/main/java/com/trash/garbage/service/impl/GarUserServiceImpl.java
trash-garbage/src/main/resources/mapper/GarOrderMatchHandlerMapper.xml
@@ -10,7 +10,7 @@ trash:
     demoEnabled: true
     # 文件路径 示例（ Windows配置D:/trash/uploadPath，Linux配置 /home/trash/uploadPath，存储桶 trash/uploadPath,nginx配置 /trash/upload）
     #profile: /home/trash/uploadPath
-    profile: E:/trash/uploadPath
+    profile: D:/trash/uploadPath
 #    profile: F:/work/project/Documents/uploadPath/trash
 #     获取ip地址开关
     addressEnabled: false
@@ -89,7 +89,7 @@ spring:
         # 端口，默认为6379
         port: 6379
         # 密码
-        password: 
+        password: bsth123
         # 连接超时时间
         timeout: 10s
         database: 10
@@ -106,7 +106,7 @@ spring:
 # 开发环境配置
 server:
     # 服务器的HTTP端口，默认为8080
-    port: 8080
+    port: 8088
     servlet:
         # 应用的访问路径
         context-path: /workflow
@@ -254,6 +254,21 @@ public class GarbageOrderController {
         return Result.OK(garOrderService.updateGarRealCarCount(orderId, garRealCarCount));
     }
+    @GetMapping("/queryCarCountByTel/{tel}")
+    public Result<?> queryCarCountByTel(@PathVariable("tel") String tel) {
+        return Result.OK(garOrderMatchHandlerService.queryCarCountByTel(tel));
+    }
+
+    @GetMapping("/updateCarCount")
+    public Result<?> updateCarCount(@RequestParam("tel") String tel) {
+        return Result.OK(garOrderMatchHandlerService.updateCarCount(tel));
+    }
+
+    @GetMapping("/queryByOrderNo/{orderNo}")
+    public Result<?> queryByOrderNo(@PathVariable("orderNo") String orderNo) {
+        return Result.OK(garOrderMatchHandlerService.queryByOrderNo(orderNo));
+    }
+
     @GetMapping("/getGarOrderMatchHandlers")
     public Result<?> getGarOrderMatchHandlers(@RequestParam("orderId") String orderId) {
         return Result.OK(garOrderService.getGarOrderMatchHandlers(orderId));
@@ -22,6 +22,12 @@ public interface GarOrderMatchHandlerMapper extends BaseMapper&lt;GarOrderMatchHand
     List<GarOrderMatchHandler> queryGarOrderMatchHandler(@Param("orderId") String orderId);
     String queryOrderNo(@Param("carCode") String carCode);
+
+    String queryCarCountByTel(@Param("tel") String tel);
+
+    int updateCarCount(@Param("tel") String tel);
+
+    List<GarOrderMatchHandler> queryByOrderNo(@Param("orderNo") String orderNo);
 }
@@ -65,6 +65,11 @@ public class GarOrderMatchHandler implements Serializable {
     private String garOrderHandlerCompanyName;
     /**
+     * 车辆趟次
+     */
+    private String garCarCount;
+
+    /**
      *
      */
     @TableField(fill = FieldFill.INSERT)
@@ -237,4 +242,12 @@ public class GarOrderMatchHandler implements Serializable {
     public void setGarOrderHandlerId(String garOrderHandlerId) {
         this.garOrderHandlerId = garOrderHandlerId;
     }
+
+    public String getGarCarCount() {
+        return garCarCount;
+    }
+
+    public void setGarCarCount(String garCarCount) {
+        this.garCarCount = garCarCount;
+    }
 }
 \ No newline at end of file
@@ -3,6 +3,7 @@ package com.trash.garbage.service;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.trash.garbage.pojo.domain.GarOrderMatchHandler;
 import com.trash.garbage.pojo.vo.DispatchDriverVo;
+import org.apache.ibatis.annotations.Param;
 import java.util.List;
 import java.util.Set;
@@ -17,4 +18,7 @@ public interface GarOrderMatchHandlerService extends IService&lt;GarOrderMatchHandl
     List<DispatchDriverVo> queryDriverListWithDispatchStatus(String orderId, String companyId, Set<String> containerVolumees);
     List<GarOrderMatchHandler> queryByOrderId(String orderId);
     String queryOrderNo(String carCode);
+    String queryCarCountByTel(String tel);
+    int updateCarCount(String tel);
+    List<GarOrderMatchHandler> queryByOrderNo(String orderNo);
 }
@@ -37,6 +37,21 @@ public class GarOrderMatchHandlerServiceImpl extends ServiceImpl&lt;GarOrderMatchHa
     public String queryOrderNo(String carCode) {
         return baseMapper.queryOrderNo(carCode);
     }
+
+    @Override
+    public String queryCarCountByTel(String tel) {
+        return baseMapper.queryCarCountByTel(tel);
+    }
+
+    @Override
+    public int updateCarCount(String tel) {
+        return baseMapper.updateCarCount(tel);
+    }
+
+    @Override
+    public List<GarOrderMatchHandler> queryByOrderNo(String orderNo) {
+        return baseMapper.queryByOrderNo(orderNo);
+    }
 }
@@ -262,12 +262,12 @@ public class GarUserServiceImpl extends ServiceImpl&lt;GarUserMapper, GarUser&gt;
             vo.getRuleVos().add(ruleVo);
         }
-        for (LoginVo.RuleVo r : vo.getRuleVos()){
-            //排除驾驶员、企业负责人、处理场所
-            if(r.getUserType().equals(GlobalStatus.GarUserStatusEnum.DISPOSAL_SITE_USER.getDescription()) || r.getUserType().equals(GlobalStatus.GarUserStatusEnum.DRIVER_USER.getDescription()) || r.getUserType().equals(GlobalStatus.GarUserStatusEnum.RESPONSIBLE_USER.getDescription())){
-                vo.setTestUser(true);
-            }
-        }
+//        for (LoginVo.RuleVo r : vo.getRuleVos()){
+//            //排除驾驶员、企业负责人、处理场所
+//            if(r.getUserType().equals(GlobalStatus.GarUserStatusEnum.DISPOSAL_SITE_USER.getDescription()) || r.getUserType().equals(GlobalStatus.GarUserStatusEnum.DRIVER_USER.getDescription()) || r.getUserType().equals(GlobalStatus.GarUserStatusEnum.RESPONSIBLE_USER.getDescription())){
+//                vo.setTestUser(true);
+//            }
+//        }
         this.saveOrUpdate(nUser);
@@ -81,4 +81,16 @@
             limit 1
     </select>
+    <select id="queryCarCountByTel" resultType="string">
+            select gar_car_count from gar_order_match_handler where gar_order_handler_tel = #{tel}
+    </select>
+
+    <update id="updateCarCount">
+            update gar_order_match_handler set gar_car_count = #{carCount} where gar_order_handler_tel = #{tel}
+    </update>
+
+    <select id="queryByOrderNo" resultType="com.trash.garbage.pojo.domain.GarOrderMatchHandler">
+            select * from gar_order_match_handler where gar_order_id = #{orderId}
+    </select>
+
 </mapper>