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()+""); } /** 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; } 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); } }
@@ -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> 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); springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/model/dtos/IDTO.java
New file @@ -0,0 +1,8 @@ package com.panzhihua.applets.model.dtos; import lombok.Data; @Data public class IDTO { private Long id; } 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)); }
