7.24

sp-service/level-one-server/src/main/java/com/pj/tb_goods/TbGoodsService.java

@@ -64,6 +64,7 @@ public class TbGoodsService extends ServiceImpl<TbGoodsMapper, TbGoods> implemen
 		return tbGoodsMapper.getList(so);	
 	}
 
+
 	/**
 	 * 导入
 	 * @param file excel文件

sp-service/level-one-server/src/main/java/com/pj/tb_goods_transit/TbGoodsTransitController.java

@@ -104,6 +104,13 @@ public class TbGoodsTransitController {
 		return AjaxJson.getByLine(line);
 	}
 
+	/** 查看一级市场的在校商品列表 */
+	@GetMapping("getTransitList")
+	public AjaxJson getTransitList(){
+		SoMap so = SoMap.getRequestSoMap();
+		List<TbGoodsTransit> transitList = tbGoodsTransitService.getTransitList(so.startPage());
+		return AjaxJson.getPageData(so.getDataCount(),transitList);
+	}
 
 
 	/**
@@ -131,7 +138,8 @@ public class TbGoodsTransitController {
 	 */
 	@RequestMapping("goodsTransitOutport")
 	@ResponseBody
-	public AjaxJson dataOutport(@RequestParam(value = "keyword",required = false) String keyword,@RequestParam(value = "filepath",required = false)String filepath){
+	public AjaxJson dataOutport(@RequestParam(value = "keyword",required = false) String keyword,
+								@RequestParam(value = "filepath",required = false)String filepath){
 		try {
 			String importData = tbGoodsTransitService.outportExcel(keyword,filepath);
 			AjaxJson.getSuccess(importData);

sp-service/level-one-server/src/main/java/com/pj/tb_goods_transit/TbGoodsTransitService.java

@@ -4,10 +4,12 @@ import java.io.FileOutputStream;
 import java.io.IOException;
 import java.time.LocalDateTime;
 import java.time.format.DateTimeFormatter;
+import java.util.Date;
 import java.util.List;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.pj.tb_enterprise.TbEnterprise;
+import com.pj.tb_goods_transit.param.JudgeTransitParam;
 import com.pj.utils.so.SoMap;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.poi.hssf.usermodel.HSSFRow;
@@ -64,6 +66,46 @@ public class TbGoodsTransitService extends ServiceImpl<TbGoodsTransitMapper, TbG
 		return tbGoodsTransitMapper.getList(so);	
 	}
 
+	/** 查看一级市场在销商品 */
+	List<TbGoodsTransit> getTransitList(SoMap so){
+		//获取在销商品列表,根据日期进行降序排序
+		List<TbGoodsTransit> goodsTransitList = tbGoodsTransitMapper.selectList
+				(new LambdaQueryWrapper<TbGoodsTransit>()
+						.eq(TbGoodsTransit::getAuditStatus, 1) //审核状态
+						.eq(TbGoodsTransit::getGoodsStatus, 1)  //在销状态
+						.eq(TbGoodsTransit::getDeleteStatus, 1) //删除状态
+						.orderByDesc(TbGoodsTransit::getCreateTime)); //创建时间降序
+		return goodsTransitList;
+	}
+
+	/** 审核在销商品,可批量 */
+	String judgeTransit(JudgeTransitParam judgeTransitParam){
+		//获取审核id
+		List<String> ids = judgeTransitParam.getIds();
+		if(ids.size() == 0)return "没有需要审核的数据。";
+		//获取审核状态
+		Integer judgeStatus = judgeTransitParam.getJudgeStatus();
+		//添加审核计数器
+		int count = 0;
+		//开始审核
+		for (String item : ids) {
+			TbGoodsTransit tbGoodsTransit = tbGoodsTransitMapper.selectById(item);
+			//判断对象值和该对象是否已经审核过了
+			if(tbGoodsTransit == null || tbGoodsTransit.getAuditStatus() != 0){
+				continue;
+			}
+			//设置审核状态
+			tbGoodsTransit.setAuditStatus(judgeStatus);
+			//设置审核内容
+			tbGoodsTransit.setRemark(judgeTransitParam.getRemark());
+			//设置基本参数
+			tbGoodsTransit.setAuditTime(new Date());
+			//保存结果
+			int i = tbGoodsTransitMapper.updateById(tbGoodsTransit);
+			if(i == 1)count += 1;
+		}
+		return "已完成 " + count + "条 数据审核!";
+	}
 
 	/**
 	 * 导入

sp-service/level-one-server/src/main/java/com/pj/tb_goods_transit/param/JudgeTransitParam.java

@@ -0,0 +1,29 @@
+package com.pj.tb_goods_transit.param;
+
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * @Author Mechrevo
+ * @Date 2023 07 24 14 00
+ **/
+@Data
+public class JudgeTransitParam {
+
+    /**
+     * 批量审核时的ID集合
+     */
+    private List<String> ids;
+
+    /**
+     * 审核状态
+     */
+    private Integer judgeStatus;
+
+    /**
+     * 审核不通过时的备注
+     */
+    private String remark;
+
+}

sp-service/level-one-server/src/main/java/com/pj/tb_people/TbPeopleController.java

@@ -63,7 +63,7 @@ public class TbPeopleController {
 
 	/** 查 - 根据id */  
 	@RequestMapping("getById")
-		@SaCheckPermission(TbPeople.PERMISSION_CODE)
+//	@SaCheckPermission(TbPeople.PERMISSION_CODE)
 	public AjaxJson getById(String id){
 		TbPeople t = tbPeopleService.getById(id);
 		return AjaxJson.getSuccessData(t);
@@ -88,7 +88,29 @@ public class TbPeopleController {
 		return AjaxJson.getByLine(line);
 	}
 
+	/** 审核 */
+	@PostMapping("judge")
+	public AjaxJson judge(TbPeople tbPeople){
+		boolean judge = tbPeopleService.judge(tbPeople);
+		if(judge){
+			return AjaxJson.getSuccess("审核成功!");
+		}
+		return AjaxJson.getError("审核失败!");
+	}
 
+	/** 启/停 */
+	@PostMapping("isLock")
+	public AjaxJson isLock(TbPeople tbPeople){
+		boolean lock = tbPeopleService.isLock(tbPeople);
+		return AjaxJson.getSuccess(lock + "");
+	}
+
+	/** 身份识别 */
+	@PostMapping("identification")
+	//TODO: 身份识别
+	public AjaxJson identification(){
+		return AjaxJson.getSuccess();
+	}
 
 	/**
 	 * 数据导入接口

sp-service/level-one-server/src/main/java/com/pj/tb_people/TbPeopleService.java

@@ -4,8 +4,10 @@ import java.io.FileOutputStream;
 import java.io.IOException;
 import java.time.LocalDateTime;
 import java.time.format.DateTimeFormatter;
+import java.util.Date;
 import java.util.List;
 
+import cn.dev33.satoken.stp.StpUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.pj.tb_goods_transit.TbGoodsTransit;
 import com.pj.utils.so.SoMap;
@@ -54,6 +56,7 @@ public class TbPeopleService extends ServiceImpl<TbPeopleMapper, TbPeople> imple
 
 	}
 
+
 	/** 查 */
 	TbPeople getById(String id){
 		return super.getById(id);
@@ -65,6 +68,91 @@ public class TbPeopleService extends ServiceImpl<TbPeopleMapper, TbPeople> imple
 	}
 
 	/**
+	 * 审核
+	 */
+	boolean judge(TbPeople tbPeople){
+		//获取当前登陆人
+		String loginUser = "admin";
+		//获取当前被审核人的编号和审核情况
+		Long id = tbPeople.getId();
+		Integer judgeStatus = tbPeople.getJudgeStatus();
+		//获取被审核人
+		TbPeople tbPeople1 = tbPeopleMapper.selectById(id);
+		if(tbPeople1 == null)throw new RuntimeException("审核用户不存在,请检查!");
+		//判断删除状态
+		Integer deleteStatus = tbPeople1.getDeleteStatus();
+		if(deleteStatus == 0)throw new RuntimeException("该用户已被删除,无法进行审核");
+		//设置审核状态
+		tbPeople1.setJudgeStatus(judgeStatus);
+		if(id == 0) tbPeople1.setJudgeContent(tbPeople.getJudgeContent());
+		//设置审核人
+		tbPeople1.setPersonId(loginUser);
+		//审核时间
+		tbPeople1.setJudgeTime(new Date());
+		//保存
+		int i = tbPeopleMapper.updateById(tbPeople1);
+		return i == 1;
+
+	}
+
+	/**
+	 * 启/停
+	 */
+	boolean isLock(TbPeople tbPeople){
+		//获取被修改用户id
+		Long id = tbPeople.getId();
+		//查询
+		TbPeople tbPeople1 = tbPeopleMapper.selectById(id);
+		if(tbPeople1 == null)throw new RuntimeException("审核用户不存在,请检查!");
+		//判断删除状态
+		Integer deleteStatus = tbPeople1.getDeleteStatus();
+		if(deleteStatus == 0)throw new RuntimeException("该用户已被删除,无法进行启/停操作!");
+		//获取启停状态
+		Integer isLock = tbPeople.getIsLock();
+		//设置启/停
+		tbPeople1.setIsLock(isLock);
+		//保存结果
+		int i = tbPeopleMapper.updateById(tbPeople1);
+		return i == 1;
+	}
+
+	/**
+	 * TODO: 对接单一窗口商务端实现身份识别（预留认证接口）
+	 */
+	void identification(){
+
+	}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+	/**
 	 * 导入
 	 * @param file excel文件
 	 * @return

sp-service/sp-admin/src/main/java/com/pj/project4sp/admin4login/SpAccAdminService.java

@@ -93,8 +93,7 @@ public class SpAccAdminService {
         // =========== 至此, 已登录成功 ============ 
         successLogin(admin);
         StpUtil.login(admin.getId());
-
-        // 组织返回参数  
+        // 组织返回参数
         SoMap map = new SoMap();
         map.put("admin", admin);
         List<String> per_list = spRolePermissionService.getPcodeByRid2(admin.getRoleId());

sp-service/transport-server/src/main/java/com/pj/project/tb_driver/TbDriverController.java

@@ -16,7 +16,7 @@ import org.springframework.web.multipart.MultipartFile;
 
 
 /**
- * Controller: tb_driver -- 司机
+ *  -- 司机
  * @author qzy 
  */
 @RestController
@@ -33,6 +33,7 @@ public class TbDriverController {
 	public AjaxJson add(TbDriver t){
 		tbDriverService.add(t);
 		t = tbDriverService.getById(SP.publicMapper.getPrimarykey());
+		StpUserUtil.getLoginIdAsString()
 		return AjaxJson.getSuccessData(t);
 	}
 
@@ -111,6 +112,7 @@ public class TbDriverController {
 		try {
 			String importData = tbDriverService.outportExcel(keyword,filepath);
 			AjaxJson.getSuccess(importData);
+
 		} catch (IOException e) {
 			throw new RuntimeException(e);
 		}