配置信息对接调整提交

lishuai

2023-12-24 810b07cd238377e7a18e523cfe2094d8a3272ab8

配置信息对接调整提交

 server/dmvisit_service/src/main/java/com/doumee/dao/admin/request/LaborConfigParam.java

@@ -1,7 +1,9 @@
package com.doumee.dao.admin.request;

import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

@Data
public class LaborConfigParam {

    @ApiModelProperty(value = "来访预约方式")

 server/dmvisit_service/src/main/java/com/doumee/dao/admin/request/VisitConfigParam.java

@@ -1,10 +1,12 @@
package com.doumee.dao.admin.request;

import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

/**
 * 指定参数
 */
@Data
public class VisitConfigParam {

    @ApiModelProperty(value = "来访预约方式")

 server/dmvisit_service/src/main/java/com/doumee/service/business/impl/ProblemLogServiceImpl.java

@@ -115,9 +115,12 @@
        IPage<ProblemLog> page = new Page<>(pageWrap.getPage(), pageWrap.getCapacity());
        MPJLambdaWrapper<ProblemLog> queryWrapper = new MPJLambdaWrapper<>();
        Utils.MP.blankToNull(pageWrap.getModel());
        queryWrapper.leftJoin(Member.class,Member::getOpenid,ProblemLog::getOpenid);
        queryWrapper.leftJoin(Member.class,Member::getId,ProblemLog::getUserId);
        queryWrapper.selectAll(ProblemLog.class)
                .selectAs(Member::getType,ProblemLog::getType);
                .selectAs(Member::getType,ProblemLog::getType)
                .like(StringUtils.isNotBlank(pageWrap.getModel().getName()), ProblemLog::getName, pageWrap.getModel().getName())
                .like(StringUtils.isNotBlank(pageWrap.getModel().getCompanyName()), ProblemLog::getCompanyName, pageWrap.getModel().getCompanyName())
                .eq(Objects.nonNull(pageWrap.getModel().getType()), Member::getType, pageWrap.getModel().getType());
        queryWrapper.orderByDesc(ProblemLog::getCreateDate);
        IPage<ProblemLog> problemLogIPage = problemLogJoinMapper.selectJoinPage(page, ProblemLog.class, queryWrapper);
        System.out.println(problemLogIPage);

