From 296ce59a1ef030da1ca8249a339a3782a673ad36 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=BD=A0=C3=A7=C2=9Acqq?= <你的2870787453@qq.com> Date: Mon, 28 Apr 2025 19:00:08 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E5=88=9D=E5=A7=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitignore | 2 +- .../java/com/annotation/APPLoginUser.java | 1 + src/main/java/com/annotation/IgnoreAuth.java | 1 - src/main/java/com/annotation/LoginUser.java | 1 - .../java/com/config/InterceptorConfig.java | 2 +- .../java/com/config/MyMetaObjectHandler.java | 1 - .../java/com/config/MybatisPlusConfig.java | 1 - .../java/com/controller/ChatController.java | 67 +++++++++---------- .../java/com/controller/CommonController.java | 55 ++++++++------- 9 files changed, 63 insertions(+), 68 deletions(-) diff --git a/.gitignore b/.gitignore index 6d345ca..0965c31 100644 --- a/.gitignore +++ b/.gitignore @@ -4,7 +4,7 @@ node_modules/ # 忽略Logs logs *.log - +# # 忽略/dist目录，相对.gitignore文件所在目录 /dist diff --git a/src/main/java/com/annotation/APPLoginUser.java b/src/main/java/com/annotation/APPLoginUser.java index 21d41b9..c4a5ecf 100644 --- a/src/main/java/com/annotation/APPLoginUser.java +++ b/src/main/java/com/annotation/APPLoginUser.java @@ -5,6 +5,7 @@ import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; + /** * 登录用户信息 */ diff --git a/src/main/java/com/annotation/IgnoreAuth.java b/src/main/java/com/annotation/IgnoreAuth.java index 7c3cc55..9e2083c 100644 --- a/src/main/java/com/annotation/IgnoreAuth.java +++ b/src/main/java/com/annotation/IgnoreAuth.java @@ -1,7 +1,6 @@ package com.annotation; import java.lang.annotation.*; - /** * 忽略Token验证 */ diff --git a/src/main/java/com/annotation/LoginUser.java b/src/main/java/com/annotation/LoginUser.java index 3d808d3..a0d020f 100644 --- a/src/main/java/com/annotation/LoginUser.java +++ b/src/main/java/com/annotation/LoginUser.java @@ -4,7 +4,6 @@ import java.lang.annotation.ElementType; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; - /** * 登录用户信息 */ diff --git a/src/main/java/com/config/InterceptorConfig.java b/src/main/java/com/config/InterceptorConfig.java index 586ccc5..32e9f64 100644 --- a/src/main/java/com/config/InterceptorConfig.java +++ b/src/main/java/com/config/InterceptorConfig.java @@ -21,7 +21,7 @@ public class InterceptorConfig extends WebMvcConfigurationSupport{ registry.addInterceptor(getAuthorizationInterceptor()).addPathPatterns("/**").excludePathPatterns("/static/**"); super.addInterceptors(registry); } - + /** * springboot 2.0配置WebMvcConfigurationSupport之后，会导致默认配置被覆盖，要访问静态资源需要重写addResourceHandlers方法 */ diff --git a/src/main/java/com/config/MyMetaObjectHandler.java b/src/main/java/com/config/MyMetaObjectHandler.java index 2f9e793..ea90555 100644 --- a/src/main/java/com/config/MyMetaObjectHandler.java +++ b/src/main/java/com/config/MyMetaObjectHandler.java @@ -5,7 +5,6 @@ import java.util.Date; import org.apache.ibatis.reflection.MetaObject; import com.baomidou.mybatisplus.mapper.MetaObjectHandler; - /** * 自定义填充处理器 */ diff --git a/src/main/java/com/config/MybatisPlusConfig.java b/src/main/java/com/config/MybatisPlusConfig.java index ec2e84b..38f9644 100644 --- a/src/main/java/com/config/MybatisPlusConfig.java +++ b/src/main/java/com/config/MybatisPlusConfig.java @@ -6,7 +6,6 @@ import org.springframework.context.annotation.Configuration; import com.baomidou.mybatisplus.mapper.MetaObjectHandler; import com.baomidou.mybatisplus.plugins.PaginationInterceptor; - /** * mybatis-plus配置 */ diff --git a/src/main/java/com/controller/ChatController.java b/src/main/java/com/controller/ChatController.java index 6571d86..f268587 100644 --- a/src/main/java/com/controller/ChatController.java +++ b/src/main/java/com/controller/ChatController.java @@ -31,13 +31,12 @@ import com.service.*; import com.utils.PageUtils; import com.utils.R; import com.alibaba.fastjson.*; - /** * 在线咨询 * 后端接口 * @author * @email -*/ + */ @RestController @Controller @RequestMapping("/chat") @@ -60,10 +59,9 @@ public class ChatController { @Autowired private YishengService yishengService; - /** - * 后端列表 - */ + * 后端列表 + */ @RequestMapping("/page") public R page(@RequestParam Map params, HttpServletRequest request){ logger.debug("page方法:,,Controller:{},,params:{}",this.getClass().getName(),JSONObject.toJSONString(params)); @@ -87,25 +85,24 @@ public class ChatController { } return R.ok().put("data", page); } - /** - * 后端详情 - */ + * 后端详情 + */ @RequestMapping("/info/{id}") public R info(@PathVariable("id") Long id, HttpServletRequest request){ logger.debug("info方法:,,Controller:{},,id:{}",this.getClass().getName(),id); ChatEntity chat = chatService.selectById(id); if(chat !=null){ - //entity转view + //entity转view ChatView view = new ChatView(); BeanUtils.copyProperties( chat , view );//把实体数据重构到view中 - - //级联表 + //级联表 YonghuEntity yonghu = yonghuService.selectById(chat.getYonghuId()); if(yonghu != null){ BeanUtils.copyProperties( yonghu , view ,new String[]{ "id", "createTime", "insertTime", "updateTime"});//把级联的数据添加到view中,并排除id和创建时间字段 view.setYonghuId(yonghu.getId()); } + //修改对应字典表字段 dictionaryService.dictionaryConvert(view, request); return R.ok().put("data", view); @@ -114,10 +111,9 @@ public class ChatController { } } - /** - * 后端保存 - */ + * 后端保存 + */ @RequestMapping("/save") public R save(@RequestBody ChatEntity chat, HttpServletRequest request){ logger.debug("save方法:,,Controller:{},,chat:{}",this.getClass().getName(),chat.toString()); @@ -146,10 +142,9 @@ public class ChatController { return R.error(511,"表中有相同数据"); } } - /** - * 后端修改 - */ + * 后端修改 + */ @RequestMapping("/update") public R update(@RequestBody ChatEntity chat, HttpServletRequest request){ logger.debug("update方法:,,Controller:{},,chat:{}",this.getClass().getName(),chat.toString()); @@ -159,6 +154,7 @@ public class ChatController { // return R.error(511,"永远不会进入"); // else if("用户".equals(role)) // chat.setYonghuId(Integer.valueOf(String.valueOf(request.getSession().getAttribute("userId")))); + //根据字段查询是否有相同数据 Wrapper queryWrapper = new EntityWrapper() .notIn("id",chat.getId()) @@ -180,9 +176,10 @@ public class ChatController { } } + /** - * 删除 - */ + * 删除 + */ @RequestMapping("/delete") public R delete(@RequestBody Integer[] ids){ logger.debug("delete:,,Controller:{},,ids:{}",this.getClass().getName(),ids.toString()); @@ -191,6 +188,7 @@ public class ChatController { } + /** * 批量上传 */ @@ -219,20 +217,15 @@ public class ChatController { for(List data:dataList){ //循环 ChatEntity chatEntity = new ChatEntity(); -// chatEntity.setYonghuId(Integer.valueOf(data.get(0))); //提问用户 要改的 -// chatEntity.setChatIssue(data.get(0)); //问题 要改的 -// chatEntity.setIssueTime(new Date(data.get(0))); //问题时间 要改的 -// chatEntity.setChatReply(data.get(0)); //回复 要改的 -// chatEntity.setReplyTime(new Date(data.get(0))); //回复时间 要改的 -// chatEntity.setZhuangtaiTypes(Integer.valueOf(data.get(0))); //状态 要改的 -// chatEntity.setChatTypes(Integer.valueOf(data.get(0))); //数据类型 要改的 -// chatEntity.setInsertTime(date);//时间 + chatList.add(chatEntity); + //把要查询是否重复的字段放入map中 } + //查询是否重复 chatService.insertBatch(chatList); return R.ok(); @@ -248,20 +241,19 @@ public class ChatController { + /** - * 前端列表 - */ + * 前端列表 + */ @IgnoreAuth @RequestMapping("/list") public R list(@RequestParam Map params, HttpServletRequest request){ logger.debug("list方法:,,Controller:{},,params:{}",this.getClass().getName(),JSONObject.toJSONString(params)); - // 没有指定排序字段就默认id倒序 if(StringUtil.isEmpty(String.valueOf(params.get("orderBy")))){ params.put("orderBy","id"); } PageUtils page = chatService.queryPage(params); - //字典表数据转换 List list =(List)page.getList(); for(ChatView c:list) @@ -269,26 +261,28 @@ public class ChatController { return R.ok().put("data", page); } + /** - * 前端详情 - */ + * 前端详情 + */ @RequestMapping("/detail/{id}") public R detail(@PathVariable("id") Long id, HttpServletRequest request){ logger.debug("detail方法:,,Controller:{},,id:{}",this.getClass().getName(),id); ChatEntity chat = chatService.selectById(id); if(chat !=null){ - //entity转view ChatView view = new ChatView(); BeanUtils.copyProperties( chat , view );//把实体数据重构到view中 + //级联表 YonghuEntity yonghu = yonghuService.selectById(chat.getYonghuId()); if(yonghu != null){ BeanUtils.copyProperties( yonghu , view ,new String[]{ "id", "createDate"});//把级联的数据添加到view中,并排除id和创建时间字段 view.setYonghuId(yonghu.getId()); } + //修改对应字典表字段 dictionaryService.dictionaryConvert(view, request); return R.ok().put("data", view); @@ -298,9 +292,10 @@ public class ChatController { } + /** - * 前端保存 - */ + * 前端保存 + */ @RequestMapping("/add") public R add(@RequestBody ChatEntity chat, HttpServletRequest request){ logger.debug("add方法:,,Controller:{},,chat:{}",this.getClass().getName(),chat.toString()); diff --git a/src/main/java/com/controller/CommonController.java b/src/main/java/com/controller/CommonController.java index d388dcf..569a58f 100644 --- a/src/main/java/com/controller/CommonController.java +++ b/src/main/java/com/controller/CommonController.java @@ -35,6 +35,7 @@ import com.utils.BaiduUtil; import com.utils.FileUtil; import com.utils.R; + /** * 通用接口 */ @@ -65,7 +66,6 @@ public class CommonController{ /** * 人脸比对 - * * @param face1 人脸1 * @param face2 人脸2 * @return @@ -105,7 +105,8 @@ public class CommonController{ } return R.ok().put("data", com.alibaba.fastjson.JSONObject.parse(res.get("result").toString())); } - + + /** * 获取table表中的column列表(联动接口) * @return @@ -125,7 +126,8 @@ public class CommonController{ List data = commonService.getOption(params); return R.ok().put("data", data); } - + + /** * 根据table中的column获取单条记录 * @return @@ -140,7 +142,8 @@ public class CommonController{ Map result = commonService.getFollowByOption(params); return R.ok().put("data", result); } - + + /** * 修改table表的sfsh状态 * @param map @@ -152,7 +155,8 @@ public class CommonController{ commonService.sh(map); return R.ok(); } - + + /** * 获取需要提醒的记录数 * @param tableName @@ -194,6 +198,7 @@ public class CommonController{ return R.ok().put("count", count); } + /** * 圖表统计 */ @@ -206,6 +211,7 @@ public class CommonController{ } + /** * 单列求和 */ @@ -218,7 +224,8 @@ public class CommonController{ Map result = commonService.selectCal(params); return R.ok().put("data", result); } - + + /** * 分组统计 */ @@ -231,7 +238,8 @@ public class CommonController{ List> result = commonService.selectGroup(params); return R.ok().put("data", result); } - + + /** * （按值统计） */ @@ -247,12 +255,7 @@ public class CommonController{ } - /** - * 下面为新加的 - * - * - * - */ + /** * 查询字典表的分组求和 @@ -269,16 +272,16 @@ public class CommonController{ } - /** - tableName 查询表 - condition1 条件1 - condition1Value 条件1值 - average 计算平均评分 - - 取值 - 有值 Number(res.data.value.toFixed(1)) - 无值 if(res.data){} - * */ + + /** + tableName 查询表 + condition1 条件1 + condition1Value 条件1值 + average 计算平均评分 + 取值 + 有值 Number(res.data.value.toFixed(1)) + 无值 if(res.data){} + * */ @IgnoreAuth @RequestMapping("/queryScore") public R queryScore(@RequestParam Map params) { @@ -287,6 +290,7 @@ public class CommonController{ return R.ok().put("data", queryScore); } + /** * 查询字典表的分组统计总条数 * tableName 表名 @@ -300,7 +304,6 @@ public class CommonController{ return R.ok().put("data", result); } - /** * 当前表的日期分组求和 * tableName 表名 @@ -326,9 +329,9 @@ public class CommonController{ return R.ok().put("data", result); } + /** - * - * 查询字典表的分组统计总条数 + * 1查询字典表的分组统计总条数 * tableName 表名 * groupColumn 分组字段 * dateFormatType 日期格式化类型 1:年 2:月 3:日 From 24e98c2fdd8e2f9a0dd14d339b43ea703a86d065 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=91=A8=E6=9D=A8?= <563249574@qq.com> Date: Mon, 28 Apr 2025 20:47:56 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E6=B5=8B=E8=AF=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/com/controller/UsersController.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/com/controller/UsersController.java b/src/main/java/com/controller/UsersController.java index 2b15447..6991408 100644 --- a/src/main/java/com/controller/UsersController.java +++ b/src/main/java/com/controller/UsersController.java @@ -58,7 +58,7 @@ public class UsersController { /** * 注册 - */ + */111 @IgnoreAuth @PostMapping(value = "/register") public R register(@RequestBody UsersEntity user){ From 02249f49446837cfb19ada38c1e117298e835225 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=91=A8=E6=9D=A8?= <563249574@qq.com> Date: Mon, 28 Apr 2025 20:48:26 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E6=B5=8B=E8=AF=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/com/controller/UsersController.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/com/controller/UsersController.java b/src/main/java/com/controller/UsersController.java index 6991408..b0105d2 100644 --- a/src/main/java/com/controller/UsersController.java +++ b/src/main/java/com/controller/UsersController.java @@ -72,7 +72,7 @@ public class UsersController { /** * 退出 - */ + */43242 @GetMapping(value = "logout") public R logout(HttpServletRequest request) { request.getSession().invalidate();