flower_city/src/main/java/com/dg/core/db/gen/entity/OrganizationChartEntity.java
@@ -113,6 +113,7 @@ /** * 修改人 */ @TableField(exist = false) @ApiModelProperty("修改人姓名") private String updateUserName;
@@ -31,7 +31,6 @@ @Autowired private TokenManager manager; @Autowired com.dg.core.service.ISysUserService IUserService; @@ -53,26 +52,29 @@ 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)); // 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)); // SysUser ss = IUserService.selectData(manager.getHCUserId(HCtoken)+""); return true; } return true; } } else { flower_city/src/main/resources/application.properties
@@ -33,10 +33,6 @@ spring.servlet.multipart.max-file-size=20MB spring.servlet.multipart.max-request-size=50MB # ?????? # ???? ??? Windows??D:/ruoyi/uploadPath?Linux?? /home/ruoyi/uploadPath? #profile=E:/java/flower_city_automessage/flower_citys/files profile=D:/tupianshuju wx.open.app_id=wx118de8a734d269f0 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/sanshuo/ComEventDetailVO.java
@@ -1,5 +1,6 @@ package com.panzhihua.common.model.vos.sanshuo; import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -76,6 +77,7 @@ private String specialistTel; /**专家受理时间*/ @ApiModelProperty(name = "specialistAcceptTime", value = "专家受理时间") @JsonFormat(pattern = "yyy-MM-dd HH:mm:ss") private Date specialistAcceptTime; /**撤销类型 1 用户 2 社区3、街道4、行业分中心*/ @ApiModelProperty(name = "revokeType", value = "撤销类型 1 用户 2 社区3、街道4、行业分中心") @@ -114,13 +116,18 @@ @ApiModelProperty(name = "result", value = "归档结案报告") private String result; /**已归档处理完毕时间*/ @JsonFormat(pattern = "yyy-MM-dd HH:mm:ss") @ApiModelProperty(name = "resultDate", value = "已归档处理完毕时间") private Date resultDate; /**创建时间*/ @JsonFormat(pattern = "yyy-MM-dd HH:mm:ss") @ApiModelProperty(name = "createAt", value = "创建时间") private Date createAt; /**调解上传图片地址列表，逗号进行分割*/ @ApiModelProperty(name = "images", value = "调解上传图片地址列表，逗号进行分割") private List<ComEventRequestImageVO> images; @ApiModelProperty("时间类型名称") private String categoryName; } springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/sanshuo/ComEventVO.java
@@ -151,4 +151,6 @@ private Long pageNo; private Long pageSize; private String keyword; @ApiModelProperty(value = "查看类型1用户查看自己的调解事件申请2专家查看自己受理的调解事件") private Integer userType; } springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ComSanShuoEventController.java
@@ -131,7 +131,7 @@ @PostMapping("/list") public R<List<ComEventVO>> listByComEvent(@RequestBody ComEventVO comEventVO) { ComEvent comEvent = CopyUtil.copyProperties(comEventVO, ComEvent.class); return R.ok(CopyUtil.beanCopyList(comEventService.listByComEvent(comEvent), ComEventVO.class)); return R.ok(CopyUtil.beanCopyList(comEventService.listByComEvent(comEvent,this.getLoginUserInfo()), ComEventVO.class)); } /** @@ -154,7 +154,7 @@ public R page(@RequestBody ComEventVO comEventVO, Long pageNo, Long pageSize) { Page pagination = new Page(pageNo, pageSize); ComEvent comEvent = CopyUtil.copyProperties(comEventVO, ComEvent.class); return comEventService.pageByComEvent(comEvent, pagination); return comEventService.pageByComEvent(comEvent, pagination,this.getLoginUserInfo()); }
@@ -42,7 +42,7 @@ * @author manailin * @date 2022-09-07 11:23:51 */ List<ComEvent> listByComEvent(@Param("comEvent") ComEvent comEvent); List<ComEvent> listByComEvent(@Param("comEvent") ComEvent comEvent,@Param("requestUserId") Long requestUserId); List<ComEventCalculateVO> calculate();
@@ -172,4 +172,6 @@ private String eventCategoryName; @TableField(exist = false) private String keyword; @TableField(exist = false) private String userType; } springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/IComEventService.java
@@ -50,7 +50,7 @@ * @author manailin * @date 2022-09-07 11:23:51 */ R<List<ComEvent>> pageByComEvent(ComEvent comEvent, Page pagination); R<List<ComEvent>> pageByComEvent(ComEvent comEvent, Page pagination,LoginUserInfoVO loginUserInfoVO); /** * description 三说会堂事件表列表数据 @@ -60,7 +60,7 @@ * @author manailin * @date 2022-09-07 11:23:51 */ List<ComEvent> listByComEvent(ComEvent comEvent); List<ComEvent> listByComEvent(ComEvent comEvent,LoginUserInfoVO loginUserInfoVO); /** * description 修改三说会堂事件表状态 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComEventServiceImpl.java
@@ -74,7 +74,12 @@ private CommediateTypeService commediateTypeService; @Override public R pageByComEvent(ComEvent comEvent, Page pagination) { public R pageByComEvent(ComEvent comEvent, Page pagination,LoginUserInfoVO loginUserInfoVO) { if (comEvent.getUserType().equals(1)){ comEvent.setRequestUserId(loginUserInfoVO.getUserId()); }else if (comEvent.getUserType().equals(2)){ comEvent.setSpecialistId(loginUserInfoVO.getUserId()); } IPage<ComEvent> list = baseMapper.pageByComEvent(comEvent, pagination); if (list.getRecords().size() < 1) { return R.ok(Collections.emptyList()); @@ -94,8 +99,8 @@ @Override public List<ComEvent> listByComEvent(ComEvent comEvent) { List<ComEvent> list = baseMapper.listByComEvent(comEvent); public List<ComEvent> listByComEvent(ComEvent comEvent,LoginUserInfoVO loginUserInfoVO) { List<ComEvent> list = baseMapper.listByComEvent(comEvent,null); if (list.size() < 1) { return Collections.emptyList(); } @@ -257,6 +262,7 @@ ComEvent comEvent = baseMapper.selectById(id); ComSanshuoExpert specter = comSanShuoExpertService.getById(comEvent.getSpecialistId()); CopyUtil.copyProperties(comEvent, comEventDetailVO); comEventDetailVO.setCategoryName(commediateTypeService.getById(comEventDetailVO.getEventCategory()).getName()); List<ComEventResource> resourceList = comEventResourceService.list(new QueryWrapper<ComEventResource>().lambda().eq(ComEventResource::getRefId, id) .eq(ComEventResource::getStatus,1)); List<ComEventRequestImageVO> comEventRequestImageVO = CopyUtil.deepCopyListObject(resourceList, ComEventRequestImageVO.class); @@ -265,7 +271,7 @@ map.put("eventDetail", comEventDetailVO); List<ComEventTransferRecord> transferRecord = comEventTransferRecordService.list(new QueryWrapper<ComEventTransferRecord>().lambda().eq(ComEventTransferRecord::getEventId, id)); transferRecord.forEach(comEventTransferRecord -> { List<ComEventResource> list = comEventResourceService.list(new QueryWrapper<ComEventResource>().lambda().eq(ComEventResource::getTransferId, comEventTransferRecord.getId())); List<ComEventResource> list = comEventResourceService.list(new QueryWrapper<ComEventResource>().lambda().eq(ComEventResource::getRefId, comEvent.getId())); List<ComEventRequestImageVO> ImageVO = CopyUtil.deepCopyListObject(list, ComEventRequestImageVO.class); comEventTransferRecord.setImages(ImageVO); }); springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComEventMapper.xml
@@ -78,6 +78,12 @@ <if test="comEvent.currentOrgName != null"> AND current_org_name = #{comEvent.currentOrgName} </if> <if test="comEvent.userType == 1"> AND request_user_id=#{comEvent.requestUserId} </if> <if test="comEvent.userType == 2"> AND specialist_id=#{comEvent.specialistId} </if> </where> order by create_at desc </select> @@ -85,6 +91,9 @@ <select id="listByComEvent" resultType="com.panzhihua.service_community.entity.ComEvent"> SELECT <include refid="columns" /> FROM com_sanshuo_event_info <if test="requestUserId != null and requestUserId != ''"> where request_user_id=#{requestUserId} </if> </select> <select id="calculate" resultType="com.panzhihua.common.model.vos.sanshuo.ComEventCalculateVO">