 server/dmvisit_service/src/main/java/com/doumee/service/system/impl/SystemDictDataServiceImpl.java

@@ -1,13 +1,13 @@
package com.doumee.service.system.impl;

import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import com.doumee.core.constants.ResponseStatus;
import com.doumee.core.exception.BusinessException;
import com.doumee.core.model.LoginUserInfo;
import com.doumee.core.utils.Constants;
import com.doumee.dao.admin.request.LaborConfigDTO;
import com.doumee.dao.admin.request.VisitConfigDTO;
import com.doumee.dao.admin.request.*;
import com.doumee.dao.system.SystemDictMapper;
import com.doumee.dao.system.model.SystemDict;
import com.fasterxml.jackson.core.JsonProcessingException;
@@ -132,10 +132,6 @@
    public VisitConfigDTO getVisitConfigDTO() {

        try {
            String jasonStr = Constants.toUnderlineJSONString(new VisitConfigDTO());
            JSONObject parse = (JSONObject) JSONObject.parse(jasonStr);
            List<String> collect = parse.entrySet().stream().map(s -> s.getKey().toUpperCase()).collect(Collectors.toList());

            QueryWrapper<SystemDict> systemDictQuery = new QueryWrapper<>();
            systemDictQuery.lambda()
                            .eq(SystemDict::getDeleted,Boolean.FALSE)
@@ -147,18 +143,19 @@
            }
            QueryWrapper<SystemDictData> wrapper = new QueryWrapper<>();
            wrapper.lambda()
                    .eq(SystemDictData::getDictId,systemDict.getId())
                    .in(SystemDictData::getLabel,collect);
            List<SystemDictData> systemDictData = systemDictDataMapper.selectList(wrapper);
            if (CollectionUtils.isEmpty(systemDictData)){
                    .eq(SystemDictData::getDictId,systemDict.getId());
            List<SystemDictData> systemDictDatas = systemDictDataMapper.selectList(wrapper);
            if (CollectionUtils.isEmpty(systemDictDatas)){
                throw new BusinessException(ResponseStatus.DATA_EXISTS.getCode(),"字典值不存在");
            }
            systemDictData.forEach(s->{
                parse.put(s.getLabel().toLowerCase(),s.getCode());
            });
            String s = parse.toJSONString();
            VisitConfigDTO miniProgrammeDTO = Constants.toSnakeObject(s, VisitConfigDTO.class);
            return miniProgrammeDTO;
            VisitConfigDTO visitConfigDTO = null;
            for (SystemDictData obj:systemDictDatas) {
                visitConfigDTO = new VisitConfigDTO();
                visitConfigDTO.setVisitConfigParam(JSONObject.parseObject(obj.getCode(),VisitConfigParam.class));
                visitConfigDTO.setDescription(obj.getRemark());
                visitConfigDTO.setTheme(obj.getLabel());
            }
            return visitConfigDTO;
        } catch (Exception e) {
            throw new BusinessException(ResponseStatus.SERVER_ERROR.getCode(),"字典值解析有误");
        }
@@ -179,26 +176,30 @@
            QuerySystemDictDataDTO dictData = new QuerySystemDictDataDTO();
            dictData.setDictId((systemDict.getId()));
            List<SystemDictDataListVO> systemDictDataListVOS = systemDictDataMapper.selectManageList(dictData);
            SystemDictData systemDictData = getSystemDictDataListVO(systemDict);
            systemDictData.setCode(JSON.toJSONString(miniProgrammeDTO.getVisitConfigParam()));
            systemDictData.setLabel(miniProgrammeDTO.getTheme());
            systemDictData.setRemark(miniProgrammeDTO.getDescription());
            if(null != systemDictDataListVOS && systemDictDataListVOS.size() > 0) {
                LoginUserInfo loginUserInfo = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal();
                SystemDictData systemDictData = new SystemDictData();
                systemDictData.setDictId(systemDict.getId());
                systemDictData.setCode(JSONObject.toJSONString(miniProgrammeDTO.getVisitConfigParam()));
                systemDictData.setDisabled(true);
                systemDictData.setSort(Constants.ZERO);
                systemDictData.setLabel(miniProgrammeDTO.getTheme());
                systemDictData.setRemark(miniProgrammeDTO.getDescription());
                systemDictData.setCreateTime(new Date());
                systemDictData.setUpdateTime(new Date());
                systemDictData.setCreateUser(loginUserInfo.getId());
                systemDictData.setUpdateUser(loginUserInfo.getId());
                if(null == systemDictDataListVOS.get(0).getId()) {
                    systemDictDataMapper.insert(systemDictData);
                }else {
                    systemDictData.setId(systemDictDataListVOS.get(0).getId());
                    systemDictDataMapper.updateById(systemDictData);
                }
                systemDictData.setId(systemDictDataListVOS.get(0).getId());
                systemDictDataMapper.updateById(systemDictData);
            }else {
                systemDictDataMapper.insert(systemDictData);
            }
    }

    private SystemDictData getSystemDictDataListVO(SystemDict systemDict) {
        LoginUserInfo loginUserInfo = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal();
        SystemDictData systemDictData = new SystemDictData();
        systemDictData.setDictId(systemDict.getId());
        systemDictData.setDisabled(true);
        systemDictData.setSort(Constants.ONE);
        systemDictData.setCreateTime(new Date());
        systemDictData.setUpdateTime(new Date());
        systemDictData.setCreateUser(loginUserInfo.getId());
        systemDictData.setUpdateUser(loginUserInfo.getId());

        return systemDictData;
    }

