面辅料制单人

jeecg-boot-module-system/src/main/java/org/jeecg/modules/splfi/controller/SyPackingListFabricController.java

@@ -24,11 +24,13 @@ import com.google.gson.GsonBuilder;
 import org.apache.poi.ss.usermodel.*;
 import org.apache.poi.xssf.usermodel.XSSFFormulaEvaluator;
 import org.apache.poi.xssf.usermodel.XSSFWorkbook;
+import org.jeecg.common.constant.CommonConstant;
 import org.jeecg.common.exception.JeecgBootException;
 import org.jeecg.common.system.api.ISysBaseAPI;
 import org.jeecg.common.system.util.JwtUtil;
 import org.jeecg.common.system.vo.LoginUser;
 import org.apache.shiro.SecurityUtils;
+import org.jeecg.common.util.RedisUtil;
 import org.jeecg.common.util.oConvertUtils;
 import org.jeecg.modules.documents.orderData.entity.SyOrderData;
 import org.jeecg.modules.documents.orderData.entity.SyOrderDataItem;
@@ -45,6 +47,8 @@ import org.jeecg.modules.splt.entity.SyPackingListTailoring;
 import org.jeecg.modules.splt.entity.SyPackingListTailoringItem;
 import org.jeecg.modules.splt.service.ISyPackingListTailoringService;
 import org.jeecg.modules.system.controller.CommonController;
+import org.jeecg.modules.system.entity.SysUser;
+import org.jeecg.modules.system.mapper.SysUserMapper;
 import org.jeecgframework.poi.excel.ExcelImportUtil;
 import org.jeecgframework.poi.excel.def.NormalExcelConstants;
 import org.jeecgframework.poi.excel.entity.ExportParams;
@@ -152,6 +156,9 @@ public class SyPackingListFabricController {
 		return result.OK(pageList);
 	}
 
+	 @Autowired
+	 private RedisUtil redisUtil;//redisUtill
+
 	 @AutoLog(value = "参照发运明细")
 	 @ApiOperation(value="参照发运明细", notes="参照发运明细")
 	 @GetMapping(value = "/getShippingDetails")
