diff --git a/src/main/java/com/glxp/api/constant/BasicExportStatusTimeEnum.java b/src/main/java/com/glxp/api/constant/BasicExportStatusTimeEnum.java index 95a9a2694..6e5b2ac0f 100644 --- a/src/main/java/com/glxp/api/constant/BasicExportStatusTimeEnum.java +++ b/src/main/java/com/glxp/api/constant/BasicExportStatusTimeEnum.java @@ -87,6 +87,31 @@ public enum BasicExportStatusTimeEnum { * 第三方往来单位信息 */ THR_CORP("thr_corp","第三方往来单位信息"), + + /** + * 系统运行参数 + */ + SYSTEM_PARAM_CONFIG("system_param_config","系统运行参数"), + + /** + * 委托验收 + * */ + ENTRUST_ACCEPT("entrust_accept","委托验收"), + + /** + * 打印设置 + */ + PRINT_CONFIG("print_config","打印设置"), + + /** + * 自动建出入库单设置 + */ + SCAN_CHANGE("scan_change","自动建出入库单设置"), + + /** + * 自动建业务单设置 + */ + BUS_TYPE_CHANGE("bus_type_change","自动建业务单设置"), ; @EnumValue private String key; diff --git a/src/main/java/com/glxp/api/constant/BasicExportTypeEnum.java b/src/main/java/com/glxp/api/constant/BasicExportTypeEnum.java index 03fc55503..e7d94370e 100644 --- a/src/main/java/com/glxp/api/constant/BasicExportTypeEnum.java +++ b/src/main/java/com/glxp/api/constant/BasicExportTypeEnum.java @@ -36,6 +36,11 @@ public enum BasicExportTypeEnum { * 第三方数据 */ THIRD_DATA("third_data", "第三方数据"), + + /** + * 系统设置数据 + */ + SYS_SET_DATA("sys_set_data", "系统设置数据"), ; private String key; diff --git a/src/main/java/com/glxp/api/dao/auth/InvSpaceDao.java b/src/main/java/com/glxp/api/dao/auth/InvSpaceDao.java index 15c473646..53cc52f4e 100644 --- a/src/main/java/com/glxp/api/dao/auth/InvSpaceDao.java +++ b/src/main/java/com/glxp/api/dao/auth/InvSpaceDao.java @@ -42,7 +42,7 @@ public interface InvSpaceDao extends BaseMapperPlus selectList(InvSpace invSpace); + List selectEntityList(InvSpace invSpace); /** * 查询货位编码和名称 diff --git a/src/main/java/com/glxp/api/dao/basic/BasicBusTypePreDao.java b/src/main/java/com/glxp/api/dao/basic/BasicBusTypePreDao.java index 72ff84fb9..002e478b5 100644 --- a/src/main/java/com/glxp/api/dao/basic/BasicBusTypePreDao.java +++ b/src/main/java/com/glxp/api/dao/basic/BasicBusTypePreDao.java @@ -42,6 +42,6 @@ public interface BasicBusTypePreDao extends BaseMapperPlus selectBusTypePreResList(FilterBusTypePreRequest filterBusTypePreRequest); - boolean insertOrUpdate(BasicBusTypePreEntity record); + boolean insertOrUpdateEntity(BasicBusTypePreEntity record); } diff --git a/src/main/java/com/glxp/api/dao/schedule/SystemParamConfigDao.java b/src/main/java/com/glxp/api/dao/schedule/SystemParamConfigDao.java index e8e75a5cf..db2b71e11 100644 --- a/src/main/java/com/glxp/api/dao/schedule/SystemParamConfigDao.java +++ b/src/main/java/com/glxp/api/dao/schedule/SystemParamConfigDao.java @@ -1,5 +1,6 @@ package com.glxp.api.dao.schedule; +import com.glxp.api.dao.BaseMapperPlus; import com.glxp.api.entity.system.SystemParamConfigEntity; import com.glxp.api.req.system.FilterParamConfigRequest; import com.glxp.api.req.system.SysParamConfigSaveRequest; @@ -10,7 +11,7 @@ import java.util.Date; import java.util.List; @Mapper -public interface SystemParamConfigDao { +public interface SystemParamConfigDao extends BaseMapperPlus { List queryPage(FilterParamConfigRequest filterParamConfigRequest); @@ -28,7 +29,7 @@ public interface SystemParamConfigDao { boolean updateParentId(SysParamConfigSaveRequest sysParamConfigSaveRequest); - boolean insert(SystemParamConfigEntity systemParamConfigEntity); + boolean insertEntity(SystemParamConfigEntity systemParamConfigEntity); List selectByLastTime(@Param("lastUpdateTime") Date lastUpdateTime); } diff --git a/src/main/java/com/glxp/api/dao/system/SysPdfTemplateRelevanceBizDao.java b/src/main/java/com/glxp/api/dao/system/SysPdfTemplateRelevanceBizDao.java index 5a6f19ec2..35748d3e4 100644 --- a/src/main/java/com/glxp/api/dao/system/SysPdfTemplateRelevanceBizDao.java +++ b/src/main/java/com/glxp/api/dao/system/SysPdfTemplateRelevanceBizDao.java @@ -1,13 +1,14 @@ package com.glxp.api.dao.system; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.glxp.api.dao.BaseMapperPlus; import com.glxp.api.entity.system.SysPdfTemplateRelevanceBizEntity; import com.glxp.api.req.system.FilterPdfTemplateRelevanceRequest; import com.glxp.api.res.system.SystemPDFTemplateRelevanceResponse; import java.util.List; -public interface SysPdfTemplateRelevanceBizDao extends BaseMapper { +public interface SysPdfTemplateRelevanceBizDao extends BaseMapperPlus { List filterList(FilterPdfTemplateRelevanceRequest systemPDFModuleRequest); diff --git a/src/main/java/com/glxp/api/dao/system/SysPdfTemplateRelevanceCodeDao.java b/src/main/java/com/glxp/api/dao/system/SysPdfTemplateRelevanceCodeDao.java index e75ef55ed..b338707a5 100644 --- a/src/main/java/com/glxp/api/dao/system/SysPdfTemplateRelevanceCodeDao.java +++ b/src/main/java/com/glxp/api/dao/system/SysPdfTemplateRelevanceCodeDao.java @@ -1,6 +1,7 @@ package com.glxp.api.dao.system; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.glxp.api.dao.BaseMapperPlus; import com.glxp.api.entity.system.SysPdfTemplateRelevanceCodeEntity; import com.glxp.api.req.system.FilterPdfTemplateRelevanceRequest; import com.glxp.api.res.system.SystemPDFTemplateRelevanceResponse; @@ -8,7 +9,7 @@ import org.apache.ibatis.annotations.Param; import java.util.List; -public interface SysPdfTemplateRelevanceCodeDao extends BaseMapper { +public interface SysPdfTemplateRelevanceCodeDao extends BaseMapperPlus { List filterList(FilterPdfTemplateRelevanceRequest systemPDFModuleRequest); @@ -17,5 +18,4 @@ public interface SysPdfTemplateRelevanceCodeDao extends BaseMapper { +public interface SysPdfTemplateRelevanceLabelDao extends BaseMapperPlus { List filterList(FilterPdfTemplateRelevanceRequest systemPDFModuleRequest); } \ No newline at end of file diff --git a/src/main/java/com/glxp/api/dao/system/SysPdfTemplateRelevanceStatemenDao.java b/src/main/java/com/glxp/api/dao/system/SysPdfTemplateRelevanceStatemenDao.java index 02fbc79b9..7730caa58 100644 --- a/src/main/java/com/glxp/api/dao/system/SysPdfTemplateRelevanceStatemenDao.java +++ b/src/main/java/com/glxp/api/dao/system/SysPdfTemplateRelevanceStatemenDao.java @@ -1,13 +1,14 @@ package com.glxp.api.dao.system; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.glxp.api.dao.BaseMapperPlus; import com.glxp.api.entity.system.SysPdfTemplateRelevanceStatemenEntity; import com.glxp.api.req.system.FilterPdfTemplateRelevanceRequest; import com.glxp.api.res.system.SystemPDFTemplateRelevanceResponse; import java.util.List; -public interface SysPdfTemplateRelevanceStatemenDao extends BaseMapper { +public interface SysPdfTemplateRelevanceStatemenDao extends BaseMapperPlus { List filterList(FilterPdfTemplateRelevanceRequest systemPDFModuleRequest); diff --git a/src/main/java/com/glxp/api/dao/system/SystemPDFModuleDao.java b/src/main/java/com/glxp/api/dao/system/SystemPDFModuleDao.java index 07254727c..49bd5c68c 100644 --- a/src/main/java/com/glxp/api/dao/system/SystemPDFModuleDao.java +++ b/src/main/java/com/glxp/api/dao/system/SystemPDFModuleDao.java @@ -1,5 +1,6 @@ package com.glxp.api.dao.system; +import com.glxp.api.dao.BaseMapperPlus; import com.glxp.api.entity.system.SystemPDFModuleEntity; import com.glxp.api.req.system.FilterPdfModuleRequest; import com.glxp.api.req.system.SysPdfModuleSaveRequest; @@ -10,7 +11,7 @@ import java.util.Date; import java.util.List; @Mapper -public interface SystemPDFModuleDao { +public interface SystemPDFModuleDao extends BaseMapperPlus { List queryPage(FilterPdfModuleRequest filterPDFModuleRequest); @@ -24,7 +25,7 @@ public interface SystemPDFModuleDao { boolean updateById(SysPdfModuleSaveRequest sysPdfModuleSaveRequest); - boolean insert(SystemPDFModuleEntity systemPDFModuleEntity); + boolean insertEntity(SystemPDFModuleEntity systemPDFModuleEntity); boolean deleteById(Integer id); diff --git a/src/main/java/com/glxp/api/dao/system/SystemPDFTemplateDao.java b/src/main/java/com/glxp/api/dao/system/SystemPDFTemplateDao.java index bc9e8fa2f..bc84ed813 100644 --- a/src/main/java/com/glxp/api/dao/system/SystemPDFTemplateDao.java +++ b/src/main/java/com/glxp/api/dao/system/SystemPDFTemplateDao.java @@ -1,5 +1,6 @@ package com.glxp.api.dao.system; +import com.glxp.api.dao.BaseMapperPlus; import com.glxp.api.entity.system.SystemPDFTemplateEntity; import com.glxp.api.req.system.FilterPdfTemplateRequest; import com.glxp.api.req.system.SysPdfTemplateSaveRequest; @@ -10,7 +11,7 @@ import java.util.Date; import java.util.List; @Mapper -public interface SystemPDFTemplateDao { +public interface SystemPDFTemplateDao extends BaseMapperPlus { List queryPage(FilterPdfTemplateRequest filterPdfTemplateRequest); @@ -22,7 +23,7 @@ public interface SystemPDFTemplateDao { boolean updateById(SysPdfTemplateSaveRequest sysPdfTemplateSaveRequest); - boolean insert(SystemPDFTemplateEntity systemPDFTemplateEntity); + boolean insertEntity(SystemPDFTemplateEntity systemPDFTemplateEntity); boolean deleteById(Integer id); diff --git a/src/main/java/com/glxp/api/entity/basic/BasicBusTypeChangeEntity.java b/src/main/java/com/glxp/api/entity/basic/BasicBusTypeChangeEntity.java index 72bb1a9ea..ee888bc06 100644 --- a/src/main/java/com/glxp/api/entity/basic/BasicBusTypeChangeEntity.java +++ b/src/main/java/com/glxp/api/entity/basic/BasicBusTypeChangeEntity.java @@ -94,27 +94,39 @@ public class BasicBusTypeChangeEntity { private Integer busBeforeTime; + @TableField(exist = false) public static final String COL_ID = "id"; + @TableField(exist = false) public static final String COL_ORIGINACTION = "originAction"; + @TableField(exist = false) public static final String COL_ORIGINNAME = "originName"; + @TableField(exist = false) public static final String COL_TARGETACTION = "targetAction"; + @TableField(exist = false) public static final String COL_TYPE = "type"; + @TableField(exist = false) public static final String COL_ENABLE = "enable"; + @TableField(exist = false) public static final String COL_SYSTEMDEFAULT = "systemDefault"; + @TableField(exist = false) public static final String COL_CREATEUSER = "createUser"; + @TableField(exist = false) public static final String COL_UPDATEUSER = "updateUser"; + @TableField(exist = false) public static final String COL_CREATETIME = "createTime"; + @TableField(exist = false) public static final String COL_UPDATETIME = "updateTime"; + @TableField(exist = false) public static final String COL_REMARK = "remark"; } diff --git a/src/main/java/com/glxp/api/entity/basic/BasicBusTypePreEntity.java b/src/main/java/com/glxp/api/entity/basic/BasicBusTypePreEntity.java index 508ba1b91..b7d407464 100644 --- a/src/main/java/com/glxp/api/entity/basic/BasicBusTypePreEntity.java +++ b/src/main/java/com/glxp/api/entity/basic/BasicBusTypePreEntity.java @@ -141,39 +141,57 @@ public class BasicBusTypePreEntity { @TableField(value = "busAuditStatus") private Integer busAuditStatus; + @TableField(exist = false) public static final String COL_ID = "id"; + @TableField(exist = false) public static final String COL_INTRO = "intro"; + @TableField(exist = false) public static final String COL_ACTION = "action"; + @TableField(exist = false) public static final String COL_INDEX = "index"; + @TableField(exist = false) public static final String COL_BEFORETIME = "beforeTime"; + @TableField(exist = false) public static final String COL_CHANGETYPE = "changeType"; + @TableField(exist = false) public static final String COL_DEFAULTDEPTCODE = "defaultDeptCode"; + @TableField(exist = false) public static final String COL_DEFAULTINVCODE = "defaultInvCode"; + @TableField(exist = false) public static final String COL_DEPTCODE = "deptCode"; + @TableField(exist = false) public static final String COL_INVCODE = "invCode"; + @TableField(exist = false) public static final String COL_ORIGINACTION = "originAction"; + @TableField(exist = false) public static final String COL_CHANGEENABLE = "changeEnable"; + @TableField(exist = false) public static final String COL_SUPPLEMENTALL = "supplementAll"; + @TableField(exist = false) public static final String COL_CREATEUSER = "createUser"; + @TableField(exist = false) public static final String COL_UPDATEUSER = "updateUser"; + @TableField(exist = false) public static final String COL_CREATETIME = "createTime"; + @TableField(exist = false) public static final String COL_UPDATETIME = "updateTime"; + @TableField(exist = false) public static final String COL_REMARK = "remark"; } diff --git a/src/main/java/com/glxp/api/entity/basic/EntrustReceEntity.java b/src/main/java/com/glxp/api/entity/basic/EntrustReceEntity.java index 91e67d3f4..b04b2be4a 100644 --- a/src/main/java/com/glxp/api/entity/basic/EntrustReceEntity.java +++ b/src/main/java/com/glxp/api/entity/basic/EntrustReceEntity.java @@ -88,29 +88,42 @@ public class EntrustReceEntity { @TableField(value = "entrustEnd") private Integer entrustEnd; + @TableField(exist = false) public static final String COL_ID = "id"; + @TableField(exist = false) public static final String COL_ACTION = "action"; + @TableField(exist = false) public static final String COL_CURDEPT = "curDept"; + @TableField(exist = false) public static final String COL_CURINV = "curInv"; + @TableField(exist = false) public static final String COL_USERID = "userId"; + @TableField(exist = false) public static final String COL_ENTRUSTDEPT = "entrustDept"; + @TableField(exist = false) public static final String COL_ENTRUSTINV = "entrustInv"; + @TableField(exist = false) public static final String COL_ENTRUSTACTION = "entrustAction"; + @TableField(exist = false) public static final String COL_ENTRUSTUSER = "entrustUser"; + @TableField(exist = false) public static final String COL_FINISHRECE = "finishRece"; + @TableField(exist = false) public static final String COL_UPDATETIME = "updateTime"; + @TableField(exist = false) public static final String COL_REMARK = "remark"; + @TableField(exist = false) public static final String COL_ENTRUSTEND = "entrustEnd"; } diff --git a/src/main/java/com/glxp/api/entity/sync/BasicExportStatusEntity.java b/src/main/java/com/glxp/api/entity/sync/BasicExportStatusEntity.java index 96eefbe77..cbfac3841 100644 --- a/src/main/java/com/glxp/api/entity/sync/BasicExportStatusEntity.java +++ b/src/main/java/com/glxp/api/entity/sync/BasicExportStatusEntity.java @@ -2,6 +2,9 @@ package com.glxp.api.entity.sync; import java.util.Date; +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; import com.glxp.api.constant.BasicExportStatusEnum; import lombok.AllArgsConstructor; import lombok.Builder; @@ -12,8 +15,10 @@ import lombok.NoArgsConstructor; @AllArgsConstructor @NoArgsConstructor @Builder +@TableName("basic_export_status") public class BasicExportStatusEntity { + @TableId(type = IdType.INPUT) private String id; private String idDatas; private Integer status; diff --git a/src/main/java/com/glxp/api/entity/system/SystemPDFModuleEntity.java b/src/main/java/com/glxp/api/entity/system/SystemPDFModuleEntity.java index 5c2d8471b..105b652b8 100644 --- a/src/main/java/com/glxp/api/entity/system/SystemPDFModuleEntity.java +++ b/src/main/java/com/glxp/api/entity/system/SystemPDFModuleEntity.java @@ -1,10 +1,15 @@ package com.glxp.api.entity.system; +import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; import java.util.Date; +/** + * 打印模块 + */ @Data +@TableName("sys_pdf_module") public class SystemPDFModuleEntity { private Integer id; diff --git a/src/main/java/com/glxp/api/entity/system/SystemPDFTemplateEntity.java b/src/main/java/com/glxp/api/entity/system/SystemPDFTemplateEntity.java index da7656a26..9865b41b5 100644 --- a/src/main/java/com/glxp/api/entity/system/SystemPDFTemplateEntity.java +++ b/src/main/java/com/glxp/api/entity/system/SystemPDFTemplateEntity.java @@ -1,10 +1,12 @@ package com.glxp.api.entity.system; +import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; import java.util.Date; @Data +@TableName("sys_pdf_template") public class SystemPDFTemplateEntity { private Integer id; @@ -19,4 +21,6 @@ public class SystemPDFTemplateEntity { private Date create_time; private Date update_time; private String jrxmlPath; + private String bussinessType; + private String bussinessStatus; } diff --git a/src/main/java/com/glxp/api/entity/system/SystemParamConfigEntity.java b/src/main/java/com/glxp/api/entity/system/SystemParamConfigEntity.java index 03c43d551..ef7633d26 100644 --- a/src/main/java/com/glxp/api/entity/system/SystemParamConfigEntity.java +++ b/src/main/java/com/glxp/api/entity/system/SystemParamConfigEntity.java @@ -1,12 +1,17 @@ package com.glxp.api.entity.system; +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; import java.util.Date; @Data +@TableName("sys_param_config") public class SystemParamConfigEntity { + @TableId(value = "id", type = IdType.AUTO) private int id; private int parentId; private String paramName; diff --git a/src/main/java/com/glxp/api/service/basic/EntrustReceService.java b/src/main/java/com/glxp/api/service/basic/EntrustReceService.java index abf42527a..dd153d664 100644 --- a/src/main/java/com/glxp/api/service/basic/EntrustReceService.java +++ b/src/main/java/com/glxp/api/service/basic/EntrustReceService.java @@ -1,5 +1,6 @@ package com.glxp.api.service.basic; +import com.baomidou.mybatisplus.extension.service.IService; import com.glxp.api.entity.basic.DlEntrustReceEntity; import com.glxp.api.entity.basic.EntrustReceEntity; import com.glxp.api.req.basic.BasicEntrustRecRequest; @@ -8,7 +9,7 @@ import com.glxp.api.res.basic.EntrustReceResponse; import java.util.Date; import java.util.List; -public interface EntrustReceService { +public interface EntrustReceService extends IService { EntrustReceEntity findById(Integer id); diff --git a/src/main/java/com/glxp/api/service/basic/IBasicBusTypePreService.java b/src/main/java/com/glxp/api/service/basic/IBasicBusTypePreService.java index 3822a371d..5a3094e6a 100644 --- a/src/main/java/com/glxp/api/service/basic/IBasicBusTypePreService.java +++ b/src/main/java/com/glxp/api/service/basic/IBasicBusTypePreService.java @@ -1,5 +1,6 @@ package com.glxp.api.service.basic; +import com.baomidou.mybatisplus.extension.service.IService; import com.glxp.api.entity.basic.BasicBusTypePreEntity; import com.glxp.api.req.basic.FilterBusTypeChangeRequest; import com.glxp.api.req.basic.FilterBusTypePreRequest; @@ -11,7 +12,7 @@ import java.util.List; /** * 补单单据类型Service */ -public interface IBasicBusTypePreService { +public interface IBasicBusTypePreService extends IService { /** * 查询补单单据类型数据列表 @@ -20,6 +21,7 @@ public interface IBasicBusTypePreService { * @return */ List filterAll(FilterBusTypeChangeRequest busTypeChangeFilterRequest); + /** * 根据ID删除补单单据类型 * diff --git a/src/main/java/com/glxp/api/service/basic/impl/BasicBusTypePreServiceImpl.java b/src/main/java/com/glxp/api/service/basic/impl/BasicBusTypePreServiceImpl.java index 856aad5a2..e549a1122 100644 --- a/src/main/java/com/glxp/api/service/basic/impl/BasicBusTypePreServiceImpl.java +++ b/src/main/java/com/glxp/api/service/basic/impl/BasicBusTypePreServiceImpl.java @@ -2,6 +2,7 @@ package com.glxp.api.service.basic.impl; import cn.hutool.core.collection.CollUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.github.pagehelper.PageHelper; import com.glxp.api.dao.basic.BasicBusTypePreDao; import com.glxp.api.entity.basic.BasicBusTypePreEntity; @@ -22,7 +23,7 @@ import java.util.List; @Slf4j @Service @Transactional(rollbackFor = Exception.class) -public class BasicBusTypePreServiceImpl implements IBasicBusTypePreService { +public class BasicBusTypePreServiceImpl extends ServiceImpl implements IBasicBusTypePreService { @Resource private BasicBusTypePreDao basicBusTypePreDao; @@ -109,6 +110,7 @@ public class BasicBusTypePreServiceImpl implements IBasicBusTypePreService { public List findByLastTime(Date lastUpdateTime) { return basicBusTypePreDao.selectList(new QueryWrapper().gt("updateTime", lastUpdateTime)); } + /** * 设置创建/更新信息 * diff --git a/src/main/java/com/glxp/api/service/basic/impl/EntrustReceServiceImpl.java b/src/main/java/com/glxp/api/service/basic/impl/EntrustReceServiceImpl.java index 8baa6c206..541d8a52a 100644 --- a/src/main/java/com/glxp/api/service/basic/impl/EntrustReceServiceImpl.java +++ b/src/main/java/com/glxp/api/service/basic/impl/EntrustReceServiceImpl.java @@ -2,6 +2,7 @@ package com.glxp.api.service.basic.impl; import cn.hutool.core.collection.CollUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.github.pagehelper.PageHelper; import com.glxp.api.dao.auth.InvWarehouseDao; import com.glxp.api.dao.basic.EntrustReceDao; @@ -20,7 +21,7 @@ import java.util.List; @Service @Transactional(rollbackFor = Exception.class) -public class EntrustReceServiceImpl implements EntrustReceService { +public class EntrustReceServiceImpl extends ServiceImpl implements EntrustReceService { @Resource EntrustReceDao entrustReceDao; diff --git a/src/main/java/com/glxp/api/service/sync/HeartService.java b/src/main/java/com/glxp/api/service/sync/HeartService.java index 7af006ff4..63b1ebc64 100644 --- a/src/main/java/com/glxp/api/service/sync/HeartService.java +++ b/src/main/java/com/glxp/api/service/sync/HeartService.java @@ -24,15 +24,18 @@ import com.glxp.api.entity.purchase.*; import com.glxp.api.entity.sync.BasicDownloadStatusEntity; import com.glxp.api.entity.sync.BasicExportStatusEntity; import com.glxp.api.entity.sync.BasicExportStatusTimeEntity; -import com.glxp.api.entity.system.SyncDataSetEntity; +import com.glxp.api.entity.system.*; import com.glxp.api.entity.thrsys.*; import com.glxp.api.http.sync.SpGetHttpClient; import com.glxp.api.req.sync.SpsSyncDataRequest; import com.glxp.api.res.sync.*; import com.glxp.api.service.auth.*; +import com.glxp.api.service.basic.EntrustReceService; import com.glxp.api.service.basic.IBasicBusTypeChangeService; +import com.glxp.api.service.basic.IBasicBusTypePreService; import com.glxp.api.service.basic.IBasicBussinessTypeService; import com.glxp.api.service.inout.*; +import com.glxp.api.service.system.*; import com.glxp.api.service.thrsys.*; import com.glxp.api.util.CustomUtil; import com.glxp.api.util.DateUtil; @@ -232,7 +235,7 @@ public class HeartService { } break; case USER_DATA: - if (needExec(info.getBasicDept(), info.getBasicInv(), info.getSysUser())) { + if (!needExec(info.getBasicDept(), info.getBasicInv(), info.getSysUser())) { uploadData(exportType, taskId, x -> x.getUserData(info, taskId, now, syncTime)); } break; @@ -241,11 +244,15 @@ public class HeartService { uploadData(exportType, taskId, x -> x.getThirdData(info, taskId, now, syncTime)); } break; + case SYS_SET_DATA: + if (needExec(info.getSystemConfig(), info.getEntrustAction(), info.getPrintConfig(), info.getScanChangeConfig(), info.getBusChangeConfig())) { + uploadData(exportType, taskId, x -> x.getSysSettingData(info, taskId, now, syncTime)); + } + break; case COUNTRY_DI_DATA: } } - /** * 获取基础数据模块数据 * @@ -800,6 +807,188 @@ public class HeartService { return dataResponse; } + + private final SystemParamConfigService systemParamConfigService; + private final EntrustReceService entrustReceService; + private final SystemPDFModuleService systemPDFModuleService; + private final SystemPDFTemplateService systemPDFTemplateService; + private final SystemPDFTemplateRelevanceCodeService systemPDFTemplateRelevanceCodeService; + private final SystemPDFTemplateRelevanceBizService systemPDFTemplateRelevanceBizService; + private final SystemPDFTemplateRelevanceLabelService systemPDFTemplateRelevanceLabelService; + private final SystemPDFTemplateRelevanceStatemenService systemPDFTemplateRelevanceStatemenService; + private final IBasicBusTypePreService iBasicBusTypePreService; + private final IBasicBusTypeChangeService iBasicBusTypeChangeService; + + /** + * 获取系统设置模块数据 + * + * @param info 同步设置 + * @param now 当前时间 + * @param syncTime 同步时间 -- 传入时不操作exportTime表 + * @return + */ + private SpsSyncSysSettingResponse getSysSettingData(SyncDataSetEntity info, String taskId, Date now, Date syncTime) { + SpsSyncSysSettingResponse dataResponse = null; + Map syncTimeMap = new WeakHashMap<>(3); + syncTimeMap.put("isNew", true); + syncTimeMap.put("oldDate", syncTime); + if (needExec(info.getSystemConfig())) { + Map map; + if (syncTime == null) { + map = basicExportStatusTimeInfo(now, BasicExportStatusTimeEnum.SYSTEM_PARAM_CONFIG); + } else { + map = syncTimeMap; + } + List systemParamConfigEntities = systemParamConfigService.list(Wrappers.lambdaQuery(SystemParamConfigEntity.class) + .le((boolean) map.get("isNew"), SystemParamConfigEntity::getUpdateTime, now) + .between(!(boolean) map.get("isNew"), SystemParamConfigEntity::getUpdateTime + , map.get("oldDate"), now) + ); + if (CollectionUtil.isNotEmpty(systemParamConfigEntities)) { + dataResponse = new SpsSyncSysSettingResponse(); + dataResponse.setSystemParamConfigEntities(systemParamConfigEntities); + } + } + if (needExec(info.getEntrustAction())) { + Map map; + if (syncTime == null) { + map = basicExportStatusTimeInfo(now, BasicExportStatusTimeEnum.ENTRUST_ACCEPT); + } else { + map = syncTimeMap; + } + List entrustReceEntities = entrustReceService.list(Wrappers.lambdaQuery(EntrustReceEntity.class) + .le((boolean) map.get("isNew"), EntrustReceEntity::getUpdateTime, now) + .between(!(boolean) map.get("isNew"), EntrustReceEntity::getUpdateTime + , map.get("oldDate"), now) + ); + if (CollectionUtil.isNotEmpty(entrustReceEntities)) { + if (dataResponse == null) { + dataResponse = new SpsSyncSysSettingResponse(); + } + dataResponse.setEntrustReceEntities(entrustReceEntities); + } + } + if (needExec(info.getPrintConfig())) { + Map map; + if (syncTime == null) { + map = basicExportStatusTimeInfo(now, BasicExportStatusTimeEnum.PRINT_CONFIG); + } else { + map = syncTimeMap; + } + List systemPDFModuleEntities = systemPDFModuleService.list(Wrappers.lambdaQuery(SystemPDFModuleEntity.class) + .le((boolean) map.get("isNew"), SystemPDFModuleEntity::getUpdate_time, now) + .between(!(boolean) map.get("isNew"), SystemPDFModuleEntity::getUpdate_time + , map.get("oldDate"), now) + ); + if (CollectionUtil.isNotEmpty(systemPDFModuleEntities)) { + if (dataResponse == null) { + dataResponse = new SpsSyncSysSettingResponse(); + } + dataResponse.setSystemPDFModuleEntities(systemPDFModuleEntities); + } + + List systemPDFTemplateEntities = systemPDFTemplateService.list(Wrappers.lambdaQuery(SystemPDFTemplateEntity.class) + .le((boolean) map.get("isNew"), SystemPDFTemplateEntity::getUpdate_time, now) + .between(!(boolean) map.get("isNew"), SystemPDFTemplateEntity::getUpdate_time + , map.get("oldDate"), now) + ); + if (CollectionUtil.isNotEmpty(systemPDFTemplateEntities)) { + if (dataResponse == null) { + dataResponse = new SpsSyncSysSettingResponse(); + } + dataResponse.setSystemPDFTemplateEntities(systemPDFTemplateEntities); + } + + List sysPdfTemplateRelevanceCodeEntities = systemPDFTemplateRelevanceCodeService.list(Wrappers.lambdaQuery(SysPdfTemplateRelevanceCodeEntity.class) + .le((boolean) map.get("isNew"), SysPdfTemplateRelevanceCodeEntity::getUpdateTime, now) + .between(!(boolean) map.get("isNew"), SysPdfTemplateRelevanceCodeEntity::getUpdateTime + , map.get("oldDate"), now) + ); + if (CollectionUtil.isNotEmpty(sysPdfTemplateRelevanceCodeEntities)) { + if (dataResponse == null) { + dataResponse = new SpsSyncSysSettingResponse(); + } + dataResponse.setSysPdfTemplateRelevanceCodeEntities(sysPdfTemplateRelevanceCodeEntities); + } + + List sysPdfTemplateRelevanceBizEntities = systemPDFTemplateRelevanceBizService.list(Wrappers.lambdaQuery(SysPdfTemplateRelevanceBizEntity.class) + .le((boolean) map.get("isNew"), SysPdfTemplateRelevanceBizEntity::getUpdateTime, now) + .between(!(boolean) map.get("isNew"), SysPdfTemplateRelevanceBizEntity::getUpdateTime + , map.get("oldDate"), now) + ); + if (CollectionUtil.isNotEmpty(sysPdfTemplateRelevanceBizEntities)) { + if (dataResponse == null) { + dataResponse = new SpsSyncSysSettingResponse(); + } + dataResponse.setSysPdfTemplateRelevanceBizEntities(sysPdfTemplateRelevanceBizEntities); + } + + List sysPdfTemplateRelevanceLabelEntities = systemPDFTemplateRelevanceLabelService.list(Wrappers.lambdaQuery(SysPdfTemplateRelevanceLabelEntity.class) + .le((boolean) map.get("isNew"), SysPdfTemplateRelevanceLabelEntity::getUpdateTime, now) + .between(!(boolean) map.get("isNew"), SysPdfTemplateRelevanceLabelEntity::getUpdateTime + , map.get("oldDate"), now) + ); + if (CollectionUtil.isNotEmpty(sysPdfTemplateRelevanceLabelEntities)) { + if (dataResponse == null) { + dataResponse = new SpsSyncSysSettingResponse(); + } + dataResponse.setSysPdfTemplateRelevanceLabelEntities(sysPdfTemplateRelevanceLabelEntities); + } + + List sysPdfTemplateRelevanceStatemenEntities = systemPDFTemplateRelevanceStatemenService.list(Wrappers.lambdaQuery(SysPdfTemplateRelevanceStatemenEntity.class) + .le((boolean) map.get("isNew"), SysPdfTemplateRelevanceStatemenEntity::getUpdateTime, now) + .between(!(boolean) map.get("isNew"), SysPdfTemplateRelevanceStatemenEntity::getUpdateTime + , map.get("oldDate"), now) + ); + if (CollectionUtil.isNotEmpty(sysPdfTemplateRelevanceStatemenEntities)) { + if (dataResponse == null) { + dataResponse = new SpsSyncSysSettingResponse(); + } + dataResponse.setSysPdfTemplateRelevanceStatemenEntities(sysPdfTemplateRelevanceStatemenEntities); + } + } + + if (needExec(info.getScanChangeConfig())) { + Map map; + if (syncTime == null) { + map = basicExportStatusTimeInfo(now, BasicExportStatusTimeEnum.SCAN_CHANGE); + } else { + map = syncTimeMap; + } + List basicBusTypePreEntities = iBasicBusTypePreService.list(Wrappers.lambdaQuery(BasicBusTypePreEntity.class) + .le((boolean) map.get("isNew"), BasicBusTypePreEntity::getUpdateTime, now) + .between(!(boolean) map.get("isNew"), BasicBusTypePreEntity::getUpdateTime + , map.get("oldDate"), now) + ); + if (CollectionUtil.isNotEmpty(basicBusTypePreEntities)) { + dataResponse = new SpsSyncSysSettingResponse(); + dataResponse.setBasicBusTypePreEntities(basicBusTypePreEntities); + } + } + if (needExec(info.getBusChangeConfig())) { + Map map; + if (syncTime == null) { + map = basicExportStatusTimeInfo(now, BasicExportStatusTimeEnum.BUS_TYPE_CHANGE); + } else { + map = syncTimeMap; + } + List basicBusTypeChangeEntities = iBasicBusTypeChangeService.list(Wrappers.lambdaQuery(BasicBusTypeChangeEntity.class) + .le((boolean) map.get("isNew"), BasicBusTypeChangeEntity::getUpdateTime, now) + .between(!(boolean) map.get("isNew"), BasicBusTypeChangeEntity::getUpdateTime + , map.get("oldDate"), now) + ); + if (CollectionUtil.isNotEmpty(basicBusTypeChangeEntities)) { + dataResponse = new SpsSyncSysSettingResponse(); + dataResponse.setBasicBusTypeChangeEntities(basicBusTypeChangeEntities); + } + } + + if (dataResponse != null) { + dataResponse.setTaskId(taskId); + } + return dataResponse; + } + /** * 判断是否需要执行 由内向外 * @@ -1230,7 +1419,7 @@ public class HeartService { basicDownloadStatusEntity.setEndTime(new Date()); basicDownloadStatusEntity.setIdDatas(exportType.getKey()); basicDownloadStatusEntity.setStatus(BasicExportStatusEnum.SUCCESS.getCode()); //下载完成 - basicDownloadStatusEntity.setType(BasicProcessStatus.BASIC_DATA); + basicDownloadStatusEntity.setType(exportType.getRemark()); basicDownloadStatusEntity.setScheduleType(1); basicDownloadService.insertDownloadStatus(basicDownloadStatusEntity); //通知自助平台任务已完成 diff --git a/src/main/java/com/glxp/api/service/system/SystemPDFModuleService.java b/src/main/java/com/glxp/api/service/system/SystemPDFModuleService.java index b7d6d73a6..1881d71fc 100644 --- a/src/main/java/com/glxp/api/service/system/SystemPDFModuleService.java +++ b/src/main/java/com/glxp/api/service/system/SystemPDFModuleService.java @@ -1,6 +1,7 @@ package com.glxp.api.service.system; +import com.baomidou.mybatisplus.extension.service.IService; import com.glxp.api.entity.system.SysPdfTemplateRelevanceLabelEntity; import com.glxp.api.entity.system.SysPdfTemplateRelevanceStatemenEntity; import com.glxp.api.entity.system.SystemPDFModuleEntity; @@ -11,7 +12,7 @@ import java.util.Date; import java.util.List; -public interface SystemPDFModuleService { +public interface SystemPDFModuleService extends IService { List queryPage(FilterPdfModuleRequest filterPDFModuleRequest); diff --git a/src/main/java/com/glxp/api/service/system/SystemPDFTemplateRelevanceBizService.java b/src/main/java/com/glxp/api/service/system/SystemPDFTemplateRelevanceBizService.java index 2cb617907..456fb82e7 100644 --- a/src/main/java/com/glxp/api/service/system/SystemPDFTemplateRelevanceBizService.java +++ b/src/main/java/com/glxp/api/service/system/SystemPDFTemplateRelevanceBizService.java @@ -1,6 +1,7 @@ package com.glxp.api.service.system; +import com.baomidou.mybatisplus.extension.service.IService; import com.glxp.api.entity.system.SysPdfTemplateRelevanceBizEntity; import com.glxp.api.req.system.FilterPdfTemplateRelevanceRequest; import com.glxp.api.res.system.SystemPDFTemplateRelevanceResponse; @@ -8,7 +9,7 @@ import com.glxp.api.res.system.SystemPDFTemplateRelevanceResponse; import java.util.Date; import java.util.List; -public interface SystemPDFTemplateRelevanceBizService { +public interface SystemPDFTemplateRelevanceBizService extends IService { List getListByModelId(Integer modelId); diff --git a/src/main/java/com/glxp/api/service/system/SystemPDFTemplateRelevanceCodeService.java b/src/main/java/com/glxp/api/service/system/SystemPDFTemplateRelevanceCodeService.java index 221c69ca0..2588e3d47 100644 --- a/src/main/java/com/glxp/api/service/system/SystemPDFTemplateRelevanceCodeService.java +++ b/src/main/java/com/glxp/api/service/system/SystemPDFTemplateRelevanceCodeService.java @@ -1,6 +1,7 @@ package com.glxp.api.service.system; +import com.baomidou.mybatisplus.extension.service.IService; import com.glxp.api.entity.system.SysPdfTemplateRelevanceCodeEntity; import com.glxp.api.req.system.FilterPdfTemplateRelevanceRequest; import com.glxp.api.res.system.SystemPDFTemplateRelevanceResponse; @@ -8,7 +9,7 @@ import com.glxp.api.res.system.SystemPDFTemplateRelevanceResponse; import java.util.Date; import java.util.List; -public interface SystemPDFTemplateRelevanceCodeService { +public interface SystemPDFTemplateRelevanceCodeService extends IService { List getListByModelId(Integer modelId); diff --git a/src/main/java/com/glxp/api/service/system/SystemPDFTemplateRelevanceLabelService.java b/src/main/java/com/glxp/api/service/system/SystemPDFTemplateRelevanceLabelService.java index 68dc43569..ff58768f2 100644 --- a/src/main/java/com/glxp/api/service/system/SystemPDFTemplateRelevanceLabelService.java +++ b/src/main/java/com/glxp/api/service/system/SystemPDFTemplateRelevanceLabelService.java @@ -1,6 +1,7 @@ package com.glxp.api.service.system; +import com.baomidou.mybatisplus.extension.service.IService; import com.glxp.api.entity.system.SysPdfTemplateRelevanceLabelEntity; import com.glxp.api.req.system.FilterPdfTemplateRelevanceRequest; import com.glxp.api.res.system.SystemPDFTemplateRelevanceResponse; @@ -8,7 +9,7 @@ import com.glxp.api.res.system.SystemPDFTemplateRelevanceResponse; import java.util.Date; import java.util.List; -public interface SystemPDFTemplateRelevanceLabelService { +public interface SystemPDFTemplateRelevanceLabelService extends IService { List getListByModelId(Integer modelId); diff --git a/src/main/java/com/glxp/api/service/system/SystemPDFTemplateRelevanceStatemenService.java b/src/main/java/com/glxp/api/service/system/SystemPDFTemplateRelevanceStatemenService.java index bb6afb255..0a430a57e 100644 --- a/src/main/java/com/glxp/api/service/system/SystemPDFTemplateRelevanceStatemenService.java +++ b/src/main/java/com/glxp/api/service/system/SystemPDFTemplateRelevanceStatemenService.java @@ -1,6 +1,7 @@ package com.glxp.api.service.system; +import com.baomidou.mybatisplus.extension.service.IService; import com.glxp.api.entity.system.SysPdfTemplateRelevanceStatemenEntity; import com.glxp.api.req.system.FilterPdfTemplateRelevanceRequest; import com.glxp.api.res.system.SystemPDFTemplateRelevanceResponse; @@ -8,7 +9,7 @@ import com.glxp.api.res.system.SystemPDFTemplateRelevanceResponse; import java.util.Date; import java.util.List; -public interface SystemPDFTemplateRelevanceStatemenService { +public interface SystemPDFTemplateRelevanceStatemenService extends IService { List getListByModelId(Integer modelId); diff --git a/src/main/java/com/glxp/api/service/system/SystemPDFTemplateService.java b/src/main/java/com/glxp/api/service/system/SystemPDFTemplateService.java index d01a20417..2b7a24b52 100644 --- a/src/main/java/com/glxp/api/service/system/SystemPDFTemplateService.java +++ b/src/main/java/com/glxp/api/service/system/SystemPDFTemplateService.java @@ -1,6 +1,7 @@ package com.glxp.api.service.system; +import com.baomidou.mybatisplus.extension.service.IService; import com.glxp.api.entity.system.SystemPDFTemplateEntity; import com.glxp.api.req.system.FilterPdfTemplateRequest; import com.glxp.api.req.system.SysPdfTemplateSaveRequest; @@ -9,7 +10,7 @@ import java.util.Date; import java.util.List; -public interface SystemPDFTemplateService { +public interface SystemPDFTemplateService extends IService { List queryPage(FilterPdfTemplateRequest filterPdfTemplateRequest); diff --git a/src/main/java/com/glxp/api/service/system/SystemParamConfigService.java b/src/main/java/com/glxp/api/service/system/SystemParamConfigService.java index 8265bc4df..d0623305c 100644 --- a/src/main/java/com/glxp/api/service/system/SystemParamConfigService.java +++ b/src/main/java/com/glxp/api/service/system/SystemParamConfigService.java @@ -1,6 +1,7 @@ package com.glxp.api.service.system; +import com.baomidou.mybatisplus.extension.service.IService; import com.glxp.api.entity.system.SystemParamConfigEntity; import com.glxp.api.req.system.FilterParamConfigRequest; import com.glxp.api.req.system.SysParamConfigSaveRequest; @@ -10,7 +11,7 @@ import java.util.List; import java.util.Map; -public interface SystemParamConfigService { +public interface SystemParamConfigService extends IService { List queryPage(FilterParamConfigRequest FilterParamConfigRequest); diff --git a/src/main/java/com/glxp/api/service/system/impl/SystemPDFModuleServiceImpl.java b/src/main/java/com/glxp/api/service/system/impl/SystemPDFModuleServiceImpl.java index 185847696..d421f8165 100644 --- a/src/main/java/com/glxp/api/service/system/impl/SystemPDFModuleServiceImpl.java +++ b/src/main/java/com/glxp/api/service/system/impl/SystemPDFModuleServiceImpl.java @@ -1,5 +1,6 @@ package com.glxp.api.service.system.impl; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.github.pagehelper.PageHelper; import com.glxp.api.dao.system.SystemPDFModuleDao; import com.glxp.api.dao.system.SystemPDFTemplateRelevanceDao; @@ -18,7 +19,7 @@ import java.util.List; @Service @Transactional(rollbackFor = Exception.class) -public class SystemPDFModuleServiceImpl implements SystemPDFModuleService { +public class SystemPDFModuleServiceImpl extends ServiceImpl implements SystemPDFModuleService { @Resource SystemPDFModuleDao systemPDFModuleDao; @@ -66,7 +67,7 @@ public class SystemPDFModuleServiceImpl implements SystemPDFModuleService { @Override public boolean insert(SystemPDFModuleEntity systemPDFModuleEntity) { - return systemPDFModuleDao.insert(systemPDFModuleEntity); + return systemPDFModuleDao.insertEntity(systemPDFModuleEntity); } @Override diff --git a/src/main/java/com/glxp/api/service/system/impl/SystemPDFTemplateRelevanceBizServiceImpl.java b/src/main/java/com/glxp/api/service/system/impl/SystemPDFTemplateRelevanceBizServiceImpl.java index d9221cac7..8e8e2b2e1 100644 --- a/src/main/java/com/glxp/api/service/system/impl/SystemPDFTemplateRelevanceBizServiceImpl.java +++ b/src/main/java/com/glxp/api/service/system/impl/SystemPDFTemplateRelevanceBizServiceImpl.java @@ -1,6 +1,7 @@ package com.glxp.api.service.system.impl; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.glxp.api.dao.system.SysPdfTemplateRelevanceBizDao; import com.glxp.api.entity.system.SysPdfTemplateRelevanceBizEntity; import com.glxp.api.req.system.FilterPdfTemplateRelevanceRequest; @@ -13,7 +14,7 @@ import java.util.Date; import java.util.List; @Service -public class SystemPDFTemplateRelevanceBizServiceImpl implements SystemPDFTemplateRelevanceBizService { +public class SystemPDFTemplateRelevanceBizServiceImpl extends ServiceImpl implements SystemPDFTemplateRelevanceBizService { @Resource SysPdfTemplateRelevanceBizDao sysPdfTemplateRelevanceBizDao; diff --git a/src/main/java/com/glxp/api/service/system/impl/SystemPDFTemplateRelevanceCodeServiceImpl.java b/src/main/java/com/glxp/api/service/system/impl/SystemPDFTemplateRelevanceCodeServiceImpl.java index 737078eeb..aaf3b556a 100644 --- a/src/main/java/com/glxp/api/service/system/impl/SystemPDFTemplateRelevanceCodeServiceImpl.java +++ b/src/main/java/com/glxp/api/service/system/impl/SystemPDFTemplateRelevanceCodeServiceImpl.java @@ -1,6 +1,7 @@ package com.glxp.api.service.system.impl; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.glxp.api.dao.system.SysPdfTemplateRelevanceCodeDao; import com.glxp.api.entity.system.SysPdfTemplateRelevanceCodeEntity; import com.glxp.api.req.system.FilterPdfTemplateRelevanceRequest; @@ -13,7 +14,7 @@ import java.util.Date; import java.util.List; @Service -public class SystemPDFTemplateRelevanceCodeServiceImpl implements SystemPDFTemplateRelevanceCodeService { +public class SystemPDFTemplateRelevanceCodeServiceImpl extends ServiceImpl implements SystemPDFTemplateRelevanceCodeService { @Resource SysPdfTemplateRelevanceCodeDao sysPdfTemplateRelevanceCodeDao; diff --git a/src/main/java/com/glxp/api/service/system/impl/SystemPDFTemplateRelevanceLabelServiceImpl.java b/src/main/java/com/glxp/api/service/system/impl/SystemPDFTemplateRelevanceLabelServiceImpl.java index 2f2b23fb2..1370129b3 100644 --- a/src/main/java/com/glxp/api/service/system/impl/SystemPDFTemplateRelevanceLabelServiceImpl.java +++ b/src/main/java/com/glxp/api/service/system/impl/SystemPDFTemplateRelevanceLabelServiceImpl.java @@ -1,6 +1,7 @@ package com.glxp.api.service.system.impl; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.glxp.api.dao.system.SysPdfTemplateRelevanceLabelDao; import com.glxp.api.entity.system.SysPdfTemplateRelevanceLabelEntity; import com.glxp.api.req.system.FilterPdfTemplateRelevanceRequest; @@ -13,7 +14,7 @@ import java.util.Date; import java.util.List; @Service -public class SystemPDFTemplateRelevanceLabelServiceImpl implements SystemPDFTemplateRelevanceLabelService { +public class SystemPDFTemplateRelevanceLabelServiceImpl extends ServiceImpl implements SystemPDFTemplateRelevanceLabelService { @Resource SysPdfTemplateRelevanceLabelDao sysPdfTemplateRelevanceLabelDao; diff --git a/src/main/java/com/glxp/api/service/system/impl/SystemPDFTemplateRelevanceStatemenServiceImpl.java b/src/main/java/com/glxp/api/service/system/impl/SystemPDFTemplateRelevanceStatemenServiceImpl.java index e9fd4a65b..28c58c266 100644 --- a/src/main/java/com/glxp/api/service/system/impl/SystemPDFTemplateRelevanceStatemenServiceImpl.java +++ b/src/main/java/com/glxp/api/service/system/impl/SystemPDFTemplateRelevanceStatemenServiceImpl.java @@ -1,6 +1,7 @@ package com.glxp.api.service.system.impl; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.glxp.api.dao.system.SysPdfTemplateRelevanceStatemenDao; import com.glxp.api.entity.system.SysPdfTemplateRelevanceStatemenEntity; import com.glxp.api.req.system.FilterPdfTemplateRelevanceRequest; @@ -13,7 +14,7 @@ import java.util.Date; import java.util.List; @Service -public class SystemPDFTemplateRelevanceStatemenServiceImpl implements SystemPDFTemplateRelevanceStatemenService { +public class SystemPDFTemplateRelevanceStatemenServiceImpl extends ServiceImpl implements SystemPDFTemplateRelevanceStatemenService { @Resource SysPdfTemplateRelevanceStatemenDao sysPdfTemplateRelevanceStatemenDao; diff --git a/src/main/java/com/glxp/api/service/system/impl/SystemPDFTemplateServiceImpl.java b/src/main/java/com/glxp/api/service/system/impl/SystemPDFTemplateServiceImpl.java index eb0ea7533..321a8d6bf 100644 --- a/src/main/java/com/glxp/api/service/system/impl/SystemPDFTemplateServiceImpl.java +++ b/src/main/java/com/glxp/api/service/system/impl/SystemPDFTemplateServiceImpl.java @@ -1,5 +1,6 @@ package com.glxp.api.service.system.impl; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.github.pagehelper.PageHelper; import com.glxp.api.dao.system.SystemPDFTemplateDao; import com.glxp.api.entity.system.SystemPDFTemplateEntity; @@ -15,7 +16,7 @@ import java.util.List; @Service @Transactional(rollbackFor = Exception.class) -public class SystemPDFTemplateServiceImpl implements SystemPDFTemplateService { +public class SystemPDFTemplateServiceImpl extends ServiceImpl implements SystemPDFTemplateService { @Resource SystemPDFTemplateDao systemPDFTemplateDao; @@ -55,7 +56,7 @@ public class SystemPDFTemplateServiceImpl implements SystemPDFTemplateService { @Override public boolean insert(SystemPDFTemplateEntity systemPDFTemplateEntity) { - return systemPDFTemplateDao.insert(systemPDFTemplateEntity); + return systemPDFTemplateDao.insertEntity(systemPDFTemplateEntity); } @Override diff --git a/src/main/java/com/glxp/api/service/system/impl/SystemParamConfigServiceImpl.java b/src/main/java/com/glxp/api/service/system/impl/SystemParamConfigServiceImpl.java index a130793da..5df052bdc 100644 --- a/src/main/java/com/glxp/api/service/system/impl/SystemParamConfigServiceImpl.java +++ b/src/main/java/com/glxp/api/service/system/impl/SystemParamConfigServiceImpl.java @@ -1,6 +1,7 @@ package com.glxp.api.service.system.impl; import cn.hutool.core.collection.CollUtil; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.github.pagehelper.PageHelper; import com.glxp.api.dao.schedule.SystemParamConfigDao; import com.glxp.api.entity.system.SystemParamConfigEntity; @@ -18,7 +19,7 @@ import java.util.Map; @Service @Transactional(rollbackFor = Exception.class) -public class SystemParamConfigServiceImpl implements SystemParamConfigService { +public class SystemParamConfigServiceImpl extends ServiceImpl implements SystemParamConfigService { @Resource SystemParamConfigDao systemParamConfigDao; @@ -83,7 +84,7 @@ public class SystemParamConfigServiceImpl implements SystemParamConfigService { @Override public boolean insert(SystemParamConfigEntity systemParamConfigEntity) { systemParamConfigEntity.setUpdateTime(new Date()); - return systemParamConfigDao.insert(systemParamConfigEntity); + return systemParamConfigDao.insertEntity(systemParamConfigEntity); } diff --git a/src/main/java/com/glxp/api/task/SyncHeartTask.java b/src/main/java/com/glxp/api/task/SyncHeartTask.java index cee16ce1a..932e4b435 100644 --- a/src/main/java/com/glxp/api/task/SyncHeartTask.java +++ b/src/main/java/com/glxp/api/task/SyncHeartTask.java @@ -74,7 +74,7 @@ public class SyncHeartTask implements SchedulingConfigurer { // heartService.uploadScheduleList(); // heartService.uploadThrData(null); // heartService.uploadThrProducts(null); - heartService.uploadSysSetting(null); +// heartService.uploadSysSetting(null); Arrays.stream(BasicExportTypeEnum.values()).forEach(i -> { heartService.pushData(syncDataSetEntity, null, i); }); diff --git a/src/main/resources/mybatis/mapper/auth/InvSpaceDao.xml b/src/main/resources/mybatis/mapper/auth/InvSpaceDao.xml index 951a85e72..5d1b0a219 100644 --- a/src/main/resources/mybatis/mapper/auth/InvSpaceDao.xml +++ b/src/main/resources/mybatis/mapper/auth/InvSpaceDao.xml @@ -293,7 +293,7 @@ - select * from auth_space diff --git a/src/main/resources/mybatis/mapper/basic/BasicBusTypePreDao.xml b/src/main/resources/mybatis/mapper/basic/BasicBusTypePreDao.xml index ef64d7378..9981005ce 100644 --- a/src/main/resources/mybatis/mapper/basic/BasicBusTypePreDao.xml +++ b/src/main/resources/mybatis/mapper/basic/BasicBusTypePreDao.xml @@ -62,7 +62,7 @@ - + insert into basic_bustype_pre diff --git a/src/main/resources/mybatis/mapper/schedule/SystemParamConfigDao.xml b/src/main/resources/mybatis/mapper/schedule/SystemParamConfigDao.xml index 6646aafae..49ee881cd 100644 --- a/src/main/resources/mybatis/mapper/schedule/SystemParamConfigDao.xml +++ b/src/main/resources/mybatis/mapper/schedule/SystemParamConfigDao.xml @@ -65,7 +65,7 @@ WHERE parentId=#{parentId} - + insert INTO sys_param_config(paramName, paramKey, paramValue, paramStatus, paramType, paramExplain, updateTime) values (#{paramName}, diff --git a/src/main/resources/mybatis/mapper/system/SystemPDFModuleDao.xml b/src/main/resources/mybatis/mapper/system/SystemPDFModuleDao.xml index c4cec8f5a..6534290f9 100644 --- a/src/main/resources/mybatis/mapper/system/SystemPDFModuleDao.xml +++ b/src/main/resources/mybatis/mapper/system/SystemPDFModuleDao.xml @@ -68,7 +68,7 @@ WHERE id=#{id} - + insert INTO sys_pdf_module( name, param, fieldExplain, remark, templateId, create_time, update_time , templateDlUrl, templateType , remark1, remark2, remark3) diff --git a/src/main/resources/mybatis/mapper/system/SystemPDFTemplateDao.xml b/src/main/resources/mybatis/mapper/system/SystemPDFTemplateDao.xml index 1d5299913..85b0eff30 100644 --- a/src/main/resources/mybatis/mapper/system/SystemPDFTemplateDao.xml +++ b/src/main/resources/mybatis/mapper/system/SystemPDFTemplateDao.xml @@ -51,7 +51,7 @@ WHERE id=#{id} - + insert INTO sys_pdf_template(name, type, module, param, path, rowCount, qrcodeCount, remark, create_time, update_time, jrxmlPath) diff --git a/src/main/resources/schemas/schema_v2.1.sql b/src/main/resources/schemas/schema_v2.1.sql index 71208f2ee..3b7ec505d 100644 --- a/src/main/resources/schemas/schema_v2.1.sql +++ b/src/main/resources/schemas/schema_v2.1.sql @@ -1,13 +1,13 @@ # 字段新增 （表名，字段名，字段类型，修改方式（1：新增，2：修改，3：删除） CALL Pro_Temp_ColumnWork('auth_user_bustype', 'updateTime', - 'datetime NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP', 1); + 'datetime ', 1); CALL Pro_Temp_ColumnWork('auth_warehouse_bustype', 'updateTime', - 'datetime NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP', 1); + 'datetime ', 1); CALL Pro_Temp_ColumnWork('auth_warehouse_user', 'updateTime', - 'datetime NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP', 1); + 'datetime ', 1); CALL Pro_Temp_ColumnWork('auth_dept_user', 'updateTime', - 'datetime NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP', 1); + 'datetime ', 1); CALL Pro_Temp_ColumnWork('sync_data_set', 'department', 'tinyint ', 1); CALL Pro_Temp_ColumnWork('sync_data_set', 'warehouseDict', 'tinyint ', 1);