Merge branch 'dev' of http://nonxin.cn:8090/r/product/product-server-admini...

shicf

2025-10-13 d64e7af39538a31b8a947113631c6ed2028d181f

Merge branch 'dev' of http://nonxin.cn:8090/r/product/product-server-administration/V2.0.0 into dev

# Conflicts:
#	src/main/java/com/product/administration/service/ConferenceManagerService.java

 src/main/java/com/product/administration/config/SystemCode.java

@@ -108,16 +108,16 @@
    SYSTEM_DELETE_CAR_APPLICATION_FAIL("用车申请删除失败", ModuleEnum.ADMINISTRAT.getValue() + "068"),

    //会议
    CONFERENCE_ROOM_GET_FIAL("会议室获取失败", ModuleEnum.ADMINISTRAT.getValue() + "077"),
    CONFERENCE_ROOM_LIST_FIAL("会议室列表获取失败", ModuleEnum.ADMINISTRAT.getValue() + "069"),
    CONFERENCE_ROOM_FIND_FIAL("会议室详情获取失败", ModuleEnum.ADMINISTRAT.getValue() + "070"),
    CONFERENCE_ROOM_SAVE_FIAL("会议室保存失败", ModuleEnum.ADMINISTRAT.getValue() + "071"),
    CONFERENCE_ROOM_DEL_FIAL("会议室删除失败", ModuleEnum.ADMINISTRAT.getValue() + "072"),
    CONFERENCE_ROOM_IS_USED("该时间段内会议室被使用，请重新选择", ModuleEnum.ADMINISTRAT.getValue() + "078"),
    CONFERENCE_APPLY_LIST_FIAL("会议室申请列表获取失败", ModuleEnum.ADMINISTRAT.getValue() + "073"),
    CONFERENCE_APPLY_FIND_FIAL("会议室申请详情获取失败", ModuleEnum.ADMINISTRAT.getValue() + "074"),
    CONFERENCE_APPLY_SAVE_FIAL("会议室申请保存失败", ModuleEnum.ADMINISTRAT.getValue() + "075"),
    CONFERENCE_APPLY_DEL_FIAL("会议室申请删除失败", ModuleEnum.ADMINISTRAT.getValue() + "076"),
    CONFERENCE_ROOM_GET_FIAL("会议室获取失败", ModuleEnum.ADMINISTRAT.getValue() + "077"),
    CONFERENCE_ROOM_IS_USED("该时间段内会议室被使用，请重新选择", ModuleEnum.ADMINISTRAT.getValue() + "078"),

    SYSTEM_GET_CAR_CHART_LIST_FAIL("用车看板列表获取失败", ModuleEnum.ADMINISTRAT.getValue() + "079"),
    SYSTEM_GET_CAR_CHART_INFO_FAIL("用车看板详情获取失败", ModuleEnum.ADMINISTRAT.getValue() + "080"),

 src/main/java/com/product/administration/controller/ConferenceManagerController.java

@@ -13,7 +13,6 @@
import com.product.core.controller.support.AbstractBaseController;
import com.product.core.entity.DataTableEntity;
import com.product.core.entity.FieldSetEntity;
import com.product.core.entity.RequestParameterEntity;
import com.product.core.exception.BaseException;
import com.product.core.permission.PermissionService;
import com.product.module.sys.config.SystemErrorCode;
@@ -337,22 +336,22 @@
     * @param request
     * @return
     */
    @PostMapping("/get_kb_Data/{version}")
    @ApiVersion(1)
   public String getkbData(HttpServletRequest request){
        try {
            //获取参数
            FieldSetEntity fse = BaseUtil.getFieldSetEntity(request);
            List kbData = conferenceManagerService.getkbData(fse);
            return OK(kbData);
        }  catch (BaseException e) {
            e.printStackTrace();
            return this.error(e.getCode(), e.getMessage());
        } catch (Exception e) {
            e.printStackTrace();
            return this.error(SystemCode.CONFERENCE_ROOM_GET_FIAL.getValue(), SystemCode.CONFERENCE_ROOM_GET_FIAL.getText() + e.getMessage());
        }
    }
