提交

lichao
1 parent 06425c69
Showing 16 changed files with 137 additions and 6 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/GarbageOrderController.java
trash-garbage/src/main/java/com/trash/garbage/controller/GarbageUserController.java
trash-garbage/src/main/java/com/trash/garbage/mapper/GarAddressMapper.java
trash-garbage/src/main/java/com/trash/garbage/mapper/GarOrderMatchAskMapper.java
trash-garbage/src/main/java/com/trash/garbage/pojo/dto/LoginDto.java
trash-garbage/src/main/java/com/trash/garbage/pojo/dto/SiteInfoDTO.java
trash-garbage/src/main/java/com/trash/garbage/service/GarAddressService.java
trash-garbage/src/main/java/com/trash/garbage/service/GarOrderMatchAskService.java
trash-garbage/src/main/java/com/trash/garbage/service/GarUserService.java
trash-garbage/src/main/java/com/trash/garbage/service/impl/GarAddressServiceImpl.java
trash-garbage/src/main/java/com/trash/garbage/service/impl/GarOrderMatchAskServiceImpl.java
trash-garbage/src/main/java/com/trash/garbage/service/impl/GarUserServiceImpl.java
trash-garbage/src/main/resources/mapper/GarAddressMapper.xml
trash-garbage/src/main/resources/mapper/GarOrderMatchAskMapper.xml
@@ -89,7 +89,7 @@ spring:
         # 端口，默认为6379
         port: 6379
         # 密码
-        password: 
+        password: bsth123
         # 连接超时时间
         timeout: 10s
         database: 10
@@ -98,7 +98,7 @@ public class SecurityConfig extends WebSecurityConfigurerAdapter
                 // 过滤请求
                 .authorizeRequests()
                 // 对于登录login 验证码captchaImage 允许匿名访问