    @Override
@@ -220,18 +221,16 @@
            }
            QueryWrapper<SystemDictData> wrapper = new QueryWrapper<>();
            wrapper.lambda()
                    .eq(SystemDictData::getDictId,systemDict.getId())
                    .in(SystemDictData::getLabel,collect);
            List<SystemDictData> systemDictData = systemDictDataMapper.selectList(wrapper);
            if (CollectionUtils.isEmpty(systemDictData)){
                throw new BusinessException(ResponseStatus.DATA_EXISTS.getCode(),"字典值不存在");
                    .eq(SystemDictData::getDictId,systemDict.getId());
            List<SystemDictData> systemDictDatas = systemDictDataMapper.selectList(wrapper);
            LaborConfigDTO laborConfigDTO = null;
            for (SystemDictData obj:systemDictDatas) {
                laborConfigDTO = new LaborConfigDTO();
                laborConfigDTO.setLaborConfigParam(JSONObject.parseObject(obj.getCode(), LaborConfigParam.class));
                laborConfigDTO.setDescription(obj.getRemark());
                laborConfigDTO.setTheme(obj.getLabel());
            }
            systemDictData.forEach(s->{
                parse.put(s.getLabel().toLowerCase(),s.getCode());
            });
            String s = parse.toJSONString();
            LaborConfigDTO miniProgrammeDTO = Constants.toSnakeObject(s, LaborConfigDTO.class);
            return miniProgrammeDTO;
            return laborConfigDTO;
        } catch (Exception e) {
            throw new BusinessException(ResponseStatus.SERVER_ERROR.getCode(),"字典值解析有误");
        }
@@ -239,29 +238,27 @@

    @Override
    public void updateLaborConfigDTO(LaborConfigDTO miniProgrammeDTO) {
        try {

            QueryWrapper<SystemDict> systemDictQuery = new QueryWrapper<>();
            systemDictQuery.lambda()
                    .eq(SystemDict::getDeleted,Boolean.FALSE)
                    .eq(SystemDict::getCode,Constants.VISIT_CONFIG);
                    .eq(SystemDict::getCode,Constants.LABOR_CONFIG);
            SystemDict systemDict = systemDictMapper.selectOne(systemDictQuery);

            if (Objects.isNull(systemDict)){
                throw new BusinessException(ResponseStatus.DATA_EXISTS.getCode(),"字典不存在");
            }
            String jasonStr = Constants.toUnderlineJSONString(miniProgrammeDTO);
            JSONObject parse = (JSONObject) JSONObject.parse(jasonStr);
            parse.entrySet().forEach(s->{
                UpdateWrapper<SystemDictData> wrapper = new UpdateWrapper<>();
                wrapper.lambda()
                        .eq(SystemDictData::getDictId,systemDict.getId())
                        .eq(SystemDictData::getLabel,s.getKey().toUpperCase())
                        .set(SystemDictData::getCode,s.getValue());
                systemDictDataMapper.update(null,wrapper);
            });
        } catch (JsonProcessingException e) {
            throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"字典值解析有误");
        }
            QuerySystemDictDataDTO dictData = new QuerySystemDictDataDTO();
            dictData.setDictId((systemDict.getId()));
            List<SystemDictDataListVO> systemDictDataListVOS = systemDictDataMapper.selectManageList(dictData);
            SystemDictData systemDictData = getSystemDictDataListVO(systemDict);
            systemDictData.setCode(JSON.toJSONString(miniProgrammeDTO.getLaborConfigParam()));
            systemDictData.setLabel(miniProgrammeDTO.getTheme());
            systemDictData.setRemark(miniProgrammeDTO.getDescription());
            if(null != systemDictDataListVOS && systemDictDataListVOS.size() > 0) {
                systemDictData.setId(systemDictDataListVOS.get(0).getId());
                systemDictDataMapper.updateById(systemDictData);
            }else {
                systemDictDataMapper.insert(systemDictData);
            }
    }
}