//    @PostMapping("/get_kb_Data/{version}")
//    @ApiVersion(1)
//   public String getkbData(HttpServletRequest request){
//        try {
//            //获取参数
//            FieldSetEntity fse = BaseUtil.getFieldSetEntity(request);
//            List kbData = conferenceManagerService.getkbData(fse);
//            return OK(kbData);
//        }  catch (BaseException e) {
//            e.printStackTrace();
//            return this.error(e.getCode(), e.getMessage());
//        } catch (Exception e) {
//            e.printStackTrace();
//            return this.error(SystemCode.CONFERENCE_ROOM_GET_FIAL.getValue(), SystemCode.CONFERENCE_ROOM_GET_FIAL.getText() + e.getMessage());
//        }
//    }

    /**
     * 获取会议预约详情
@@ -466,18 +465,53 @@
        return OK(s);
    }

    /**
     * 获取签到或者访问信息
     * @param request
     * @return
     */
    @PostMapping("/get_sign_or_visit_info/{version}")
    @ApiVersion(1)
    public String getMeetingSignOrVisit(HttpServletRequest request){
        FieldSetEntity fse = BaseUtil.getFieldSetEntity(request);
        return OK_List(conferenceManagerService.getMeetingSignOrVisit(fse));
    }

    /**
     * 获取签到或者访问信息
     * @param request
     * @return
     */
    @PostMapping("/get_signOrVisit_info/{version}")
//    @PostMapping("/get_signOrVisit_info/{version}")
//    @ApiVersion(1)
//    public String getSignOrVisitInfo(HttpServletRequest request){
//        FieldSetEntity fse = BaseUtil.getFieldSetEntity(request);
//        HashMap signInfo = conferenceManagerService.getSignOrVisitInfo(fse);
//        return OK(signInfo);
//    }
    /**
     *     获取会议纪要列表
     * @param request
     * @return
     */
    @PostMapping("/get_sign_or_visit_info/{version}")
    @ApiVersion(1)
    public String getSignOrVisitInfo(HttpServletRequest request){
    public String listMeetingMinute(HttpServletRequest request) {
        try {
        FieldSetEntity fse = BaseUtil.getFieldSetEntity(request);
        HashMap signInfo = conferenceManagerService.getSignOrVisitInfo(fse);
        return OK(signInfo);
            // 判断分页参数是否正常
            if (StringUtils.isEmpty(fse.getString(CmnConst.PAGESIZE))
                    || StringUtils.isEmpty(fse.getString(CmnConst.CPAGE))) {
                return this.error(SystemCode.SYSTEM_FORM_COUNT.getValue(), SystemCode.SYSTEM_FORM_COUNT.getText());
            }
            return OK_List(conferenceManagerService.listMeetingMinute(fse));
        } catch (BaseException e) {
            e.printStackTrace();
            return this.error(e.getCode(), e.getMessage());
        } catch (Exception e) {
            e.printStackTrace();
            return this.error(SystemCode.CONFERENCE_APPLY_FIND_FIAL.getValue(), SystemCode.CONFERENCE_APPLY_FIND_FIAL.getText() + e.getMessage());
        }
    }

    /**

 src/main/java/com/product/administration/service/ide/IConferenceManagerService.java

@@ -37,7 +37,7 @@

    boolean delConferenceApply(FieldSetEntity fse)throws BaseException;
    
    List getkbData(FieldSetEntity fse)throws  BaseException;
//    List getkbData(FieldSetEntity fse)throws  BaseException;
    
    DataTableEntity getKanBanData(FieldSetEntity fse)throws  BaseException;

@@ -51,13 +51,7 @@

    String ConferenceSign(FieldSetEntity fse) throws BaseException, ParseException;

    HashMap  getSignOrVisitInfo(FieldSetEntity fse) throws  BaseException;
    DataTableEntity getMeetingSignOrVisit(FieldSetEntity fse) throws  BaseException;

     void sendMsg(FieldSetEntity fse) throws  BaseException;






}