-                .antMatchers("/login", "/captchaImage","/loginByToken").anonymous()
+                .antMatchers("/login", "/captchaImage","/loginByToken","/user/updatePassword").anonymous()
                 .antMatchers(
                         HttpMethod.GET,
                         "/*.html",
@@ -4,6 +4,7 @@ package com.trash.garbage.controller;
 import cn.hutool.core.convert.Convert;
 import cn.hutool.http.HttpRequest;
 import com.alibaba.fastjson.JSON;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.github.pagehelper.PageHelper;
 import com.trash.carInfo.domain.vo.CarInfoVo;
 import com.trash.common.annotation.Log;
@@ -27,13 +28,15 @@ import com.trash.garbage.custom.BizException;
 import com.trash.garbage.global.Result;
 import com.trash.garbage.global.ResultCode;
 import com.trash.garbage.pojo.domain.GarOrder;
+import com.trash.garbage.pojo.domain.GarOrderMatchAsk;
+import com.trash.garbage.pojo.domain.GarOrderMatchDisposal;
+import com.trash.garbage.service.*;
 import com.trash.garbage.pojo.dto.*;
 import com.trash.garbage.pojo.vo.GarOrderMatchAskVo;
 import com.trash.garbage.pojo.vo.OrderDetailTransportVo;
 import com.trash.garbage.pojo.vo.OrderDetailVo;
 import com.trash.garbage.pojo.vo.ScanDriverDetailVo;
-import com.trash.garbage.service.GarOrderService;
-import com.trash.garbage.service.GarUserService;
+import com.trash.garbage.service.impl.GarAddressServiceImpl;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.ArrayUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -64,9 +67,11 @@ public class GarbageOrderController {
     @Autowired
     private TokenService tokenService;
     @Autowired
-    private GarUserService garUserService;
+    private GarOrderMatchAskService garOrderMatchAskService;
     private final static Integer[] USER_TYP_SELF_COMPANY = {2, 3};
+    @Autowired
+    private GarAddressService garAddressService;
     @PostMapping("/add")
     @Log(title = "创建订单", businessType = BusinessType.INSERT)
@@ -156,6 +161,26 @@ public class GarbageOrderController {
         return Result.OK(garOrderService.checkValidCode(validCode));
     }
+
+    @GetMapping("/queryGarOrderMatchAsk/{orderId}")
+    public Result<Integer> queryGarOrderMatchAsk(@PathVariable String orderId) {
+        return Result.OK(garOrderMatchAskService.queryGarOrderMatchAsk(orderId));
+    }
+
+    @GetMapping("/querySiteByTel")
+    public Result<List<SiteInfoDTO>> querySiteByTel() {
+        // 获取登录用户手机号
+        LoginUser loginUser = tokenService.getLoginUser(ServletUtils.getRequest());
+        if (loginUser == null || loginUser.getUser() == null) {
+            return null;
+        }
+        String phoneNumber = loginUser.getUser().getPhonenumber();
+
+        // 使用手机号查询
+        List<SiteInfoDTO> siteInfoDTO = garAddressService.querySiteByTel(phoneNumber);
+        return Result.OK(siteInfoDTO);
+    }
+
     @GetMapping("/query/list")
     public Result<?> queryOrderList(@RequestParam("type") Integer type,
                                     @RequestParam(value = "evaluateFlag", required = false) Integer evaluateFlag,
@@ -47,6 +47,14 @@ public class GarbageUserController {
     }
     /**
+     * 修改密码
+     */
+    @PostMapping("/updatePassword")
+    public Result<String> updatePassword(@RequestBody LoginDto loginDto) {
+        return Result.OK(garUserService.updatePassword(loginDto));
+    }
+
+    /**
      * 退出登录
      *
      * @param
@@ -2,7 +2,12 @@ package com.trash.garbage.mapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.trash.garbage.pojo.domain.GarAddress;
+import com.trash.garbage.pojo.dto.SiteInfoDTO;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+import java.util.Map;
 /**
 * @author 20412
@@ -12,6 +17,8 @@ import org.apache.ibatis.annotations.Mapper;
 */
 public interface GarAddressMapper extends BaseMapper<GarAddress> {
+  List<SiteInfoDTO> querySiteByTel(@Param("tel") String tel);
+
 }
@@ -62,6 +62,8 @@ public interface GarOrderMatchAskMapper extends BaseMapper&lt;GarOrderMatchAsk&gt; {
      * @return 结果
      */
     int deleteGarOrderMatchAskByIds(String[] garIds);
+
+    int queryGarOrderMatchAsk(String orderId);
 }
 package com.trash.garbage.pojo.dto;
+import com.baomidou.mybatisplus.annotation.TableField;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.ToString;
@@ -19,6 +20,29 @@ public class LoginDto {
     private String iv;
     private String password;
     private int signin;
+
+	@TableField(exist = false)
+	private String oldPassword;
+
+	@TableField(exist = false)
+	private String newPassword;
+
+	public String getNewPassword() {
+		return newPassword;
+	}
+
+	public void setNewPassword(String newPassword) {
+		this.newPassword = newPassword;
+	}
+
+
+	public String getOldPassword() {
+		return oldPassword;
+	}
+
+	public void setOldPassword(String oldPassword) {
+		this.oldPassword = oldPassword;
+	}
 	public int getSignin() {
 		return signin;
+package com.trash.garbage.pojo.dto;
+
+import lombok.Data;
+
+@Data
+public class SiteInfoDTO {
+    private String garLongitude;
+    private String garLatitude;
+}
@@ -2,6 +2,9 @@ package com.trash.garbage.service;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.trash.garbage.pojo.domain.GarAddress;
+import com.trash.garbage.pojo.dto.SiteInfoDTO;
+
+import java.util.List;
 /**
 * @author 20412
@@ -9,5 +12,5 @@ import com.trash.garbage.pojo.domain.GarAddress;
 * @createDate 2023-11-22 09:48:43
 */
 public interface GarAddressService extends IService<GarAddress> {
-
+    List<SiteInfoDTO> querySiteByTel(String tel);
 }
@@ -61,4 +61,6 @@ public interface GarOrderMatchAskService extends IService&lt;GarOrderMatchAsk&gt; {
      * @return 结果
      */
     int deleteGarOrderMatchAskById(String garId);
+
+    int queryGarOrderMatchAsk(String orderId);
 }
@@ -8,7 +8,9 @@ import com.baomidou.mybatisplus.extension.service.IService;
 import com.trash.garbage.pojo.domain.GarUserReq;
 import com.trash.garbage.pojo.dto.AddressDto;
 import com.trash.garbage.pojo.dto.LoginDto;
+import com.trash.garbage.pojo.dto.SiteInfoDTO;
 import com.trash.garbage.pojo.vo.LoginVo;
+import org.apache.ibatis.annotations.Param;
 import javax.servlet.http.HttpServletRequest;
 import java.util.List;
@@ -48,5 +50,7 @@ public interface GarUserService extends IService&lt;GarUser&gt; {
     GarUserReq reqGarUser(String phone);
+    String updatePassword(LoginDto loginDto);
+
 }
@@ -3,9 +3,13 @@ package com.trash.garbage.service.impl;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.trash.garbage.mapper.GarAddressMapper;
 import com.trash.garbage.pojo.domain.GarAddress;
+import com.trash.garbage.pojo.dto.SiteInfoDTO;
 import com.trash.garbage.service.GarAddressService;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import java.util.List;
+
 /**
 * @author 20412
 * @description 针对表【gar_address(建筑垃圾-用户地址)】的数据库操作Service实现
@@ -15,6 +19,13 @@ import org.springframework.stereotype.Service;
 public class GarAddressServiceImpl extends ServiceImpl<GarAddressMapper, GarAddress>
     implements GarAddressService {
+    @Autowired
+    GarAddressMapper garAddressMapper;
+
+    @Override
+    public List<SiteInfoDTO> querySiteByTel(String tel) {
+        return garAddressMapper.querySiteByTel(tel);
+    }
 }
@@ -115,6 +115,11 @@ public class GarOrderMatchAskServiceImpl extends ServiceImpl&lt;GarOrderMatchAskMap
     {
         return garOrderMatchAskMapper.deleteGarOrderMatchAskById(garId);
     }
+
+    @Override
+    public int queryGarOrderMatchAsk(String orderId) {
+        return garOrderMatchAskMapper.queryGarOrderMatchAsk(orderId);
+    }
 }
@@ -258,6 +258,29 @@ public class GarUserServiceImpl extends ServiceImpl&lt;GarUserMapper, GarUser&gt;
         this.saveOrUpdate(nUser);
         return vo;
     }
+    @Override
+    public String updatePassword(LoginDto loginDto) {
+        QueryWrapper<GarUser> qw = new QueryWrapper<>();
+        qw.lambda().eq(GarUser::getGarUserTel, loginDto.getTel());
+        GarUser user = this.getOne(qw);
+
+        if (Objects.isNull(user)) {
+            throw new UsernameNotFoundException("当前用户不存在!");
+        }
+
+        if (!new BCryptPasswordEncoder().matches(loginDto.getOldPassword(), user.getPassword())) {
+            throw new BizException(ResultCode.CODE_400, "原密码错误!");
+        }
+
+        LambdaUpdateWrapper<GarUser> updateWrapper = new LambdaUpdateWrapper<>();
+        updateWrapper.eq(GarUser::getGarUserId, user.getGarUserId())
+                .set(GarUser::getPassword, new BCryptPasswordEncoder().encode(loginDto.getNewPassword()));
+
+        this.update(updateWrapper);
+
+        return "密码修改成功!";
+    }
+
     @Override
     public String sendVerify(String tel) throws ClientException {
@@ -21,4 +21,8 @@
         gar_user_default,gar_create_time,gar_update_time,
         gar_user_contact_name,gar_user_contact_tel,gar_remark
     </sql>
+
+    <select id="querySiteByTel" resultType="com.trash.garbage.pojo.dto.SiteInfoDTO">
+        select gar_longitude,gar_latitude from gar_address where gar_user_contact_tel=#{tel}
+    </select>
 </mapper>
@@ -194,4 +194,8 @@
         </foreach>
     </delete>
+    <select id="queryGarOrderMatchAsk" resultType="java.lang.Integer">
+        select COUNT(*) from gar_order_match_ask where gar_order_id = #{orderId} and transport_distance is not null
+    </select>
+
 </mapper>