系统设置同步

master
wj 2 years ago
parent cbfd4c0129
commit 40603c1736

@ -71,6 +71,51 @@ public enum BasicExportStatusTimeEnum {
*
*/
USER_DATA("user_data","用户数据"),
/**
*
*/
THR_DEPT("thr_dept","第三方部门信息"),
/**
*
*/
THR_WAREHOUSE("thr_warehouse","第三方仓库信息"),
/**
*
*/
THR_PRODUCTS("thr_products","第三方产品信息"),
/**
*
*/
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;

@ -40,6 +40,11 @@ public enum BasicExportTypeEnum {
*
*/
THIRD_DATA("third_data", "第三方数据"),
/**
*
*/
SYS_SET_DATA("sys_set_data", "系统设置数据"),
;
@EnumValue
private String key;

@ -33,6 +33,7 @@ import com.glxp.api.entity.thrsys.*;
import com.glxp.api.req.sync.SpsSyncDataRequest;
import com.glxp.api.req.sync.SyncUpLoadRequest;
import com.glxp.api.res.sync.*;
import com.glxp.api.service.basic.IBasicBusTypeChangeService;
import com.glxp.api.service.inout.IoAddInoutService;
import com.glxp.api.service.inout.IoCheckInoutService;
import com.glxp.api.service.inout.IoOrderService;
@ -51,6 +52,7 @@ import org.apache.ibatis.session.SqlSession;
import org.apache.ibatis.session.SqlSessionFactory;
import org.apache.ibatis.session.TransactionIsolationLevel;
import org.springframework.beans.BeanUtils;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
@ -324,6 +326,7 @@ public class SpsSyncDownloadController {
@ApiOperation("上传同步数据")
@PostMapping("sps/sync/upload/data")
@Transactional
public Object uploadData(@RequestBody SyncUpLoadRequest upLoadRequest) {
try {
JSONObject obj = JSONUtil.parseObj(upLoadRequest.getData());
@ -343,6 +346,9 @@ public class SpsSyncDownloadController {
case THIRD_DATA:
saveUploadThrData(JSONUtil.toBean(obj, SpsSyncThrDataResponse.class));
break;
case SYS_SET_DATA:
saveUploadSysSettingData(JSONUtil.toBean(obj, SpsSyncSysSettingResponse.class));
break;
case COUNTRY_DI_DATA:
}
String taskId = obj.getStr("taskId");
@ -365,6 +371,54 @@ public class SpsSyncDownloadController {
}
private final SystemParamConfigDao systemParamConfigDao;
private final EntrustReceDao entrustReceDao;
private final SystemPDFModuleDao systemPDFModuleDao;
private final SystemPDFTemplateDao systemPDFTemplateDao;
private final SysPdfTemplateRelevanceCodeDao sysPdfTemplateRelevanceCodeDao;
private final SysPdfTemplateRelevanceBizDao sysPdfTemplateRelevanceBizDao;
private final SysPdfTemplateRelevanceLabelDao sysPdfTemplateRelevanceLabelDao;
private final SysPdfTemplateRelevanceStatemenDao sysPdfTemplateRelevanceStatemenDao;
private final BasicBusTypePreDao basicBusTypePreDao;
private final BasicBusTypeChangeDao basicBusTypeChangeDao;
private void saveUploadSysSettingData(SpsSyncSysSettingResponse bean) {
if (CollectionUtil.isNotEmpty(bean.getSystemParamConfigEntities())) {
systemParamConfigDao.insertOrUpdateBatch(bean.getSystemParamConfigEntities());
}
if (CollectionUtil.isNotEmpty(bean.getEntrustReceEntities())) {
entrustReceDao.insertOrUpdateBatch(bean.getEntrustReceEntities());
}
if (CollectionUtil.isNotEmpty(bean.getSystemPDFModuleEntities())) {
systemPDFModuleDao.insertOrUpdateBatch(bean.getSystemPDFModuleEntities());
}
if (CollectionUtil.isNotEmpty(bean.getSystemPDFTemplateEntities())) {
systemPDFTemplateDao.insertOrUpdateBatch(bean.getSystemPDFTemplateEntities());
}
if (CollectionUtil.isNotEmpty(bean.getSysPdfTemplateRelevanceCodeEntities())) {
sysPdfTemplateRelevanceCodeDao.insertOrUpdateBatch(bean.getSysPdfTemplateRelevanceCodeEntities());
}
if (CollectionUtil.isNotEmpty(bean.getSysPdfTemplateRelevanceBizEntities())) {
sysPdfTemplateRelevanceBizDao.insertOrUpdateBatch(bean.getSysPdfTemplateRelevanceBizEntities());
}
if (CollectionUtil.isNotEmpty(bean.getSysPdfTemplateRelevanceLabelEntities())) {
sysPdfTemplateRelevanceLabelDao.insertOrUpdateBatch(bean.getSysPdfTemplateRelevanceLabelEntities());
}
if (CollectionUtil.isNotEmpty(bean.getSysPdfTemplateRelevanceStatemenEntities())) {
sysPdfTemplateRelevanceStatemenDao.insertOrUpdateBatch(bean.getSysPdfTemplateRelevanceStatemenEntities());
}
if (CollectionUtil.isNotEmpty(bean.getBasicBusTypePreEntities())) {
basicBusTypePreDao.insertOrUpdateBatch(bean.getBasicBusTypePreEntities());
}
if (CollectionUtil.isNotEmpty(bean.getBasicBusTypeChangeEntities())) {
basicBusTypeChangeDao.insertOrUpdateBatch(bean.getBasicBusTypeChangeEntities());
}
}
private final ThrDeptDao thrDeptDao;
private final ThrInvWarehouseDao thrInvWarehouseDao;
private final ThrProductsDao thrProductsDao;
@ -725,7 +779,7 @@ public class SpsSyncDownloadController {
BasicBusTypeChangeDao mapper = batchSession.getMapper(BasicBusTypeChangeDao.class);
busTypeChangeEntities.forEach(busTypeChangeEntity ->
{
mapper.insertOrUpdate(busTypeChangeEntity);
mapper.insertOrUpdateEntity(busTypeChangeEntity);
});
batchSession.commit();
remark.append("业务单据类型:").append(syncDataResponse.getBussinessTypeEntities().size()).append("条\n");
@ -924,7 +978,7 @@ public class SpsSyncDownloadController {
if (CollUtil.isNotEmpty(spsSyncSysSettingResponse.getSystemParamConfigEntities())) {
List<SystemParamConfigEntity> systemParamConfigEntities = spsSyncSysSettingResponse.getSystemParamConfigEntities();
SystemParamConfigDao mapper = sqlSession.getMapper(SystemParamConfigDao.class);
systemParamConfigEntities.forEach(mapper::insertOrUpdate);
systemParamConfigEntities.forEach(mapper::insertOrUpdateEntity);
}
sqlSession.commit();
remark.append("系统运行参数:").append(spsSyncSysSettingResponse.getSystemParamConfigEntities().size()).append("条\n");
@ -933,7 +987,7 @@ public class SpsSyncDownloadController {
if (CollUtil.isNotEmpty(spsSyncSysSettingResponse.getEntrustReceEntities())) {
List<EntrustReceEntity> entrustReceEntities = spsSyncSysSettingResponse.getEntrustReceEntities();
EntrustReceDao mapper = sqlSession.getMapper(EntrustReceDao.class);
entrustReceEntities.forEach(mapper::insertOrUpdate);
entrustReceEntities.forEach(mapper::insertOrUpdateEntity);
}
sqlSession.commit();
remark.append("委托验收设置:").append(spsSyncSysSettingResponse.getEntrustReceEntities().size()).append("条\n");
@ -960,7 +1014,7 @@ public class SpsSyncDownloadController {
if (CollUtil.isNotEmpty(spsSyncSysSettingResponse.getSysPdfTemplateRelevanceCodeEntities())) {
List<SysPdfTemplateRelevanceCodeEntity> sysPdfTemplateRelevanceCodeEntities = spsSyncSysSettingResponse.getSysPdfTemplateRelevanceCodeEntities();
SysPdfTemplateRelevanceCodeDao mapper = sqlSession.getMapper(SysPdfTemplateRelevanceCodeDao.class);
sysPdfTemplateRelevanceCodeEntities.forEach(mapper::insertOrUpdate);
sysPdfTemplateRelevanceCodeEntities.forEach(mapper::insertOrUpdateEntity);
}
sqlSession.commit();
remark.append("扫码单据关联表:").append(spsSyncSysSettingResponse.getSysPdfTemplateRelevanceCodeEntities().size()).append("条\n");
@ -969,7 +1023,7 @@ public class SpsSyncDownloadController {
if (CollUtil.isNotEmpty(spsSyncSysSettingResponse.getSysPdfTemplateRelevanceBizEntities())) {
List<SysPdfTemplateRelevanceBizEntity> sysPdfTemplateRelevanceBizEntities = spsSyncSysSettingResponse.getSysPdfTemplateRelevanceBizEntities();
SysPdfTemplateRelevanceBizDao mapper = sqlSession.getMapper(SysPdfTemplateRelevanceBizDao.class);
sysPdfTemplateRelevanceBizEntities.forEach(mapper::insertOrUpdate);
sysPdfTemplateRelevanceBizEntities.forEach(mapper::insertOrUpdateEntity);
}
sqlSession.commit();
remark.append("业务单据关联表:").append(spsSyncSysSettingResponse.getSysPdfTemplateRelevanceBizEntities().size()).append("条\n");
@ -978,7 +1032,7 @@ public class SpsSyncDownloadController {
if (CollUtil.isNotEmpty(spsSyncSysSettingResponse.getSysPdfTemplateRelevanceLabelEntities())) {
List<SysPdfTemplateRelevanceLabelEntity> sysPdfTemplateRelevanceLabelEntities = spsSyncSysSettingResponse.getSysPdfTemplateRelevanceLabelEntities();
SysPdfTemplateRelevanceLabelDao mapper = sqlSession.getMapper(SysPdfTemplateRelevanceLabelDao.class);
sysPdfTemplateRelevanceLabelEntities.forEach(mapper::insertOrUpdate);
sysPdfTemplateRelevanceLabelEntities.forEach(mapper::insertOrUpdateEntity);
}
sqlSession.commit();
remark.append("内部码打印关联表:").append(spsSyncSysSettingResponse.getSystemParamConfigEntities().size()).append("条\n");
@ -987,7 +1041,7 @@ public class SpsSyncDownloadController {
if (CollUtil.isNotEmpty(spsSyncSysSettingResponse.getSysPdfTemplateRelevanceStatemenEntities())) {
List<SysPdfTemplateRelevanceStatemenEntity> sysPdfTemplateRelevanceStatemenEntities = spsSyncSysSettingResponse.getSysPdfTemplateRelevanceStatemenEntities();
SysPdfTemplateRelevanceStatemenDao mapper = sqlSession.getMapper(SysPdfTemplateRelevanceStatemenDao.class);
sysPdfTemplateRelevanceStatemenEntities.forEach(mapper::insertOrUpdate);
sysPdfTemplateRelevanceStatemenEntities.forEach(mapper::insertOrUpdateEntity);
}
sqlSession.commit();
remark.append("资质证书打印关联表:").append(spsSyncSysSettingResponse.getSysPdfTemplateRelevanceStatemenEntities().size()).append("条\n");
@ -1005,7 +1059,7 @@ public class SpsSyncDownloadController {
if (CollUtil.isNotEmpty(spsSyncSysSettingResponse.getBasicBusTypeChangeEntities())) {
List<BasicBusTypeChangeEntity> basicBusTypeChangeEntities = spsSyncSysSettingResponse.getBasicBusTypeChangeEntities();
BasicBusTypeChangeDao mapper = sqlSession.getMapper(BasicBusTypeChangeDao.class);
basicBusTypeChangeEntities.forEach(mapper::insertOrUpdate);
basicBusTypeChangeEntities.forEach(mapper::insertOrUpdateEntity);
}
sqlSession.commit();
remark.append("自动建业务单设置:").append(spsSyncSysSettingResponse.getBasicBusTypeChangeEntities().size()).append("条\n");

@ -42,7 +42,7 @@ public interface InvSpaceDao extends BaseMapperPlus<InvSpaceDao, InvSpace, InvSp
* @param invSpace
* @return
*/
List<InvSpace> selectList(InvSpace invSpace);
List<InvSpace> selectEntityList(InvSpace invSpace);
/**
*

@ -22,5 +22,5 @@ public interface BasicBusTypeChangeDao extends BaseMapperPlus<BasicBusTypeChange
*/
List<BasicBusTypeChangeResponse> filterList(FilterBusTypeChangeRequest filterBusTypeChangeRequest);
boolean insertOrUpdate(BasicBusTypeChangeEntity record);
boolean insertOrUpdateEntity(BasicBusTypeChangeEntity record);
}

@ -27,6 +27,6 @@ public interface EntrustReceDao extends BaseMapperPlus<EntrustReceDao, EntrustRe
boolean deleteAll();
boolean insertOrUpdate(EntrustReceEntity record);
boolean insertOrUpdateEntity(EntrustReceEntity record);
}

@ -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;
@ -9,7 +10,7 @@ import org.apache.ibatis.annotations.Param;
import java.util.List;
@Mapper
public interface SystemParamConfigDao {
public interface SystemParamConfigDao extends BaseMapperPlus<SystemParamConfigDao,SystemParamConfigEntity,SystemParamConfigEntity> {
List<SystemParamConfigEntity> queryPage(FilterParamConfigRequest filterParamConfigRequest);
@ -27,8 +28,8 @@ public interface SystemParamConfigDao {
boolean updateParentId(SysParamConfigSaveRequest sysParamConfigSaveRequest);
boolean insert(SystemParamConfigEntity systemParamConfigEntity);
boolean insertEntity(SystemParamConfigEntity systemParamConfigEntity);
int insertOrUpdate(SystemParamConfigEntity record);
int insertOrUpdateEntity(SystemParamConfigEntity record);
}

@ -1,17 +1,17 @@
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<SysPdfTemplateRelevanceBizEntity> {
public interface SysPdfTemplateRelevanceBizDao extends BaseMapperPlus<SysPdfTemplateRelevanceBizDao, SysPdfTemplateRelevanceBizEntity, SysPdfTemplateRelevanceBizEntity> {
List<SystemPDFTemplateRelevanceResponse> filterList(FilterPdfTemplateRelevanceRequest systemPDFModuleRequest);
boolean upInsert(SysPdfTemplateRelevanceBizEntity sysPdfTemplateRelevanceBizEntity);
boolean insertOrUpdate(SysPdfTemplateRelevanceBizEntity sysPdfTemplateRelevanceBizEntity);
boolean insertOrUpdateEntity(SysPdfTemplateRelevanceBizEntity sysPdfTemplateRelevanceBizEntity);
}

@ -1,6 +1,6 @@
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 +8,7 @@ import org.apache.ibatis.annotations.Param;
import java.util.List;
public interface SysPdfTemplateRelevanceCodeDao extends BaseMapper<SysPdfTemplateRelevanceCodeEntity> {
public interface SysPdfTemplateRelevanceCodeDao extends BaseMapperPlus<SysPdfTemplateRelevanceCodeDao, SysPdfTemplateRelevanceCodeEntity, SysPdfTemplateRelevanceCodeEntity> {
List<SystemPDFTemplateRelevanceResponse> filterList(FilterPdfTemplateRelevanceRequest systemPDFModuleRequest);
@ -16,6 +16,6 @@ public interface SysPdfTemplateRelevanceCodeDao extends BaseMapper<SysPdfTemplat
SysPdfTemplateRelevanceCodeEntity selectNameAndAction(@Param("name") String name, @Param("localAction") String localAction);
boolean insertOrUpdate(SysPdfTemplateRelevanceCodeEntity sysPdfTemplateRelevanceCodeEntity);
boolean insertOrUpdateEntity(SysPdfTemplateRelevanceCodeEntity sysPdfTemplateRelevanceCodeEntity);
}

@ -1,15 +1,15 @@
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.SysPdfTemplateRelevanceLabelEntity;
import com.glxp.api.req.system.FilterPdfTemplateRelevanceRequest;
import com.glxp.api.res.system.SystemPDFTemplateRelevanceResponse;
import java.util.List;
public interface SysPdfTemplateRelevanceLabelDao extends BaseMapper<SysPdfTemplateRelevanceLabelEntity> {
public interface SysPdfTemplateRelevanceLabelDao extends BaseMapperPlus<SysPdfTemplateRelevanceLabelDao, SysPdfTemplateRelevanceLabelEntity, SysPdfTemplateRelevanceLabelEntity> {
List<SystemPDFTemplateRelevanceResponse> filterList(FilterPdfTemplateRelevanceRequest systemPDFModuleRequest);
boolean insertOrUpdate(SysPdfTemplateRelevanceLabelEntity sysPdfTemplateRelevanceLabelEntity);
boolean insertOrUpdateEntity(SysPdfTemplateRelevanceLabelEntity sysPdfTemplateRelevanceLabelEntity);
}

@ -1,16 +1,16 @@
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<SysPdfTemplateRelevanceStatemenEntity> {
public interface SysPdfTemplateRelevanceStatemenDao extends BaseMapperPlus<SysPdfTemplateRelevanceStatemenDao,SysPdfTemplateRelevanceStatemenEntity,SysPdfTemplateRelevanceStatemenEntity> {
List<SystemPDFTemplateRelevanceResponse> filterList(FilterPdfTemplateRelevanceRequest systemPDFModuleRequest);
boolean insertOrUpdate(SysPdfTemplateRelevanceStatemenEntity sysPdfTemplateRelevanceStatemenEntity);
boolean insertOrUpdateEntity(SysPdfTemplateRelevanceStatemenEntity sysPdfTemplateRelevanceStatemenEntity);
}

@ -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;
@ -8,7 +9,7 @@ import org.apache.ibatis.annotations.Mapper;
import java.util.List;
@Mapper
public interface SystemPDFModuleDao {
public interface SystemPDFModuleDao extends BaseMapperPlus<SystemPDFModuleDao, SystemPDFModuleEntity, SystemPDFModuleEntity> {
List<SystemPDFModuleEntity> queryPage(FilterPdfModuleRequest filterPDFModuleRequest);
@ -23,7 +24,7 @@ public interface SystemPDFModuleDao {
boolean updateById(SysPdfModuleSaveRequest sysPdfModuleSaveRequest);
boolean insert(SystemPDFModuleEntity systemPDFModuleEntity);
boolean insertEntity(SystemPDFModuleEntity systemPDFModuleEntity);
boolean deleteById(Integer id);

@ -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;
@ -8,7 +9,7 @@ import org.apache.ibatis.annotations.Mapper;
import java.util.List;
@Mapper
public interface SystemPDFTemplateDao {
public interface SystemPDFTemplateDao extends BaseMapperPlus<SystemPDFTemplateDao,SystemPDFTemplateEntity,SystemPDFTemplateEntity> {
List<SystemPDFTemplateEntity> queryPage(FilterPdfTemplateRequest filterPdfTemplateRequest);
@ -20,7 +21,7 @@ public interface SystemPDFTemplateDao {
boolean updateById(SysPdfTemplateSaveRequest sysPdfTemplateSaveRequest);
boolean insert(SystemPDFTemplateEntity systemPDFTemplateEntity);
boolean insertEntity(SystemPDFTemplateEntity systemPDFTemplateEntity);
boolean deleteById(Integer id);

@ -9,6 +9,7 @@ import java.util.Date;
@Data
@TableName(value = "auth_dept_user")
public class DeptUserEntity {
@TableField(value = "deptId")
private Long deptId;
@TableField(value = "userId")

@ -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";
}

@ -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";
}

@ -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";
}

@ -1,11 +1,13 @@
package com.glxp.api.entity.system;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data;
import java.util.Date;
@Data
@TableName("sys_pdf_module")
public class SystemPDFModuleEntity {
private Integer id;
@ -22,7 +24,4 @@ public class SystemPDFModuleEntity {
private String remark2;
private String remark3;
private String modelKey;
@TableField(value = "updateTime")
private Date updateTime;
}

@ -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;

@ -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;
@ -7,7 +8,7 @@ import com.glxp.api.res.basic.EntrustReceResponse;
import java.util.List;
public interface EntrustReceService {
public interface EntrustReceService extends IService<EntrustReceEntity> {
EntrustReceEntity findById(Integer id);

@ -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;
@ -10,7 +11,7 @@ import java.util.List;
/**
* Service
*/
public interface IBasicBusTypePreService {
public interface IBasicBusTypePreService extends IService<BasicBusTypePreEntity> {
/**
*

@ -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<BasicBusTypePreDao, BasicBusTypePreEntity> implements IBasicBusTypePreService {
@Resource
private BasicBusTypePreDao basicBusTypePreDao;

@ -1,6 +1,7 @@
package com.glxp.api.service.basic.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.auth.InvWarehouseDao;
import com.glxp.api.dao.basic.EntrustReceDao;
@ -18,7 +19,7 @@ import java.util.List;
@Service
@Transactional(rollbackFor = Exception.class)
public class EntrustReceServiceImpl implements EntrustReceService {
public class EntrustReceServiceImpl extends ServiceImpl<EntrustReceDao,EntrustReceEntity> implements EntrustReceService {
@Resource
EntrustReceDao entrustReceDao;

@ -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;
@ -10,7 +11,7 @@ import com.glxp.api.req.system.SysPdfModuleSaveRequest;
import java.util.List;
public interface SystemPDFModuleService {
public interface SystemPDFModuleService extends IService<SystemPDFModuleEntity> {
List<SystemPDFModuleEntity> queryPage(FilterPdfModuleRequest filterPDFModuleRequest);

@ -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.entity.system.SystemPDFTemplateRelevanceEntity;
import com.glxp.api.req.system.FilterPdfTemplateRelevanceRequest;
@ -8,7 +9,7 @@ import com.glxp.api.res.system.SystemPDFTemplateRelevanceResponse;
import java.util.List;
public interface SystemPDFTemplateRelevanceBizService {
public interface SystemPDFTemplateRelevanceBizService extends IService<SysPdfTemplateRelevanceBizEntity> {
List<SysPdfTemplateRelevanceBizEntity> getListByModelId(Integer modelId);

@ -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.entity.system.SysPdfTemplateRelevanceCodeEntity;
import com.glxp.api.req.system.FilterPdfTemplateRelevanceRequest;
@ -9,7 +10,7 @@ import org.apache.ibatis.annotations.Param;
import java.util.List;
public interface SystemPDFTemplateRelevanceCodeService {
public interface SystemPDFTemplateRelevanceCodeService extends IService<SysPdfTemplateRelevanceCodeEntity> {
List<SysPdfTemplateRelevanceCodeEntity> getListByModelId(Integer modelId);

@ -1,13 +1,14 @@
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;
import java.util.List;
public interface SystemPDFTemplateRelevanceLabelService {
public interface SystemPDFTemplateRelevanceLabelService extends IService<SysPdfTemplateRelevanceLabelEntity> {
List<SysPdfTemplateRelevanceLabelEntity> getListByModelId(Integer modelId);

@ -1,13 +1,14 @@
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;
import java.util.List;
public interface SystemPDFTemplateRelevanceStatemenService {
public interface SystemPDFTemplateRelevanceStatemenService extends IService<SysPdfTemplateRelevanceStatemenEntity> {
List<SysPdfTemplateRelevanceStatemenEntity> getListByModelId(Integer modelId);
@ -16,6 +17,4 @@ public interface SystemPDFTemplateRelevanceStatemenService {
boolean udpateRl(SysPdfTemplateRelevanceStatemenEntity sysPdfTemplateRelevanceStatemenEntity);
}

@ -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;
@ -8,7 +9,7 @@ import com.glxp.api.req.system.SysPdfTemplateSaveRequest;
import java.util.List;
public interface SystemPDFTemplateService {
public interface SystemPDFTemplateService extends IService<SystemPDFTemplateEntity> {
List<SystemPDFTemplateEntity> queryPage(FilterPdfTemplateRequest filterPdfTemplateRequest);

@ -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;
@ -9,7 +10,7 @@ import java.util.List;
import java.util.Map;
public interface SystemParamConfigService {
public interface SystemParamConfigService extends IService<SystemParamConfigEntity> {
List<SystemParamConfigEntity> queryPage(FilterParamConfigRequest FilterParamConfigRequest);

@ -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;
@ -17,12 +18,12 @@ import java.util.List;
@Service
@Transactional(rollbackFor = Exception.class)
public class SystemPDFModuleServiceImpl implements SystemPDFModuleService {
public class SystemPDFModuleServiceImpl extends ServiceImpl<SystemPDFModuleDao, SystemPDFModuleEntity> implements SystemPDFModuleService {
@Resource
SystemPDFModuleDao systemPDFModuleDao;
@Resource
SystemPDFTemplateRelevanceDao systemPDFTemplateRelevanceDao;
SystemPDFTemplateRelevanceDao systemPDFTemplateRelevanceDao;
@Override
@ -71,7 +72,7 @@ public class SystemPDFModuleServiceImpl implements SystemPDFModuleService {
@Override
public boolean insert(SystemPDFModuleEntity systemPDFModuleEntity) {
return systemPDFModuleDao.insert(systemPDFModuleEntity);
return systemPDFModuleDao.insertEntity(systemPDFModuleEntity);
}
@Override

@ -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<SysPdfTemplateRelevanceBizDao, SysPdfTemplateRelevanceBizEntity> implements SystemPDFTemplateRelevanceBizService {
@Resource
SysPdfTemplateRelevanceBizDao sysPdfTemplateRelevanceBizDao;

@ -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<SysPdfTemplateRelevanceCodeDao,SysPdfTemplateRelevanceCodeEntity> implements SystemPDFTemplateRelevanceCodeService {
@Resource
SysPdfTemplateRelevanceCodeDao sysPdfTemplateRelevanceCodeDao;

@ -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<SysPdfTemplateRelevanceLabelDao, SysPdfTemplateRelevanceLabelEntity> implements SystemPDFTemplateRelevanceLabelService {
@Resource
SysPdfTemplateRelevanceLabelDao sysPdfTemplateRelevanceLabelDao;

@ -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<SysPdfTemplateRelevanceStatemenDao,SysPdfTemplateRelevanceStatemenEntity> implements SystemPDFTemplateRelevanceStatemenService {
@Resource
SysPdfTemplateRelevanceStatemenDao sysPdfTemplateRelevanceStatemenDao;

@ -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;
@ -14,7 +15,7 @@ import java.util.List;
@Service
@Transactional(rollbackFor = Exception.class)
public class SystemPDFTemplateServiceImpl implements SystemPDFTemplateService {
public class SystemPDFTemplateServiceImpl extends ServiceImpl<SystemPDFTemplateDao, SystemPDFTemplateEntity> implements SystemPDFTemplateService {
@Resource
SystemPDFTemplateDao systemPDFTemplateDao;
@ -54,7 +55,7 @@ public class SystemPDFTemplateServiceImpl implements SystemPDFTemplateService {
@Override
public boolean insert(SystemPDFTemplateEntity systemPDFTemplateEntity) {
return systemPDFTemplateDao.insert(systemPDFTemplateEntity);
return systemPDFTemplateDao.insertEntity(systemPDFTemplateEntity);
}
@Override

@ -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<SystemParamConfigDao, SystemParamConfigEntity> implements SystemParamConfigService {
@Resource
SystemParamConfigDao systemParamConfigDao;
@ -82,7 +83,7 @@ public class SystemParamConfigServiceImpl implements SystemParamConfigService {
@Override
public boolean insert(SystemParamConfigEntity systemParamConfigEntity) {
systemParamConfigEntity.setUpdateTime(new Date());
return systemParamConfigDao.insert(systemParamConfigEntity);
return systemParamConfigDao.insertEntity(systemParamConfigEntity);
}

@ -293,7 +293,7 @@
</where>
</select>
<select id="selectList" resultMap="BaseResultMap">
<select id="selectEntityList" resultMap="BaseResultMap">
select *
from auth_space
<where>

@ -31,7 +31,7 @@
</where>
</select>
<insert id="insertOrUpdate" keyColumn="id" keyProperty="id" parameterType="com.glxp.api.entity.basic.BasicBusTypeChangeEntity" useGeneratedKeys="true">
<insert id="insertOrUpdateEntity" keyColumn="id" keyProperty="id" parameterType="com.glxp.api.entity.basic.BasicBusTypeChangeEntity" useGeneratedKeys="true">
insert into basic_bustype_change
<trim prefix="(" suffix=")" suffixOverrides=",">
<if test="id != null">

@ -163,7 +163,7 @@
FROM basic_entrust_accept
</delete>
<insert id="insertOrUpdate" keyColumn="id" keyProperty="id" parameterType="com.glxp.api.entity.basic.EntrustReceEntity" useGeneratedKeys="true">
<insert id="insertOrUpdateEntity" keyColumn="id" keyProperty="id" parameterType="com.glxp.api.entity.basic.EntrustReceEntity" useGeneratedKeys="true">
insert into basic_entrust_accept
<trim prefix="(" suffix=")" suffixOverrides=",">
<if test="id != null">

@ -65,7 +65,7 @@
WHERE parentId=#{parentId}
</update>
<insert id="insert" parameterType="com.glxp.api.entity.system.SystemParamConfigEntity">
<insert id="insertEntity" parameterType="com.glxp.api.entity.system.SystemParamConfigEntity">
insert INTO sys_param_config(paramName,
paramKey, paramValue, paramStatus, paramType, paramExplain, updateTime)
values (#{paramName},
@ -82,7 +82,7 @@
select paramValue from sys_param_config where paramKey = #{key}
</select>
<insert id="insertOrUpdate" keyColumn="id" keyProperty="id" parameterType="com.glxp.api.entity.system.SystemParamConfigEntity" useGeneratedKeys="true">
<insert id="insertOrUpdateEntity" keyColumn="id" keyProperty="id" parameterType="com.glxp.api.entity.system.SystemParamConfigEntity" useGeneratedKeys="true">
insert into sys_param_config
<trim prefix="(" suffix=")" suffixOverrides=",">
<if test="id != null">

@ -82,7 +82,7 @@
#{updateTime})
</insert>
<insert id="insertOrUpdate" keyColumn="id" keyProperty="id"
<insert id="insertOrUpdateEntity" keyColumn="id" keyProperty="id"
parameterType="com.glxp.api.entity.system.SysPdfTemplateRelevanceBizEntity" useGeneratedKeys="true">
insert into sys_pdf_template_relevance_biz
<trim prefix="(" suffix=")" suffixOverrides=",">

@ -94,7 +94,7 @@
</where>
</select>
<insert id="insertOrUpdate" keyColumn="id" keyProperty="id"
<insert id="insertOrUpdateEntity" keyColumn="id" keyProperty="id"
parameterType="com.glxp.api.entity.system.SysPdfTemplateRelevanceCodeEntity" useGeneratedKeys="true">
insert into sys_pdf_template_relevance_code
<trim prefix="(" suffix=")" suffixOverrides=",">

@ -60,7 +60,7 @@
</where>
</select>
<insert id="insertOrUpdate" keyColumn="id" keyProperty="id"
<insert id="insertOrUpdateEntity" keyColumn="id" keyProperty="id"
parameterType="com.glxp.api.entity.system.SysPdfTemplateRelevanceLabelEntity" useGeneratedKeys="true">
insert into sys_pdf_template_relevance_label
<trim prefix="(" suffix=")" suffixOverrides=",">

@ -61,7 +61,7 @@
</where>
</select>
<insert id="insertOrUpdate" keyColumn="id" keyProperty="id"
<insert id="insertOrUpdateEntity" keyColumn="id" keyProperty="id"
parameterType="com.glxp.api.entity.system.SysPdfTemplateRelevanceStatemenEntity" useGeneratedKeys="true">
insert into sys_pdf_template_relevance_statemen
<trim prefix="(" suffix=")" suffixOverrides=",">

@ -100,7 +100,7 @@
WHERE id = #{id}
</update>
<insert id="insert" parameterType="com.glxp.api.entity.system.SystemPDFModuleEntity">
<insert id="insertEntity" parameterType="com.glxp.api.entity.system.SystemPDFModuleEntity">
insert INTO sys_pdf_module( name, param, fieldExplain, remark, templateId, create_time, update_time
, templateDlUrl, templateType
, remark1, remark2, remark3)

@ -90,7 +90,7 @@
WHERE id = #{id}
</update>
<insert id="insert" parameterType="com.glxp.api.entity.system.SystemPDFTemplateEntity">
<insert id="insertEntity" parameterType="com.glxp.api.entity.system.SystemPDFTemplateEntity">
insert INTO sys_pdf_template(name,
type, module, param, path, rowCount, qrcodeCount, remark, create_time,
update_time, jrxmlPath, bussinessType, bussinessStatus)

Loading…
Cancel
Save