From 1ac9d6d25f32148354e46d11b814c306f475ee0d Mon Sep 17 00:00:00 2001
From: lidongdong <1459917685@qq.com>
Date: 星期六, 08 十月 2022 17:07:41 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/huacheng_test' into huacheng_test
---
flower_city/src/main/java/com/dg/core/api/GuideRepairOrderAppletsController.java | 59 +++++++++++--------
springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/model/dtos/IDTO.java | 8 ++
springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/ComPropertyRepairApi.java | 13 ++++
flower_city/src/main/java/com/dg/core/interceptor/AuthorizationInterceptor.java | 44 ++++----------
flower_city/src/main/resources/mapper/HuaChengSysUserMapper.xml | 1
springcloud_k8s_panzhihuazhihuishequ/service_property/src/main/java/com/panzhihua/service_property/api/ComPropertyRepairApi.java | 8 +-
flower_city/src/main/java/com/dg/core/service/impl/SysUserServiceImpl.java | 4
7 files changed, 77 insertions(+), 60 deletions(-)
diff --git a/flower_city/src/main/java/com/dg/core/api/GuideRepairOrderAppletsController.java b/flower_city/src/main/java/com/dg/core/api/GuideRepairOrderAppletsController.java
index 30586e4..40f7f6e 100644
--- a/flower_city/src/main/java/com/dg/core/api/GuideRepairOrderAppletsController.java
+++ b/flower_city/src/main/java/com/dg/core/api/GuideRepairOrderAppletsController.java
@@ -225,37 +225,48 @@
@Authorization
public ResultData evaluate(@RequestBody GuideRepairOrder entity, @CurrentUser SysUser sysUser)
{
- if(entity==null)
+// if(entity==null)
+// {
+// return ResultData.error("参数不能为空");
+// }
+//
+// if(entity.getId()<=0)
+// {
+// return ResultData.error("工单id不能为空");
+// }
+//
+// if(!StringUtils.equals(entity.getState(),"4"))
+// {
+// return ResultData.error("该工单不能评价！");
+// }
+//
+// if(StringUtils.isEmpty(entity.getEvaluateState()))
+// {
+// return ResultData.error("满意程度不能为空！");
+// }
+
+
+ if(sysUser==null)
{
- return ResultData.error("参数不能为空");
+ return ResultData.error("sysUser为空！");
}
- if(entity.getId()<=0)
- {
- return ResultData.error("工单id不能为空");
- }
- if(!StringUtils.equals(entity.getState(),"4"))
- {
- return ResultData.error("该工单不能评价！");
- }
- if(StringUtils.isEmpty(entity.getEvaluateState()))
- {
- return ResultData.error("满意程度不能为空！");
- }
+
//已办结
- entity.setState("3");
- //新增已办结记录
- GuideEvolveEntity guideEvolveEntity=new GuideEvolveEntity();
- guideEvolveEntity.setCreateTime(LocalDateTime.now());
- guideEvolveEntity.setUpdateTime(LocalDateTime.now());
- guideEvolveEntity.setState("3");
- guideEvolveEntity.setFromDepartmentalId(sysUser.getDepartmentId());
- guideEvolveEntity.setFromUserId(sysUser.getUserId()+"");
- iGuideEvolveService.insertConfig(guideEvolveEntity);
+// entity.setState("3");
+// //新增已办结记录
+// GuideEvolveEntity guideEvolveEntity=new GuideEvolveEntity();
+// guideEvolveEntity.setCreateTime(LocalDateTime.now());
+// guideEvolveEntity.setUpdateTime(LocalDateTime.now());
+// guideEvolveEntity.setState("3");
+// guideEvolveEntity.setFromDepartmentalId(sysUser.getDepartmentId());
+// guideEvolveEntity.setFromUserId(sysUser.getUserId()+"");
+// iGuideEvolveService.insertConfig(guideEvolveEntity);
- return toAjax(iGuideRepairOrderService.updateConfig(entity));
+// return toAjax(iGuideRepairOrderService.updateConfig(entity));
+ return ResultData.success(sysUser.getUserId()+"");
}
/**
diff --git a/flower_city/src/main/java/com/dg/core/interceptor/AuthorizationInterceptor.java b/flower_city/src/main/java/com/dg/core/interceptor/AuthorizationInterceptor.java
index 101050c..aa5957d 100644
--- a/flower_city/src/main/java/com/dg/core/interceptor/AuthorizationInterceptor.java
+++ b/flower_city/src/main/java/com/dg/core/interceptor/AuthorizationInterceptor.java
@@ -15,10 +15,6 @@
import javax.servlet.http.HttpServletResponse;
import java.lang.reflect.Method;
import java.nio.charset.StandardCharsets;
-import java.text.SimpleDateFormat;
-import java.time.ZoneId;
-import java.util.Calendar;
-import java.util.Date;
/**
* 自定义拦截器，判断此次请求是否有权限
@@ -52,25 +48,11 @@
if(StringUtils.isEmpty(token))
{
-// if(StringUtils.isEmpty(HCtoken))
-// {
-// String reponse = "{\"result\": 448, \"message\": \"token not is null \"}";
-// response.setStatus(200);
-// response.setCharacterEncoding(StandardCharsets.UTF_8.toString());
-// ResponseFacade facade = (ResponseFacade) response;
-// facade.setContentLength(reponse.getBytes(StandardCharsets.UTF_8).length);
-// facade.getWriter().write(reponse);
-// return false;
-// }
-// else
-// {
-//
-// }
-
//花城e+ token
if (manager.checkHCToken(HCtoken)) {
//如果token验证成功，权限检查通过，将token对应的用户id存在request中，便于之后注入
request.setAttribute(Constant.CURRENT_USER_ID, manager.getHCUserId(HCtoken));
+ System.out.println("花城用户id："+manager.getHCUserId(HCtoken));
// SysUser ss = IUserService.selectData(manager.getHCUserId(HCtoken)+"");
return true;
}
@@ -86,18 +68,20 @@
}
}
-
- //如果验证token失败，并且方法或类注明了Authorization，返回401错误
- if (method.getAnnotation(Authorization.class) != null ||
- bean.getClass().getAnnotation(Authorization.class) != null)
+ if(!StringUtils.isEmpty(token))
{
- String reponse = "{\"result\": 449, \"message\": \"Overdue token\"}";
- response.setStatus(200);
- response.setCharacterEncoding(StandardCharsets.UTF_8.toString());
- ResponseFacade facade = (ResponseFacade) response;
- facade.setContentLength(reponse.getBytes(StandardCharsets.UTF_8).length);
- facade.getWriter().write(reponse);
- return false;
+ //如果验证token失败，并且方法或类注明了Authorization，返回401错误
+ if (method.getAnnotation(Authorization.class) != null ||
+ bean.getClass().getAnnotation(Authorization.class) != null)
+ {
+ String reponse = "{\"result\": 449, \"message\": \"Overdue token\"}";
+ response.setStatus(200);
+ response.setCharacterEncoding(StandardCharsets.UTF_8.toString());
+ ResponseFacade facade = (ResponseFacade) response;
+ facade.setContentLength(reponse.getBytes(StandardCharsets.UTF_8).length);
+ facade.getWriter().write(reponse);
+ return false;
+ }
}
return true;
}
diff --git a/flower_city/src/main/java/com/dg/core/service/impl/SysUserServiceImpl.java b/flower_city/src/main/java/com/dg/core/service/impl/SysUserServiceImpl.java
index 504f6f0..4cb204d 100644
--- a/flower_city/src/main/java/com/dg/core/service/impl/SysUserServiceImpl.java
+++ b/flower_city/src/main/java/com/dg/core/service/impl/SysUserServiceImpl.java
@@ -82,7 +82,7 @@
newUser.setSex("1");
newUser.setCreateTime(LocalDateTime.now());
newUser.setUpdateTime(LocalDateTime.now());
- baseMapper.insert(newUser);
+ baseMapper.insertConfig(newUser);
}
else
{
@@ -96,7 +96,7 @@
newUser.setAvatar(huaChengSysUser.getImageUrl());
newUser.setCreateTime(LocalDateTime.now());
newUser.setUpdateTime(LocalDateTime.now());
- baseMapper.insert(newUser);
+ baseMapper.insertConfig(newUser);
}
}
diff --git a/flower_city/src/main/resources/mapper/HuaChengSysUserMapper.xml b/flower_city/src/main/resources/mapper/HuaChengSysUserMapper.xml
index 5cd423d..76b8601 100644
--- a/flower_city/src/main/resources/mapper/HuaChengSysUserMapper.xml
+++ b/flower_city/src/main/resources/mapper/HuaChengSysUserMapper.xml
@@ -107,6 +107,7 @@
<select id="selectData" parameterType="string" resultMap="SysUserResult">
<include refid="selectSysUserVo"/>
<where>
+ app_id='wx118de8a734d269f0'
<if test="userId!=null and userId!=''">
and user_id=#{userId}
</if>
diff --git a/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/ComPropertyRepairApi.java b/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/ComPropertyRepairApi.java
index fb1d46e..11ca823 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/ComPropertyRepairApi.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/ComPropertyRepairApi.java
@@ -1,6 +1,7 @@
package com.panzhihua.applets.api;
import cn.hutool.core.date.DateUtil;
+import com.panzhihua.applets.model.dtos.IDTO;
import com.panzhihua.common.controller.BaseController;
import com.panzhihua.common.model.dtos.property.CommonPage;
import com.panzhihua.common.model.vos.R;
@@ -77,6 +78,18 @@
* @return 单条数据
*/
@ApiOperation("详情接口")
+ @PostMapping("/detail")
+ public R selectDetail(@RequestBody IDTO idto) {
+ return this.propertyService.comPropertyRepairSelectOne(idto.getId());
+ }
+
+ /**
+ * 通过主键查询单条数据
+ *
+ * @param id 主键
+ * @return 单条数据
+ */
+ @ApiOperation("详情接口")
@GetMapping("/{id}")
public R selectOne(@PathVariable("id") Long id) {
return this.propertyService.comPropertyRepairSelectOne(id);
diff --git a/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/model/dtos/IDTO.java b/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/model/dtos/IDTO.java
new file mode 100644
index 0000000..108a52b
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/model/dtos/IDTO.java
@@ -0,0 +1,8 @@
+package com.panzhihua.applets.model.dtos;
+
+import lombok.Data;
+
+@Data
+public class IDTO {
+ private Long id;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_property/src/main/java/com/panzhihua/service_property/api/ComPropertyRepairApi.java b/springcloud_k8s_panzhihuazhihuishequ/service_property/src/main/java/com/panzhihua/service_property/api/ComPropertyRepairApi.java
index 2003f28..54e08a8 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_property/src/main/java/com/panzhihua/service_property/api/ComPropertyRepairApi.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_property/src/main/java/com/panzhihua/service_property/api/ComPropertyRepairApi.java
@@ -64,12 +64,12 @@
}
ComPropertyRepairVO vo=comPropertyRepairVO;
try {
- comPropertyRepairVO.setRepairName(RSAUtils.decrypt(comPropertyRepairVO.getRepairName(), Constants.PRIVATE_KEY));
- comPropertyRepairVO.setRepairPhone(RSAUtils.decrypt(comPropertyRepairVO.getRepairPhone(), Constants.PRIVATE_KEY));
+ comPropertyRepair.setRepairName(RSAUtils.decrypt(comPropertyRepairVO.getRepairName(), Constants.PRIVATE_KEY));
+ comPropertyRepair.setRepairPhone(RSAUtils.decrypt(comPropertyRepairVO.getRepairPhone(), Constants.PRIVATE_KEY));
} catch (Exception e) {
e.printStackTrace();
- comPropertyRepairVO.setRepairName(vo.getRepairName());
- comPropertyRepairVO.setRepairPhone(vo.getRepairPhone());
+ comPropertyRepair.setRepairName(comPropertyRepairVO.getRepairName());
+ comPropertyRepair.setRepairPhone(comPropertyRepairVO.getRepairPhone());
}
return R.ok(this.comPropertyRepairService.save(comPropertyRepair));
}
--
Gitblit v1.7.1