Merge remote-tracking branch 'origin/master'

pqs-common/common-core/src/main/java/com/njcn/common/pojo/enums/response/CommonResponseEnum.java

@@ -93,6 +93,8 @@ public enum CommonResponseEnum {
     TIME_ERROR("A0101","时间格式有误"),
     CLOSE_RESOURCE_ERROR("A0102","关闭资源有误"),
     MATH_ERROR("A0103","比例总和大于100%"),
+    CS_DEVICE_RESPONSE_ENUM("A0104", "治理终端响应枚举类型"),
+
 
     ;
 

pqs-system/system-api/src/main/java/com/njcn/system/pojo/po/EleEpdPqd.java

@@ -26,7 +26,6 @@ public class EleEpdPqd {
     /**
      * 数据名称
      */
-    @MppMultiId(value = "name")
     private String name;
 
     /**
@@ -52,7 +51,6 @@ public class EleEpdPqd {
     /**
      * 相别
      */
-    @MppMultiId(value = "phase")
     private String phase;
 
     /**
@@ -88,7 +86,6 @@ public class EleEpdPqd {
     /**
      * 数据类型(epd、pqd...)
      */
-    @MppMultiId(value = "data_type")
     private String dataType;
 
     /**

pqs-system/system-boot/src/main/java/com/njcn/system/mapper/EleEpdPqdMapper.java

@@ -1,8 +1,8 @@
 package com.njcn.system.mapper;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.github.jeffreyning.mybatisplus.base.MppBaseMapper;
 import com.njcn.system.pojo.po.EleEpdPqd;
 import com.njcn.system.pojo.vo.EleEpdPqdVO;
 import org.apache.ibatis.annotations.Param;
@@ -15,7 +15,7 @@ import org.apache.ibatis.annotations.Param;
  * @author xuyang
  * @since 2023-05-24
  */
-public interface EleEpdPqdMapper extends MppBaseMapper<EleEpdPqd> {
+public interface EleEpdPqdMapper extends BaseMapper<EleEpdPqd> {
 
     Page<EleEpdPqdVO> page(@Param("page")Page<EleEpdPqdVO> page, @Param("ew") QueryWrapper<EleEpdPqdVO> queryWrapper);
 

pqs-system/system-boot/src/main/java/com/njcn/system/service/impl/EleEpdPqdServiceImpl.java

@@ -5,7 +5,7 @@ import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.github.jeffreyning.mybatisplus.service.MppServiceImpl;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.njcn.common.pojo.exception.BusinessException;
 import com.njcn.db.constant.DbConstant;
 import com.njcn.system.enums.SystemResponseEnum;
@@ -33,7 +33,7 @@ import java.util.stream.Collectors;
  * @since 2023-05-24
  */
 @Service
-public class EleEpdPqdServiceImpl extends MppServiceImpl<EleEpdPqdMapper, EleEpdPqd> implements IEleEpdPqdService {
+public class EleEpdPqdServiceImpl extends ServiceImpl<EleEpdPqdMapper, EleEpdPqd> implements IEleEpdPqdService {
 
     @Override
     public void saveData(List<EleEpdPqdParam> eleEpdPqdParam) {