@@ -171,6 +178,7 @@ public class SyPackingListFabricController {
 			 HttpServletRequest req) {
 		 //只有成衣才能被选中,筛选为成衣的订单,需要加个条件
 		 Result<IPage<SyShippingDetailsVo>> result = new Result<IPage<SyShippingDetailsVo>>();
+		 String token = req.getHeader("X-Access-Token");//获取token
 		 QueryWrapper<SyShippingDetailsVo> queryWrapper = new QueryWrapper<>();
 		 if(oConvertUtils.isNotEmpty(documentNo)) {//单据号
 			 queryWrapper.like("t.documentNo", documentNo);//单据号
@@ -246,7 +254,8 @@ public class SyPackingListFabricController {
 	@AutoLog(value = "装箱单-面辅料-添加")
 	@ApiOperation(value="装箱单-面辅料-添加", notes="装箱单-面辅料-添加")
 	@PostMapping(value = "/add")
-	public Result<SyPackingListFabric> add(@RequestBody SyPackingListFabric syPackingListFabric) {
+	public Result<SyPackingListFabric> add(@RequestBody SyPackingListFabric syPackingListFabric,HttpServletRequest req) {
+		String token = req.getHeader("X-Access-Token");//获取token
 		Result<SyPackingListFabric> result=new Result<>();
 		if(oConvertUtils.isEmpty(syPackingListFabric)){
 			result.setSuccess(false);
@@ -254,7 +263,7 @@ public class SyPackingListFabricController {
 			result.setResult(null);
 			return result;
 		}
-		syPackingListFabricService.saveMain(syPackingListFabric);
+		syPackingListFabricService.saveMain(syPackingListFabric,token);
 		result.setSuccess(true);
 		result.setMessage("添加成功");
 		result.setResult(syPackingListFabric);
@@ -499,13 +508,14 @@ public class SyPackingListFabricController {
 	public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
 	  MultipartHttpServletRequest multipartRequest = (MultipartHttpServletRequest) request;
 	  Map<String, MultipartFile> fileMap = multipartRequest.getFileMap();
+	  String token = request.getHeader("X-Access-Token");//获取token
 	  for (Map.Entry<String, MultipartFile> entity : fileMap.entrySet()){
 		  try {
 			  MultipartFile file = entity.getValue();// 获取上传文件对象
 			  InputStream inputStream=file.getInputStream();
 			  Workbook workbook=new XSSFWorkbook(inputStream);
 			  Map<String,SyPackingListFabric> maps=refreshSheet(workbook);
-			  boolean bool= syPackingListFabricService.excelAdd(maps);//循环
+			  boolean bool= syPackingListFabricService.excelAdd(maps,token);//循环
 			  if(bool==false){
 				  return Result.error("文件导入失败");
 			  }

jeecg-boot-module-system/src/main/java/org/jeecg/modules/splfi/service/ISyPackingListFabricService.java

@@ -28,7 +28,7 @@ public interface ISyPackingListFabricService extends IService<SyPackingListFabri
 	 * 添加一对多
 	 * 
 	 */
-	public SyPackingListFabric saveMain(SyPackingListFabric syPackingListFabric) ;
+	public SyPackingListFabric saveMain(SyPackingListFabric syPackingListFabric,String token) ;
 	
 	/**
 	 * 修改一对多
@@ -75,7 +75,7 @@ public interface ISyPackingListFabricService extends IService<SyPackingListFabri
 
     void saveList(List<SyPackingListFabric> syPackingListFabrics);
 
-    boolean excelAdd(Map<String,SyPackingListFabric> maps);
+    boolean excelAdd(Map<String,SyPackingListFabric> maps,String token);
 
 	String excelTest(Map<String, SyPackingListFabric> maps);
 

jeecg-boot-module-system/src/main/java/org/jeecg/modules/splfi/service/impl/SyPackingListFabricServiceImpl.java

@@ -8,6 +8,7 @@ import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import org.apache.shiro.SecurityUtils;
 import org.jeecg.common.exception.JeecgBootException;
+import org.jeecg.common.system.util.JwtUtil;
 import org.jeecg.common.system.vo.LoginUser;
 import org.jeecg.config.InterfaceConnUtils;
 import org.jeecg.modules.documents.orderData.entity.SyOrderDataItem;
@@ -44,6 +45,7 @@ import org.jeecg.modules.splt.entity.SyPackingListTailoring;
 import org.jeecg.modules.splt.entity.SyPackingListTailoringItem;
 import org.jeecg.modules.splt.mapper.SyPackingListTailoringMapper;
 import org.jeecg.modules.system.entity.SysUser;
+import org.jeecg.modules.system.mapper.SysUserMapper;
 import org.jeecg.modules.system.util.JsonChangeUtils;
 import org.jeecg.modules.system.util.oConvertUtils;
 import org.quartz.Job;
@@ -94,6 +96,16 @@ public class SyPackingListFabricServiceImpl extends ServiceImpl<SyPackingListFab
 	private ISenYuDataSourceThree senYuDataSourceThree;
 	@Autowired
 	private IDxpDataPlanService dxpDataPlanService;
+	@Autowired
+	private SysUserMapper userMapper;//userMapper
+
+	String getUsername(String token){
+		String username= JwtUtil.getUsername(token);
+		QueryWrapper queryWrapper2=new QueryWrapper();
+		queryWrapper2.eq("username",username);
+		SysUser roleName=userMapper.selectOne(queryWrapper2);
+		return  roleName.getRealname();
+	}
 
 	/**
 	 * 通过参照出运明细添加数据  添加方式1
@@ -102,15 +114,15 @@ public class SyPackingListFabricServiceImpl extends ServiceImpl<SyPackingListFab
 	 */
 	@Override
 	@Transactional
-	public synchronized SyPackingListFabric saveMain(SyPackingListFabric syPackingListFabric) {
+	public synchronized SyPackingListFabric saveMain(SyPackingListFabric syPackingListFabric,String token) {
 		SimpleDateFormat sf = new SimpleDateFormat("yyMMddHHmmssSSS");
 		String dateNo ="ML"+sf.format(System.currentTimeMillis());//获取单据号
 		syPackingListFabric.setDelFlag("0");
 		syPackingListFabric.setStatus("0");
 		syPackingListFabric.setDocumentNo(dateNo);//单据号
 		syPackingListFabric.setDataSource("参照出运明细");//参照
-		syPackingListFabric.setPreparedBy("admin");//将admin设置为制单人
-		syPackingListFabric.setCreateBy("admin");//将admin设置为制单人
+		syPackingListFabric.setPreparedBy(getUsername(token));//将admin设置为制单人
+		syPackingListFabric.setCreateBy(getUsername(token));//将admin设置为制单人
 		syPackingListFabricMapper.insert(syPackingListFabric);
 		Map<String,String> mapId=new HashMap<String, String>();//key为发运明细子表id，value为分组id
 		BigDecimal total=new BigDecimal("0");//合计数量，初始为0
@@ -694,7 +706,7 @@ public class SyPackingListFabricServiceImpl extends ServiceImpl<SyPackingListFab
 	 */
 	@Override
 	@Transactional
-	public boolean excelAdd(Map<String,SyPackingListFabric> maps) {
+	public boolean excelAdd(Map<String,SyPackingListFabric> maps,String token) {
 		boolean bool=false;
 		try{
 			for (String str : maps.keySet()){
@@ -705,8 +717,8 @@ public class SyPackingListFabricServiceImpl extends ServiceImpl<SyPackingListFab
 				syPackingListFabric.setDocumentNo(dateNo);//单据号
 				syPackingListFabric.setStatus("0");//状态
 				syPackingListFabric.setDataSource("excel导入");//excel导入
-				syPackingListFabric.setPreparedBy("admin");//制单人
-				syPackingListFabric.setCreateBy("admin");//制单人
+				syPackingListFabric.setPreparedBy(getUsername(token));//将admin设置为制单人
+				syPackingListFabric.setCreateBy(getUsername(token));//将admin设置为制单人
 				//syPackingListFabric.setPreparedDate(new SimpleDateFormat("yyyy-MM-dd").parse(new SimpleDateFormat("yyyy-MM-dd").format(System.currentTimeMillis())));
 				syPackingListFabric.setDelFlag("0");//是否删除
 				syPackingListFabricMapper.insert(syPackingListFabric);

jeecg-boot-module-system/src/main/java/org/jeecg/modules/splt/controller/SyPackingListTailoringController.java

@@ -1224,6 +1224,10 @@ public class SyPackingListTailoringController {
 		 String accessToken = request.getHeader("X-Access-Token");
 		 System.out.println("token的值为:\t"+accessToken);
 		 Result result=new Result();
+		 if (true){
+			 result.setResult(redisUtil.get(CommonConstant.SQL_INDEX_UNIQ_SYS_USER_USERNAME));
+			 return result;
+		 }
 		 if(redisUtil.get(CommonConstant.PREFIX_USER_TOKEN + "testData")!=null){
 			 result.setTimestamp(redisUtil.getExpire(CommonConstant.PREFIX_USER_TOKEN + "testData"));
 			 result.setResult(redisUtil.get(CommonConstant.PREFIX_USER_TOKEN + "testData"));