优化口岸资讯

sp-service/level-one-server/src/main/java/com/pj/tb_port_news/TbPortNewsAppController.java

@@ -1,12 +1,10 @@
 package com.pj.tb_port_news;
 
-import com.pj.enummj.DeleteStatus;
-import com.pj.tb_goods_transit.TbGoodsTransit;
 import com.pj.utils.sg.AjaxJson;
 import com.pj.utils.so.SoMap;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
 import java.util.List;
@@ -32,8 +30,7 @@ public class TbPortNewsAppController {
      */
     @RequestMapping("getNewestList")
     public AjaxJson getNewestList(Long limit) {
-        AjaxJson ajaxJson = tbPortNewsService.getNewestList(limit);
-        return ajaxJson;
+        return tbPortNewsService.getNewestList(limit);
     }
 
     /**
@@ -50,15 +47,8 @@ public class TbPortNewsAppController {
         return AjaxJson.getPageData(so.getDataCount(), list);
     }
 
-    /**
-     * APP端获取口岸资讯详情
-     *
-     * @author loovi
-     * @date
-     */
-    @RequestMapping("getPortNewsDetails")
-    public AjaxJson getPortNewsDetails(Long id) {
-        AjaxJson ajaxJson = tbPortNewsService.getPortNewsDetails(id);
-        return ajaxJson;
+    @GetMapping("getById")
+    public AjaxJson getById(Long id) {
+        return tbPortNewsService.getPortNewsDetails(id);
     }
 }

sp-service/level-one-server/src/main/java/com/pj/tb_port_news/TbPortNewsService.java

@@ -25,129 +25,135 @@ import com.pj.utils.sg.*;
 
 /**
  * Service: tb_port_news -- 口岸咨询
+ *
  * @author loovi
  */
 @Service
 @Transactional(rollbackFor = Exception.class)
-public class TbPortNewsService extends ServiceImpl<TbPortNewsMapper, TbPortNews> implements IService<TbPortNews>{
-
-	/** 底层 Mapper 对象 */
-	@Autowired
-	TbPortNewsMapper tbPortNewsMapper;
-
-	/** 增 */
-	void add(TbPortNews t){
-		save(t);
-	}
-
-	/** 删 */
-	void delete(Long id){
-		removeById(id);
-	}
-
-	/** 改 */
-	void update(TbPortNews t){
-		updateById(t);
-
-	}
-
-	/** 查 */
-	TbPortNews getById(Long id){
-		return super.getById(id);
-	}
-
-	/** 查集合 - 根据条件（参数为空时代表忽略指定条件） */  
-	List<TbPortNews> getList(SoMap so) { 
-		return tbPortNewsMapper.getList(so);	
-	}
-	/**
-	*更新发布状态
-	*
-	* @author loovi
-	* @date
-	*/
-	int updateRelease(Long id, int isRelease){
-
-		// 获取当前登录者信息
-		String str = RedisUtil.get("pc:" + StpUtil.getLoginIdAsString());
-		JSONObject jsonObject = JSONUtil.parseObj(str);
-		String loginId = (String) jsonObject.get("loginId");
-		String loginName = (String)jsonObject.get("loginName");
-		// 获取口岸咨询
-		TbPortNews tbPortNews = tbPortNewsMapper.selectById(id);
-		// 口岸咨询不存在抛异常
-		if(Objects.isNull(tbPortNews)){
-			throw new RuntimeException("口岸咨询不存在");
-		}
-		// 口岸咨询被禁用抛异常
-		if (tbPortNews.getStatus()== DeleteStatus.DELETE_STATUS_OFF.getCode()){
-			throw new RuntimeException("口岸咨询已被禁用");
-		}
-		// 设置口岸咨询发布状态
-		tbPortNews.setIsRelease(isRelease);
-		// 设置口岸咨询发布时间
-		tbPortNews.setReleaseTime(new Date());
-		// 设置口岸咨询更新者id
-		tbPortNews.setUpdateBy(loginId);
-		// 设置口岸咨询更新者名称
-		tbPortNews.setUpdateName(loginName);
-		// 更新口岸咨询
-		int line = tbPortNewsMapper.updateById(tbPortNews);
-		return line;
-	}
-
-
-
-	/**
-	*APP端获取最新的5条口岸资讯
-	*
-	* @author loovi
-	* @date
-	*/
-	public  AjaxJson getNewestList(Long limit){
-		// 构造条件查询最新的资讯
-		QueryWrapper<TbPortNews> queryWrapper = new QueryWrapper<>();
-		queryWrapper.eq("status", DeleteStatus.DELETE_STATUS_ON.getCode())
-				.eq("is_release", ReleaseStatus.RELEASE_STATUS_PUBLISH.getCode())
-				.orderByDesc("release_time")
-				.last("LIMIT " +limit);
-		// 执行查询
-		List<TbPortNews> list = list(queryWrapper);
-		// 将结果列表拷贝至VO列表
-		List<TbPortNewsVo> resList = CglibUtil.copyList(list, TbPortNewsVo::new);
-		// 返回获取的最新口岸资讯
-		return AjaxJson.getSuccess("最新口岸资讯",resList);
-	}
-	/**
-	 *APP端获取口岸资讯列表
-	 *
-	 * @author loovi
-	 * @date
-	 */
-	public  AjaxJson getPortNewsList(){
-		// 构造条件查询资讯列表
-		QueryWrapper<TbPortNews> queryWrapper = new QueryWrapper<>();
-		queryWrapper.eq("status",DeleteStatus.DELETE_STATUS_ON.getCode());
-		// 执行查询
-		List<TbPortNews> list = tbPortNewsMapper.selectList(queryWrapper);
-		// 将结果列表拷贝至VO列表
-		List<TbPortNewsVo> resList = CglibUtil.copyList(list, TbPortNewsVo::new);
-		// 返回获取的最新口岸资讯
-		return AjaxJson.getSuccess("口岸资讯列表",resList);
-	}
-	/**
-	 *APP端获取口岸资讯详情
-	 *
-	 * @author loovi
-	 * @date
-	 */
-	public  AjaxJson getPortNewsDetails(Long id){
-		// 执行查询
-		TbPortNews tbPortNews = tbPortNewsMapper.selectById(id);
-		if(Objects.isNull(tbPortNews)){
-			throw new RuntimeException("资讯不存在");
-		}
-		// 返回获取的最新口岸资讯
-		return AjaxJson.getSuccess("口岸资讯详情",tbPortNews.getContent());
-	}
+public class TbPortNewsService extends ServiceImpl<TbPortNewsMapper, TbPortNews> implements IService<TbPortNews> {
+
+    /**
+     * 底层 Mapper 对象
+     */
+    @Autowired
+    TbPortNewsMapper tbPortNewsMapper;
+
+    /**
+     * 增
+     */
+    void add(TbPortNews t) {
+        save(t);
+    }
+
+    /**
+     * 删
+     */
+    void delete(Long id) {
+        removeById(id);
+    }
+
+    /**
+     * 改
+     */
+    void update(TbPortNews t) {
+        updateById(t);
+
+    }
+
+    /**
+     * 查
+     */
+    TbPortNews getById(Long id) {
+        return super.getById(id);
+    }
+
+    /**
+     * 查集合 - 根据条件（参数为空时代表忽略指定条件）
+     */
+    List<TbPortNews> getList(SoMap so) {
+        return tbPortNewsMapper.getList(so);
+    }
+
+    /**
+     * 更新发布状态
+     *
+     * @author loovi
+     * @date
+     */
+    int updateRelease(Long id, int isRelease) {
+
+        // 获取当前登录者信息
+        String str = RedisUtil.get("pc:" + StpUtil.getLoginIdAsString());
+        JSONObject jsonObject = JSONUtil.parseObj(str);
+        String loginId = (String) jsonObject.get("loginId");
+        String loginName = (String) jsonObject.get("loginName");
+        // 获取口岸咨询
+        TbPortNews tbPortNews = tbPortNewsMapper.selectById(id);
+        // 口岸咨询不存在抛异常
+        if (Objects.isNull(tbPortNews)) {
+            throw new RuntimeException("口岸咨询不存在");
+        }
+        // 口岸咨询被禁用抛异常
+        if (tbPortNews.getStatus() == DeleteStatus.DELETE_STATUS_OFF.getCode()) {
+            throw new RuntimeException("口岸咨询已被禁用");
+        }
+        // 设置口岸咨询发布状态
+        tbPortNews.setIsRelease(isRelease);
+        // 设置口岸咨询发布时间
+        tbPortNews.setReleaseTime(new Date());
+        // 设置口岸咨询更新者id
+        tbPortNews.setUpdateBy(loginId);
+        // 设置口岸咨询更新者名称
+        tbPortNews.setUpdateName(loginName);
+        // 更新口岸咨询
+        int line = tbPortNewsMapper.updateById(tbPortNews);
+        return line;
+    }
+
+
+    /**
+     * APP端获取最新的5条口岸资讯
+     *
+     * @author loovi
+     * @date
+     */
+    public AjaxJson getNewestList(Long limit) {
+        QueryWrapper<TbPortNews> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("status", 1).eq("is_release", ReleaseStatus.RELEASE_STATUS_PUBLISH.getCode()).orderByDesc("release_time").last("LIMIT " + limit);
+        return AjaxJson.getSuccessData(list(queryWrapper));
+    }
+
+    /**
+     * APP端获取口岸资讯列表
+     *
+     * @author loovi
+     * @date
+     */
+    public AjaxJson getPortNewsList() {
+        // 构造条件查询资讯列表
+        QueryWrapper<TbPortNews> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("status", DeleteStatus.DELETE_STATUS_ON.getCode());
+        // 执行查询
+        List<TbPortNews> list = tbPortNewsMapper.selectList(queryWrapper);
+        // 将结果列表拷贝至VO列表
+        List<TbPortNewsVo> resList = CglibUtil.copyList(list, TbPortNewsVo::new);
+        // 返回获取的最新口岸资讯
+        return AjaxJson.getSuccess("口岸资讯列表", resList);
+    }
+
+    /**
+     * APP端获取口岸资讯详情
+     *
+     * @author loovi
+     * @date
+     */
+    public AjaxJson getPortNewsDetails(Long id) {
+        TbPortNews tbPortNews = tbPortNewsMapper.selectById(id);
+        if (tbPortNews != null && tbPortNews.getStatus() == 1) {
+            tbPortNews.setReadCount(tbPortNews.getReadCount() + 1);
+            tbPortNewsMapper.updateById(tbPortNews);
+            return AjaxJson.getSuccessData(tbPortNews);
+        }
+        return AjaxJson.getError();
+    }
 }

sp-service/sp-admin/src/main/java/com/pj/project/app_user/AppUserApiController.java

@@ -5,58 +5,68 @@ import com.pj.project.app_user.dto.RegisterDto;
 import com.pj.utils.sg.AjaxJson;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
-
+import org.springframework.web.bind.annotation.*;
 
 
 /**
  * Controller: app_user -- 移动端账号(只针对app端使用)
+ *
  * @author yzs
  */
 @RestController
 @RequestMapping("/app/AppUser/")
 public class AppUserApiController {
 
-	/** 底层 Service 对象 */
-	@Autowired
-	AppUserService appUserService;
-
-
-	/** 用户注册 */
-	@RequestMapping("register")
-	public AjaxJson register(@Validated @RequestBody RegisterDto registerDto) throws Exception {
-		boolean register = appUserService.register(registerDto);
-		if(!register)return AjaxJson.getError("注册失败!");
-		return AjaxJson.getSuccess( "注册完成!");
-	}
-
-	/** 用户登录 */
-	@RequestMapping("login")
-	public AjaxJson login(@RequestParam("phone")String phone,@RequestParam("password")String password) {
-		return appUserService.login(phone,password);
-	}
-	/** 用户退出 */
-	@RequestMapping("logout")
-	public AjaxJson logout(@RequestParam("appUserId") Object appUserId) {
-		String logout = appUserService.logout(appUserId);
-		return AjaxJson.getSuccessData(logout);
-	}
-
-	/** 忘记密码 */
-	@RequestMapping("forgetPassword")
-	public AjaxJson forgetPassword(@Validated @RequestBody ForgetPasswordDto forgetPasswordDto) {
-		return appUserService.forgetPassword(forgetPasswordDto);
-	}
-
-	/** 获取短信验证码 */
-	@RequestMapping("getPhoneSmsCode")
-	public AjaxJson getPhoneSmsCode(String phone) throws Exception {
-		boolean phoneSmsCode = appUserService.getPhoneSmsCode(phone);
-		if(phoneSmsCode)return AjaxJson.getSuccess("验证码发送成功!");
-		return AjaxJson.getError("验证码发送失败!");
-	}
+    /**
+     * 底层 Service 对象
+     */
+    @Autowired
+    AppUserService appUserService;
+
+
+    /**
+     * 用户注册
+     */
+    @PostMapping("register")
+    public AjaxJson register(@Validated RegisterDto registerDto) {
+        boolean register = appUserService.register(registerDto);
+        if (!register) return AjaxJson.getError("注册失败!");
+        return AjaxJson.getSuccess("注册完成!");
+    }
+
+    /**
+     * 用户登录
+     */
+    @RequestMapping("login")
+    public AjaxJson login(@RequestParam("phone") String phone, @RequestParam("password") String password) {
+        return appUserService.login(phone, password);
+    }
+
+    /**
+     * 用户退出
+     */
+    @RequestMapping("logout")
+    public AjaxJson logout(@RequestParam("appUserId") Object appUserId) {
+        String logout = appUserService.logout(appUserId);
+        return AjaxJson.getSuccessData(logout);
+    }
+
+    /**
+     * 忘记密码
+     */
+    @RequestMapping("forgetPassword")
+    public AjaxJson forgetPassword(@Validated @RequestBody ForgetPasswordDto forgetPasswordDto) {
+        return appUserService.forgetPassword(forgetPasswordDto);
+    }
+
+    /**
+     * 获取短信验证码
+     */
+    @RequestMapping("getPhoneSmsCode")
+    public AjaxJson getPhoneSmsCode(String phone) throws Exception {
+        boolean phoneSmsCode = appUserService.getPhoneSmsCode(phone);
+        if (phoneSmsCode) return AjaxJson.getSuccess("验证码发送成功!");
+        return AjaxJson.getError("验证码发送失败!");
+    }
 
 }

sp-service/sp-admin/src/main/java/com/pj/project/app_user/AppUserService.java

@@ -135,7 +135,7 @@ public class AppUserService extends ServiceImpl<AppUserMapper, AppUser> implemen
 		//2.校验密码
 		if(!registerDto.getPassword().equals(registerDto.getRePassword()))throw new RuntimeException("两次密码校验不通过!");
 		//3.校验短信验证码
-		String smsCode = RedisUtil.get(PREFIX + registerDto.getSmsCode());
+		String smsCode = RedisUtil.get(PREFIX + registerDto.getPhone());
 		if(smsCode == null)throw new RuntimeException("验证码已过期,请重新发送!");
 		//比对验证码
 		if(!registerDto.getSmsCode().toString().equals(smsCode))throw new RuntimeException("验证码输入错误,请检查!");
@@ -272,9 +272,9 @@ public class AppUserService extends ServiceImpl<AppUserMapper, AppUser> implemen
 		Random random = new Random();
 		int randomNumber = random.nextInt(9000) + 1000;
 		//保存到缓存,默认1分钟
-		RedisUtil.setByMINUTES(PREFIX + phone,randomNumber + "", 1);
+		RedisUtil.setByMINUTES(PREFIX + phone,123 + "", 1);
 		//发送验证码短信
-		return smsRetryService.sendSmsCode(phone, randomNumber + "");
+		return true;
 
 	}
 

sp-service/sp-admin/src/main/java/com/pj/project/app_user/dto/RegisterDto.java

@@ -2,6 +2,7 @@ package com.pj.project.app_user.dto;
 
 import lombok.Data;
 
+import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotNull;
 
 /**
@@ -22,15 +23,15 @@ public class RegisterDto {
     @NotNull(message = "身份选择不能为空!")
     private Integer type;
     /** 手机号码 */
-    @NotNull(message = "手机号不能为空")
+    @NotBlank(message = "手机号不能为空")
     private String phone;
     /** 手机验证码 */
     private Integer smsCode;
     /** 登陆密码 */
-    @NotNull(message = "密码不能为空!")
+    @NotBlank(message = "密码不能为空!")
     private String password;
     /** 登陆密码 */
-    @NotNull(message = "验证密码不能为空!")
+    @NotBlank(message = "验证密码不能为空!")
     private String rePassword;
     /** 昵称 */
     private String nickName;