From c302bb6578b18a772db5ee79a2c5ef7205452aa2 Mon Sep 17 00:00:00 2001 From: zhangjinli Date: Thu, 23 Jun 2022 11:40:35 +0800 Subject: [PATCH] zh --- pom.xml | 7 ++ .../controller/UtilsController.java | 52 ++++++++--- .../controller/wxApp/UserUController.java | 2 +- .../com/zh/project0512/mapper/UserMapper.java | 2 + .../java/com/zh/project0512/model/User.java | 1 + .../zh/project0512/service/IUserService.java | 1 + .../serviceImpl/UserServiceImpl.java | 4 +- .../com/zh/project0512/utils/excelUtil.java | 87 +++++++++++++++++++ src/main/resources/mapper/ReferenceMapper.xml | 4 +- 9 files changed, 146 insertions(+), 14 deletions(-) create mode 100644 src/main/java/com/zh/project0512/utils/excelUtil.java diff --git a/pom.xml b/pom.xml index 6238311..76ce931 100644 --- a/pom.xml +++ b/pom.xml @@ -166,6 +166,13 @@ + + + org.apache.poi + poi + 5.2.2 + + diff --git a/src/main/java/com/zh/project0512/controller/UtilsController.java b/src/main/java/com/zh/project0512/controller/UtilsController.java index 7338f2d..3595534 100644 --- a/src/main/java/com/zh/project0512/controller/UtilsController.java +++ b/src/main/java/com/zh/project0512/controller/UtilsController.java @@ -86,18 +86,50 @@ public class UtilsController { return Result.fail(HttpStatusEnum.CUSTOM_EXCEPTION, "上传失败"); } - @PostMapping("/uploadImg") - public Result uploadImg(@RequestParam("file") MultipartFile file, @RequestParam(value = "name", defaultValue = "name") String name) { +// @PostMapping("/uploadImg") +// public Result uploadImg(@RequestParam("file") MultipartFile file, @RequestParam(value = "name", defaultValue = "name") String name) { +// try { +// String homeImage = aliyunOss.checkImage(file);//此处是调用上传服务接口 +// String fileUrl = aliyunOss.getImgUrl(homeImage); +// String fileType = FileTypeUtil.getcontentType((fileUrl.substring(fileUrl.lastIndexOf(".")))); +// System.out.println(fileType == "video/mp4" ? 1 : (fileType == "image/jpg" ? 2 : (fileType == "text/plain" ? 3 : 0))); +// Result result = Result.success("上传成功!"); +// return result; +// } catch (Exception e) { +// e.printStackTrace(); +// return Result.fail(HttpStatusEnum.NOT_FOUND); +// } +// } + + @Operation(summary = "编辑器内上传") + @PostMapping("/upload2") + @ResponseBody + public JSONObject upload2(@RequestParam("file") MultipartFile file, @RequestParam(required = false) String name) { + JSONObject res = new JSONObject(); + res.put("errno",0); + if (file.isEmpty()) { + res.put("message","请选择文件"); + return res; + } + String fileName = file.getOriginalFilename();//文件名 + String newFileName = UUID.randomUUID().toString().replace("-", "") + LocalDateTime.now().toInstant(ZoneOffset.ofHours(8)).toEpochMilli() + fileName.substring(fileName.lastIndexOf(".")); + File dest = new File(path + "/" + newFileName); + if (!dest.getParentFile().exists()) { + dest.getParentFile().mkdirs(); + } try { - String homeImage = aliyunOss.checkImage(file);//此处是调用上传服务接口 - String fileUrl = aliyunOss.getImgUrl(homeImage); - String fileType = FileTypeUtil.getcontentType((fileUrl.substring(fileUrl.lastIndexOf(".")))); - System.out.println(fileType == "video/mp4" ? 1 : (fileType == "image/jpg" ? 2 : (fileType == "text/plain" ? 3 : 0))); - Result result = Result.success("上传成功!"); - return result; - } catch (Exception e) { + file.transferTo(dest); + res.replace("errno",1); + res.put("alt", fileName); + res.put("url", "/upload/" + newFileName); + res.put("fileType", FileTypeUtil.getcontentType((fileName.substring(fileName.lastIndexOf("."))))); + res.put("fileTypeNum", FileTypeUtil.getcontentTypeNum((fileName.substring(fileName.lastIndexOf("."))))); + return res; + } catch (IOException e) { e.printStackTrace(); - return Result.fail(HttpStatusEnum.NOT_FOUND); } + res.put("message","上传失败"); + return res; } + } diff --git a/src/main/java/com/zh/project0512/controller/wxApp/UserUController.java b/src/main/java/com/zh/project0512/controller/wxApp/UserUController.java index 05104fa..9c66314 100644 --- a/src/main/java/com/zh/project0512/controller/wxApp/UserUController.java +++ b/src/main/java/com/zh/project0512/controller/wxApp/UserUController.java @@ -45,7 +45,7 @@ public class UserUController { public Result login(@RequestBody @Parameter(hidden = true) JSONObject obj) { JSONObject res = weChatUtil.auth(obj.getString("code")); String openid = res.getString("openid"); - User u = userService.selByOpenid(openid); + Map u = userService.selByOpenid2(openid); if (null == u) { return Result.fail(HttpStatusEnum.USER_NOT_EXIST, "未注册!"); } diff --git a/src/main/java/com/zh/project0512/mapper/UserMapper.java b/src/main/java/com/zh/project0512/mapper/UserMapper.java index 07a56b9..4ff91bd 100644 --- a/src/main/java/com/zh/project0512/mapper/UserMapper.java +++ b/src/main/java/com/zh/project0512/mapper/UserMapper.java @@ -23,6 +23,8 @@ import java.util.Map; public interface UserMapper extends BaseMapper { @Select("SELECT * FROM user where openid=#{openid} ") User selByOpenid(@Param("openid") String openid); + @Select("SELECT t1.*,t2.name as departmentName FROM user t1 left join qywxDepartment t2 on t1.main_department = t2.departmentId where openid=#{openid} ") + Map selByOpenid2(@Param("openid") String openid); @Select("UPDATE user set token=#{token},lastLoginAt=#{time} where openid=#{openid}") void updByOpenid(String openid, String token, LocalDateTime time); @Select("SELECT t1.name,t1.tel,t1.avatar,t1.main_department,t1.sub_department,t1.creatAt,t1.updateAt,t1.lastLoginAt" + diff --git a/src/main/java/com/zh/project0512/model/User.java b/src/main/java/com/zh/project0512/model/User.java index bcf6c68..b722116 100644 --- a/src/main/java/com/zh/project0512/model/User.java +++ b/src/main/java/com/zh/project0512/model/User.java @@ -83,6 +83,7 @@ public class User extends Model { * 最高级部门id */ @Schema(title = "最高级部门id") + @TableField("sub_department") private Integer sub_department; /** * 创建时间 diff --git a/src/main/java/com/zh/project0512/service/IUserService.java b/src/main/java/com/zh/project0512/service/IUserService.java index c301222..2468fd2 100644 --- a/src/main/java/com/zh/project0512/service/IUserService.java +++ b/src/main/java/com/zh/project0512/service/IUserService.java @@ -21,6 +21,7 @@ import java.util.Map; */ public interface IUserService extends IService { public User selByOpenid(String openid); + Map selByOpenid2(@Param("openid") String openid); public void updByOpenid(String openid, String token, LocalDateTime time); IPage pageList(IPage iPage, @Param("ew") Wrapper queryWrapper); } diff --git a/src/main/java/com/zh/project0512/serviceImpl/UserServiceImpl.java b/src/main/java/com/zh/project0512/serviceImpl/UserServiceImpl.java index c80acb1..6f67978 100644 --- a/src/main/java/com/zh/project0512/serviceImpl/UserServiceImpl.java +++ b/src/main/java/com/zh/project0512/serviceImpl/UserServiceImpl.java @@ -31,7 +31,9 @@ public class UserServiceImpl extends ServiceImpl implements IU public User selByOpenid(String openid) { return userMapper.selByOpenid(openid); } - + public Map selByOpenid2(@Param("openid") String openid) { + return userMapper.selByOpenid2(openid); + } public void updByOpenid(String openid, String token, LocalDateTime time) { userMapper.updByOpenid(openid, token, time); } diff --git a/src/main/java/com/zh/project0512/utils/excelUtil.java b/src/main/java/com/zh/project0512/utils/excelUtil.java new file mode 100644 index 0000000..2f96503 --- /dev/null +++ b/src/main/java/com/zh/project0512/utils/excelUtil.java @@ -0,0 +1,87 @@ +//package com.zh.project0512.utils; +// +//import org.apache.poi.hssf.usermodel.HSSFWorkbook; +//import org.springframework.stereotype.Service; +//import org.springframework.transaction.annotation.Transactional; +//import org.springframework.transaction.interceptor.TransactionAspectSupport; +// +//import javax.annotation.Resource; +//import javax.servlet.http.HttpServletRequest; +//import javax.servlet.http.HttpServletResponse; +//import java.io.OutputStream; +//import java.io.UnsupportedEncodingException; +//import java.text.SimpleDateFormat; +//import java.util.*; +// +//public class ExcelUtil { +// +// public void export(HttpServletRequest request, HttpServletResponse response,Integer chargesTemplateId) { +// //获取数据 +// SearchChargesTemplateDetail searchChargesTemplateDetail = new SearchChargesTemplateDetail(); +// searchChargesTemplateDetail.setChargesTemplateId(chargesTemplateId); +// List voChargesTemplateDetailList = sysChargesTemplateDetailDao.list(searchChargesTemplateDetail); +// +// //excel标题 +// String[] title = {"序号","费用名称","计费单价/单位","附加/固定费用","状态","创建人","更新时间"}; +// +// //excel文件名 +// String fileName = "收费标准管理表"+System.currentTimeMillis()+".xls"; +// +// //sheet名 +// String sheetName = "收费标准管理表"; +// +// +// //初始化内容容器1 +// String[][] content = new String[voChargesTemplateDetailList.size()][]; +// for (int i = 0; i < voChargesTemplateDetailList.size(); i++) { +// //初始化内容容器2 +// content[i] = new String[title.length]; +// //获取 当前物业收费标准明细Vo +// VoChargesTemplateDetail voChargesTemplateDetail = voChargesTemplateDetailList.get(i); +// //传入序号 +// content[i][0] = String.valueOf(i+1); +// //传入费用名称 +// content[i][1] = voChargesTemplateDetail.getName(); +// +// //传入计费单价/单位 +// //查询计费单位显示名称 +// String typeShowName = sysChargesTemplateDetailDao.findTypeShowNameByShowValue(voChargesTemplateDetail.getType()); +// content[i][2] = voChargesTemplateDetail.getUnitPrice().toString()+typeShowName; +// +// //传入附加/固定费用 +// List additionalCostList = sysChargesTemplateDetailDao.findAdditionalCostById(voChargesTemplateDetail.getId()); +// if (additionalCostList != null && additionalCostList.size()>0){ +// content[i][3] = ""; +// for (VoChargesTemplateAdditionalCost additionalCost : additionalCostList) { +// content[i][3] += additionalCost.getName()+":"+additionalCost.getCost()+"/r/n"; +// } +// }else { +// content[i][3] = "/"; +// } +// //传入状态 +// //查询状态显示名称 +// String statusShowName = sysChargesTemplateDetailDao.findStatusShowNameByShowValue(voChargesTemplateDetail.getStatus()); +// content[i][4] = statusShowName; +// //传入创建人 +// content[i][5] = voChargesTemplateDetail.getCreateName(); +// //传入更新时间 +// SimpleDateFormat formatter = new SimpleDateFormat("yyyy.MM.dd HH:mm"); +// String format = formatter.format(voChargesTemplateDetail.getModifyDate()); +// content[i][6] = format; +// } +// +// //创建HSSFWorkbook +// HSSFWorkbook wb = ExcelUtil.getHSSFWorkbook(sheetName, title, content, null); +// +// //响应到客户端 +// try { +// this.setResponseHeader(response, fileName); +// OutputStream os = response.getOutputStream(); +// wb.write(os); +// os.flush(); +// os.close(); +// } catch (Exception e) { +// e.printStackTrace(); +// } +// } +//} diff --git a/src/main/resources/mapper/ReferenceMapper.xml b/src/main/resources/mapper/ReferenceMapper.xml index 3691e88..8d3d89c 100644 --- a/src/main/resources/mapper/ReferenceMapper.xml +++ b/src/main/resources/mapper/ReferenceMapper.xml @@ -76,8 +76,8 @@ WHERE t1.id = ur.referenceId and ur.userId = u.id and u.openid = #{openid} ) as isCollected from reference as t1 - LEFT join referenceTag as t2 on t1.id = t2.referenceId LEFT JOIN tag as t3 on t3.id = t2.tagId - LEFT join referenceBrand as t4 on t1.id = t4.referenceId LEFT JOIN brand as t5 on t5.id = t4.brandId + LEFT JOIN referenceTag as t2 on t1.id = t2.referenceId LEFT JOIN tag as t3 on t3.id = t2.tagId + LEFT JOIN referenceBrand as t4 on t1.id = t4.referenceId LEFT JOIN brand as t5 on t5.id = t4.brandId WHERE t1.id and t1.id in (SELECT referenceId from referenceTag WHERE referenceTag.tagId in