同步设置相关修改

master
anthonywj 2 years ago
parent 9c16967583
commit 0de4f1a2e4

@ -2,16 +2,17 @@ package com.glxp.api.controller.sync;
import cn.hutool.core.collection.CollUtil;
import com.glxp.api.annotation.AuthRuleAnnotation;
import com.glxp.api.common.enums.ResultEnum;
import com.glxp.api.common.res.BaseResponse;
import com.glxp.api.common.util.ResultVOUtils;
import com.glxp.api.constant.Constant;
import com.glxp.api.entity.sync.SyncDataBustypeEntity;
import com.glxp.api.entity.sync.SyncDataSetEntity;
import com.glxp.api.res.system.SyncDataSetResponse;
import com.glxp.api.service.sync.SyncDataBustypeService;
import com.glxp.api.service.sync.SyncDataChangeBustypeService;
import com.glxp.api.service.sync.SyncDataSetService;
import com.glxp.api.util.RedisUtil;
import com.glxp.api.common.enums.ResultEnum;
import com.glxp.api.common.res.BaseResponse;
import com.glxp.api.common.util.ResultVOUtils;
import org.springframework.beans.BeanUtils;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping;
@ -20,6 +21,7 @@ import org.springframework.web.bind.annotation.RestController;
import javax.annotation.Resource;
import javax.validation.Valid;
import java.util.Date;
import java.util.List;
@RestController
@ -31,6 +33,8 @@ public class SyncDataSetController {
@Resource
private SyncDataBustypeService syncDataBustypeService;
@Resource
private SyncDataChangeBustypeService syncDataChangeBustypeService;
@Resource
private RedisUtil redisUtil;
@ -54,11 +58,24 @@ public class SyncDataSetController {
) {
SyncDataSetEntity syncDataSetEntity = new SyncDataSetEntity();
BeanUtils.copyProperties(syncDataSetResponse, syncDataSetEntity);
syncDataSetEntity.setUpdateTime(new Date());
syncDataSetEntity.setId(1);
List<SyncDataBustypeEntity> busTypes = syncDataSetResponse.getBusTypes();
syncDataBustypeService.deleteAll();
syncDataBustypeService.deleteAll(1);
if (CollUtil.isNotEmpty(busTypes))
syncDataBustypeService.inserts(busTypes);
syncDataSetEntity.setBusTypes(null);
List<SyncDataBustypeEntity> toInBusTypes = syncDataSetResponse.getToInBusTypes();
syncDataBustypeService.deleteAll(2);
if (CollUtil.isNotEmpty(toInBusTypes))
syncDataBustypeService.inserts(toInBusTypes);
if (CollUtil.isNotEmpty(syncDataSetResponse.getChangeBusTypes())) {
syncDataChangeBustypeService.deleteAll();
syncDataChangeBustypeService.inserts(syncDataSetResponse.getChangeBusTypes());
}
boolean b = syncDataSetService.insert(syncDataSetEntity);
if (syncDataSetResponse.getDelaySyncTime() != null &&
syncDataSetResponse.getDelaySyncTime() > 0) {
@ -70,6 +87,4 @@ public class SyncDataSetController {
}
return ResultVOUtils.success();
}
}

@ -0,0 +1,7 @@
package com.glxp.api.dao.sync;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.glxp.api.entity.sync.SyncDataChangeBustypesEntity;
public interface SyncDataChangeBustypesDao extends BaseMapper<SyncDataChangeBustypesEntity> {
}

@ -1,5 +1,6 @@
package com.glxp.api.dao.system;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.glxp.api.entity.sync.SyncDataBustypeEntity;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
@ -7,11 +8,10 @@ import org.apache.ibatis.annotations.Param;
import java.util.List;
@Mapper
public interface SyncDataBustypeDao {
public interface SyncDataBustypeDao extends BaseMapper<SyncDataBustypeEntity> {
List<SyncDataBustypeEntity> findAll();
boolean deleteAll();
void inserts(@Param("syncDataBustypeEntities") List<SyncDataBustypeEntity> syncDataBustypeEntities);

@ -1,14 +1,27 @@
package com.glxp.api.entity.sync;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data;
/**
*
*/
@Data
@TableName(value = "sync_data_bustypes")
public class SyncDataBustypeEntity {
@TableId(value = "id", type = IdType.AUTO)
private Integer id;
@TableField(value = "`action`")
private String action;
@TableField(value = "`name`")
private String name;
@TableField(value = "`outChange`")
private boolean outChange;
@TableField(value = "`orderStatus`")
private Integer orderStatus; //单据状态
@TableField(value = "`direct`")
private int direct; //1:UDI管理系统->SPMS 2:SPMS->UDI管理系统
}

@ -0,0 +1,31 @@
package com.glxp.api.entity.sync;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data;
/**
* -
*/
@Data
@TableName(value = "sync_data_change_bustypes")
public class SyncDataChangeBustypesEntity {
@TableId(value = "id", type = IdType.AUTO)
private Integer id;
@TableField(value = "`action`")
private String action;
@TableField(value = "`name`")
private String name;
@TableField(value = "outChange")
private boolean outChange;
@TableField(value = "orderStatus")
private Integer orderStatus;
}

@ -2,47 +2,62 @@ package com.glxp.api.entity.sync;
import lombok.Data;
import java.util.Date;
import java.util.List;
@Data
public class SyncDataSetEntity {
private Integer id;
private boolean typeBus;
private boolean typeScan;
private boolean typeThird;
private boolean basicProducts;
private boolean basicCorp;
private boolean basicInv;
private boolean basicType;
private boolean basicDept;
private boolean basicThirdProducts;
private boolean basicThirdCorp;
private boolean basicThirdInv;
private boolean basicThirdBusOrder;
private boolean dbDiProducts;
private boolean downstreamEnable;
private boolean orderScanFinish;
private boolean orderUnReceive;
private boolean orderUnCheck;
private int typeBus; //业务单据类型
private int typeScan; //扫码单据类型
private int typeThird; //第三方单据类型
private int basicProducts; //耗材字典
private int basicCorp; //往来单位字典
private int basicDept; //部门字典
private int basicInv; //仓库字典
private int basicThirdProducts; //第三方产品信息
private int basicThirdCorp; //第三方往来信息
private int basicThirdInv; //第三方仓库信息
private int basicThirdBusOrder; //第三方业务单据
private int dbDiProducts; //DI产品信息
private boolean downstreamEnable; //上游是否联通
private Integer syncTime; //数据上传间隔时间
private Integer syncDownloadTime; //数据下载间隔时间
private int sysUser; //系统用户信息
private int entrustAction; //委托验收设置
private int systemConfig; //系统参数设置
private int printConfig; //打印设置
private int scanChangeConfig; //自动建出入库单设置
private int busChangeConfig; //自动建业务单设置
private int orderScanFinish; //已完成单据
private int orderUnReceive; //未验收单据
private int orderUnCheck; //待校验单据
private int supCert; //首营资质证书
private String syncIp; //上级服务地址
private Integer orderSyncTime; //单据向外同步时间
private Integer orderSyncDlTime; //单据向内同步时间
private Integer orderToInSyncTime; //单据向内同步时间
private Integer delaySyncTime;
private int unCheckCert;
private int checkedCert;
private String busTypes;
private boolean sysUser;
private Integer syncTime;
private Integer orderSyncTime;
private String orderSyncStart;
private String basicSyncStart;
private boolean entrustAction;
private Date updateTime;
private boolean unCheckCert;
private boolean checkedCert;
private boolean companyCert;
private boolean manufacturerCert;
private boolean productCert;
private int companyCert;
private int manufacturerCert;
private int productCert;
private String syncIp;
}

@ -1,6 +1,7 @@
package com.glxp.api.res.system;
import com.glxp.api.entity.sync.SyncDataBustypeEntity;
import com.glxp.api.entity.sync.SyncDataChangeBustypesEntity;
import lombok.Data;
import java.util.List;
@ -8,43 +9,47 @@ import java.util.List;
@Data
public class SyncDataSetResponse {
private Integer id;
private boolean typeBus;
private boolean typeScan;
private boolean typeThird;
private boolean basicProducts;
private boolean basicCorp;
private boolean basicInv;
private boolean basicThirdProducts;
private boolean basicThirdCorp;
private boolean basicThirdInv;
private boolean basicThirdBusOrder;
private boolean basicType;
private boolean basicDept;
private boolean dbDiProducts;
private int typeBus; //0:不传输1:由内向外2:由外向内
private int typeScan;
private int typeThird;
private int basicProducts;
private int basicCorp;
private int basicInv;
private int basicDept;
private int basicThirdProducts;
private int basicThirdCorp;
private int basicThirdInv;
private int basicThirdBusOrder;
private int dbDiProducts;
private boolean downstreamEnable;
private boolean orderScanFinish;
private boolean orderUnReceive;
private boolean orderUnCheck;
private int orderScanFinish;
private int orderUnReceive;
private int orderUnCheck;
private Integer syncTime;
private String syncIp;
private Integer syncDownloadTime; //定时下载时间
private boolean sysUser;
private int sysUser;
private List<SyncDataBustypeEntity> busTypes;
private List<SyncDataBustypeEntity> busTypes; //UDI管理系统->SPMS单据类型
private List<SyncDataBustypeEntity> toInBusTypes; //SPMS->UDI管理系统单据类型
private List<SyncDataChangeBustypesEntity> changeBusTypes; //UDI管理系统->业务单据类型
private String orderSyncStart;
private String basicSyncStart;
private boolean entrustAction;
private Integer orderSyncTime;
private Integer orderSyncDlTime;
private int systemConfig;
private int entrustAction;
private int printConfig;
private int scanChangeConfig;
private int busChangeConfig;
private Integer orderSyncTime; //单据向外同步时间
private Integer orderToInSyncTime; //单据向内同步时间
private Integer orderSyncDlTime; //单据向外下载时间
private Integer delaySyncTime;
private int supCert;
private boolean unCheckCert;
private boolean checkedCert;
private boolean companyCert;
private boolean manufacturerCert;
private boolean productCert;
private int unCheckCert;
private int checkedCert;
private int companyCert;
private int manufacturerCert;
private int productCert;
}

@ -7,9 +7,9 @@ import java.util.List;
public interface SyncDataBustypeService {
List<SyncDataBustypeEntity> findAll();
List<SyncDataBustypeEntity> findAll(Integer direct);
boolean deleteAll();
boolean deleteAll(Integer direct);
void inserts(List<SyncDataBustypeEntity> syncDataBustypeEntities);

@ -0,0 +1,19 @@
package com.glxp.api.service.sync;
import com.glxp.api.entity.sync.SyncDataChangeBustypesEntity;
import java.util.List;
/**
* - Service
*/
public interface SyncDataChangeBustypeService {
List<SyncDataChangeBustypesEntity> findAll();
boolean deleteAll();
void inserts(List<SyncDataChangeBustypesEntity> syncDataChangeBustypesEntities);
}

@ -1,5 +1,6 @@
package com.glxp.api.service.sync.impl;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.glxp.api.dao.system.SyncDataBustypeDao;
import com.glxp.api.entity.sync.SyncDataBustypeEntity;
import com.glxp.api.service.sync.SyncDataBustypeService;
@ -13,17 +14,18 @@ import java.util.List;
@Transactional(rollbackFor = Exception.class)
public class SyncDataBustypeServiceImpl implements SyncDataBustypeService {
@Resource
SyncDataBustypeDao syncDataBustypeDao;
@Override
public List<SyncDataBustypeEntity> findAll() {
return syncDataBustypeDao.findAll();
public List<SyncDataBustypeEntity> findAll(Integer direct) {
return syncDataBustypeDao.selectList(new QueryWrapper<SyncDataBustypeEntity>().eq("direct", direct));
}
@Override
public boolean deleteAll() {
return syncDataBustypeDao.deleteAll();
public boolean deleteAll(Integer direct) {
return syncDataBustypeDao.delete(new QueryWrapper<SyncDataBustypeEntity>().eq("direct", direct)) > 0 ? true : false;
}
@Override

@ -0,0 +1,44 @@
package com.glxp.api.service.sync.impl;
import cn.hutool.core.collection.CollUtil;
import com.glxp.api.dao.sync.SyncDataChangeBustypesDao;
import com.glxp.api.entity.sync.SyncDataChangeBustypesEntity;
import com.glxp.api.service.sync.SyncDataChangeBustypeService;
import org.apache.ibatis.session.ExecutorType;
import org.apache.ibatis.session.SqlSession;
import org.apache.ibatis.session.SqlSessionFactory;
import org.apache.ibatis.session.TransactionIsolationLevel;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import javax.annotation.Resource;
import java.util.List;
@Service
@Transactional(rollbackFor = Exception.class)
public class SyncDataChangeBustypeServiceImpl implements SyncDataChangeBustypeService {
@Resource
private SyncDataChangeBustypesDao syncDataChangeBustypesDao;
@Resource
private SqlSessionFactory sqlSessionFactory;
@Override
public List<SyncDataChangeBustypesEntity> findAll() {
return syncDataChangeBustypesDao.selectList(null);
}
@Override
public boolean deleteAll() {
syncDataChangeBustypesDao.delete(null);
return true;
}
@Override
public void inserts(List<SyncDataChangeBustypesEntity> syncDataChangeBustypesEntities) {
if (CollUtil.isNotEmpty(syncDataChangeBustypesEntities)) {
SqlSession sqlSession = sqlSessionFactory.openSession(ExecutorType.BATCH, TransactionIsolationLevel.READ_COMMITTED);
syncDataChangeBustypesEntities.forEach(item -> syncDataChangeBustypesDao.insert(item));
}
}
}

@ -2,9 +2,11 @@ package com.glxp.api.service.sync.impl;
import com.glxp.api.dao.sync.SyncDataSetDao;
import com.glxp.api.entity.sync.SyncDataBustypeEntity;
import com.glxp.api.entity.sync.SyncDataChangeBustypesEntity;
import com.glxp.api.entity.sync.SyncDataSetEntity;
import com.glxp.api.res.system.SyncDataSetResponse;
import com.glxp.api.service.sync.SyncDataBustypeService;
import com.glxp.api.service.sync.SyncDataChangeBustypeService;
import com.glxp.api.service.sync.SyncDataSetService;
import org.springframework.beans.BeanUtils;
import org.springframework.stereotype.Service;
@ -21,6 +23,8 @@ public class SyncDataSetServiceImpl implements SyncDataSetService {
SyncDataSetDao syncDataSetDao;
@Resource
SyncDataBustypeService syncDataBustypeService;
@Resource
private SyncDataChangeBustypeService syncDataChangeBustypeService;
@Override
public SyncDataSetEntity findSet() {
@ -33,8 +37,12 @@ public class SyncDataSetServiceImpl implements SyncDataSetService {
SyncDataSetEntity syncDataSetEntity = syncDataSetDao.selectSet();
SyncDataSetResponse syncDataSetResponse = new SyncDataSetResponse();
BeanUtils.copyProperties(syncDataSetEntity, syncDataSetResponse);
List<SyncDataBustypeEntity> syncDataBustypeEntities = syncDataBustypeService.findAll();
List<SyncDataBustypeEntity> syncDataBustypeEntities = syncDataBustypeService.findAll(1);
List<SyncDataBustypeEntity> syncDataToInBustypeEntities = syncDataBustypeService.findAll(2);
List<SyncDataChangeBustypesEntity> changeBustypesEntities = syncDataChangeBustypeService.findAll();
syncDataSetResponse.setBusTypes(syncDataBustypeEntities);
syncDataSetResponse.setChangeBusTypes(changeBustypesEntities);
syncDataSetResponse.setToInBusTypes(syncDataToInBustypeEntities);
return syncDataSetResponse;
}

@ -0,0 +1,17 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.glxp.api.dao.sync.SyncDataChangeBustypesDao">
<resultMap id="BaseResultMap" type="com.glxp.api.entity.sync.SyncDataChangeBustypesEntity">
<!--@mbg.generated-->
<!--@Table sync_data_change_bustypes-->
<id column="id" jdbcType="INTEGER" property="id"/>
<result column="action" jdbcType="VARCHAR" property="action"/>
<result column="name" jdbcType="VARCHAR" property="name"/>
<result column="outChange" jdbcType="TINYINT" property="outChange"/>
<result column="orderStatus" jdbcType="TINYINT" property="orderStatus"/>
</resultMap>
<sql id="Base_Column_List">
<!--@mbg.generated-->
id, `action`, `name`, outChange, orderStatus
</sql>
</mapper>

@ -2,8 +2,6 @@
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
<mapper namespace="com.glxp.api.dao.system.SyncDataBustypeDao">
<select id="findAll"
resultType="com.glxp.api.entity.sync.SyncDataBustypeEntity">
SELECT *
@ -11,22 +9,15 @@
</select>
<delete id="deleteAll">
DELETE
FROM sync_data_bustypes
</delete>
<insert id="inserts" parameterType="com.glxp.api.entity.sync.SyncDataBustypeEntity">
insert INTO sync_data_bustypes
(`action`, `name`, outChange, orderStatus)
(`action`, `name`, outChange, orderStatus, direct)
values
<foreach collection="syncDataBustypeEntities" item="item" index="index"
separator=",">
(#{item.action}, #{item.name},
#{item.outChange},#{item.orderStatus})
#{item.outChange}, #{item.orderStatus}, #{item.direct})
</foreach>
</insert>
</mapper>

@ -127,6 +127,8 @@ CALL Pro_Temp_ColumnWork('inv_remind_msg', 'remindCount', 'int', 1);
CALL Pro_Temp_ColumnWork('sup_cert_remind_msg', 'remindCount', 'int', 1);
CALL Pro_Temp_ColumnWork('sync_data_bustypes', 'orderStatus', 'tinyint', 1);
CALL Pro_Temp_ColumnWork('sync_data_bustypes', 'direct', 'tinyint', 1);
CALL Pro_Temp_ColumnWork('sup_manufacturer', 'agentName', 'varchar(255)', 1);
CALL Pro_Temp_ColumnWork('sys_pdf_module', 'modelKey', 'varchar(255)', 1);
@ -151,7 +153,7 @@ CALL Pro_Temp_ColumnWork('auth_warehouse', 'updateTime', 'datetime ', 1);
CALL Pro_Temp_ColumnWork('sync_data_set', 'basicType', 'tinyint', 1);
CALL Pro_Temp_ColumnWork('sync_data_set', 'basicDept', 'tinyint', 1);
CALL Pro_Temp_ColumnWork('sync_data_set', 'updateTime', 'datetime', 1);
# CALL Pro_Temp_ColumnWork('sup_cert_set', 'foreign', 'tinyint', 3);
# CALL Pro_Temp_ColumnWork('sup_cert_set', 'needForeign', 'tinyint', 1);

Loading…
Cancel
Save