新增第三方单据提交设置,打印字段新增与修改,产品信息关联修改
parent
5ef244b716
commit
43a7369e64
@ -0,0 +1,57 @@
|
||||
package com.glxp.api.admin.controller.info;
|
||||
|
||||
import cn.hutool.core.collection.CollUtil;
|
||||
import com.glxp.api.admin.annotation.AuthRuleAnnotation;
|
||||
import com.glxp.api.admin.constant.Constant;
|
||||
import com.glxp.api.admin.entity.info.SyncDataBustypeEntity;
|
||||
import com.glxp.api.admin.entity.info.SyncDataSetEntity;
|
||||
import com.glxp.api.admin.entity.info.SyncUploadDataSetEntity;
|
||||
import com.glxp.api.admin.res.info.SyncDataSetResponse;
|
||||
import com.glxp.api.admin.service.info.SyncUploadDataBustypeService;
|
||||
import com.glxp.api.admin.service.info.SyncUploadDataSetService;
|
||||
import com.glxp.api.admin.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;
|
||||
import org.springframework.web.bind.annotation.RequestBody;
|
||||
import org.springframework.web.bind.annotation.RestController;
|
||||
|
||||
import javax.annotation.Resource;
|
||||
import javax.validation.Valid;
|
||||
import java.util.List;
|
||||
|
||||
@RestController
|
||||
public class ThirdUploadSetController {
|
||||
@Resource
|
||||
SyncUploadDataSetService syncUploadDataSetService;
|
||||
@Resource
|
||||
SyncUploadDataBustypeService syncUploadDataBustypeService;
|
||||
|
||||
@AuthRuleAnnotation("system/third/syncData/config")
|
||||
@GetMapping("/system/third/syncData/config")
|
||||
public BaseResponse list() {
|
||||
|
||||
SyncUploadDataSetEntity syncDataSetResponse = syncUploadDataSetService.selectSet();
|
||||
return ResultVOUtils.success(syncDataSetResponse);
|
||||
}
|
||||
|
||||
@AuthRuleAnnotation("system/third/syncData/save")
|
||||
@PostMapping("/system/third/syncData/save")
|
||||
public BaseResponse save(@RequestBody @Valid SyncUploadDataSetEntity syncUploadDataSetEntity
|
||||
) {
|
||||
List<SyncDataBustypeEntity> busTypes = syncUploadDataSetEntity.getBusTypes();
|
||||
syncUploadDataBustypeService.deleteAll();
|
||||
if (CollUtil.isNotEmpty(busTypes))
|
||||
syncUploadDataBustypeService.inserts(busTypes);
|
||||
syncUploadDataSetEntity.setBusTypes(null);
|
||||
boolean b = syncUploadDataSetService.insert(syncUploadDataSetEntity);
|
||||
if (!b) {
|
||||
return ResultVOUtils.error(ResultEnum.NOT_NETWORK);
|
||||
}
|
||||
return ResultVOUtils.success();
|
||||
}
|
||||
|
||||
}
|
@ -0,0 +1,19 @@
|
||||
package com.glxp.api.admin.dao.info;
|
||||
|
||||
import com.glxp.api.admin.entity.info.SyncDataBustypeEntity;
|
||||
import org.apache.ibatis.annotations.Mapper;
|
||||
import org.apache.ibatis.annotations.Param;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
@Mapper
|
||||
public interface SyncUploadDataBustypeDao {
|
||||
|
||||
List<SyncDataBustypeEntity> findAll();
|
||||
|
||||
boolean deleteAll();
|
||||
|
||||
void inserts(@Param("syncDataBustypeEntities") List<SyncDataBustypeEntity> syncDataBustypeEntities);
|
||||
|
||||
|
||||
}
|
@ -0,0 +1,13 @@
|
||||
package com.glxp.api.admin.dao.info;
|
||||
|
||||
import com.glxp.api.admin.entity.info.SyncUploadDataSetEntity;
|
||||
import org.apache.ibatis.annotations.Mapper;
|
||||
|
||||
@Mapper
|
||||
public interface SyncUploadDataSetDao {
|
||||
|
||||
SyncUploadDataSetEntity selectSet();
|
||||
|
||||
boolean insert(SyncUploadDataSetEntity syncDataSetEntity);
|
||||
|
||||
}
|
@ -0,0 +1,19 @@
|
||||
package com.glxp.api.admin.entity.info;
|
||||
|
||||
import lombok.Data;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
@Data
|
||||
public class SyncUploadDataSetEntity {
|
||||
|
||||
private Integer id;
|
||||
private boolean autoUpload;
|
||||
private Integer orderSyncTime;
|
||||
private boolean orderUnCheck;
|
||||
private boolean orderUnReceive;
|
||||
private boolean orderScanFinish;
|
||||
|
||||
|
||||
private List<SyncDataBustypeEntity> busTypes;
|
||||
}
|
@ -0,0 +1,15 @@
|
||||
package com.glxp.api.admin.service.info;
|
||||
|
||||
import com.glxp.api.admin.entity.info.SyncDataBustypeEntity;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
public interface SyncUploadDataBustypeService {
|
||||
|
||||
List<SyncDataBustypeEntity> findAll();
|
||||
|
||||
boolean deleteAll();
|
||||
|
||||
void inserts(List<SyncDataBustypeEntity> syncDataBustypeEntities);
|
||||
|
||||
}
|
@ -0,0 +1,14 @@
|
||||
package com.glxp.api.admin.service.info;
|
||||
|
||||
import com.glxp.api.admin.entity.info.SyncUploadDataSetEntity;
|
||||
|
||||
public interface SyncUploadDataSetService {
|
||||
|
||||
|
||||
SyncUploadDataSetEntity findSet();
|
||||
|
||||
SyncUploadDataSetEntity selectSet();
|
||||
|
||||
boolean insert(SyncUploadDataSetEntity syncUploadDataSetEntity);
|
||||
|
||||
}
|
@ -0,0 +1,31 @@
|
||||
package com.glxp.api.admin.service.info.impl;
|
||||
|
||||
import com.glxp.api.admin.dao.info.SyncUploadDataBustypeDao;
|
||||
import com.glxp.api.admin.entity.info.SyncDataBustypeEntity;
|
||||
import com.glxp.api.admin.service.info.SyncUploadDataBustypeService;
|
||||
import org.springframework.stereotype.Service;
|
||||
|
||||
import javax.annotation.Resource;
|
||||
import java.util.List;
|
||||
|
||||
@Service
|
||||
public class SyncUploadDataBustypeServiceImpl implements SyncUploadDataBustypeService {
|
||||
|
||||
@Resource
|
||||
SyncUploadDataBustypeDao syncUploadDataBustypeDao;
|
||||
|
||||
@Override
|
||||
public List<SyncDataBustypeEntity> findAll() {
|
||||
return syncUploadDataBustypeDao.findAll();
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean deleteAll() {
|
||||
return syncUploadDataBustypeDao.deleteAll();
|
||||
}
|
||||
|
||||
@Override
|
||||
public void inserts(List<SyncDataBustypeEntity> syncDataBustypeEntities) {
|
||||
syncUploadDataBustypeDao.inserts(syncDataBustypeEntities);
|
||||
}
|
||||
}
|
@ -0,0 +1,49 @@
|
||||
package com.glxp.api.admin.service.info.impl;
|
||||
|
||||
import com.glxp.api.admin.dao.info.SyncUploadDataSetDao;
|
||||
import com.glxp.api.admin.entity.info.SyncDataBustypeEntity;
|
||||
import com.glxp.api.admin.entity.info.SyncUploadDataSetEntity;
|
||||
import com.glxp.api.admin.service.info.SyncDataBustypeService;
|
||||
import com.glxp.api.admin.service.info.SyncUploadDataBustypeService;
|
||||
import com.glxp.api.admin.service.info.SyncUploadDataSetService;
|
||||
import org.springframework.stereotype.Service;
|
||||
|
||||
import javax.annotation.Resource;
|
||||
import java.util.List;
|
||||
|
||||
@Service
|
||||
public class SyncUploadDataSetServiceImpl implements SyncUploadDataSetService {
|
||||
|
||||
@Resource
|
||||
SyncUploadDataSetDao syncUploadDataSetDao;
|
||||
@Resource
|
||||
SyncUploadDataBustypeService syncUploadDataBustypeService;
|
||||
|
||||
@Override
|
||||
public SyncUploadDataSetEntity findSet() {
|
||||
SyncUploadDataSetEntity syncDataSetEntity = syncUploadDataSetDao.selectSet();
|
||||
return syncDataSetEntity;
|
||||
}
|
||||
|
||||
@Override
|
||||
public SyncUploadDataSetEntity selectSet() {
|
||||
SyncUploadDataSetEntity syncDataSetEntity = syncUploadDataSetDao.selectSet();
|
||||
if (syncDataSetEntity == null) {
|
||||
syncDataSetEntity = new SyncUploadDataSetEntity();
|
||||
syncDataSetEntity.setId(1);
|
||||
syncDataSetEntity.setAutoUpload(false);
|
||||
syncDataSetEntity.setOrderSyncTime(1);
|
||||
syncUploadDataSetDao.insert(syncDataSetEntity);
|
||||
}
|
||||
List<SyncDataBustypeEntity> syncDataBustypeEntities = syncUploadDataBustypeService.findAll();
|
||||
syncDataSetEntity.setBusTypes(syncDataBustypeEntities);
|
||||
return syncDataSetEntity;
|
||||
}
|
||||
|
||||
|
||||
@Override
|
||||
public boolean insert(SyncUploadDataSetEntity syncDataSetEntity) {
|
||||
return syncUploadDataSetDao.insert(syncDataSetEntity);
|
||||
}
|
||||
|
||||
}
|
@ -0,0 +1,33 @@
|
||||
<?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.admin.dao.info.SyncUploadDataBustypeDao">
|
||||
|
||||
|
||||
<select id="findAll"
|
||||
resultType="com.glxp.api.admin.entity.info.SyncDataBustypeEntity">
|
||||
SELECT *
|
||||
FROM thr_order_upload_bustypes
|
||||
</select>
|
||||
|
||||
|
||||
<delete id="deleteAll">
|
||||
DELETE
|
||||
FROM thr_order_upload_bustypes
|
||||
</delete>
|
||||
|
||||
<insert id="inserts" parameterType="com.glxp.api.admin.entity.info.SyncDataBustypeEntity">
|
||||
insert INTO thr_order_upload_bustypes
|
||||
( `action`, `name`)
|
||||
values
|
||||
|
||||
<foreach collection="syncDataBustypeEntities" item="item" index="index"
|
||||
separator=",">
|
||||
(
|
||||
#{item.action}, #{item.name}
|
||||
)
|
||||
</foreach>
|
||||
</insert>
|
||||
|
||||
|
||||
</mapper>
|
@ -0,0 +1,28 @@
|
||||
<?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.admin.dao.info.SyncUploadDataSetDao">
|
||||
|
||||
|
||||
<select id="selectSet"
|
||||
resultType="com.glxp.api.admin.entity.info.SyncUploadDataSetEntity">
|
||||
SELECT *
|
||||
FROM thr_order_upload limit 1
|
||||
</select>
|
||||
|
||||
|
||||
<insert id="insert" parameterType="com.glxp.api.admin.entity.info.SyncUploadDataSetEntity">
|
||||
replace
|
||||
INTO thr_order_upload(id,autoUpload, orderSyncTime,orderUnCheck,orderUnReceive,orderScanFinish)
|
||||
values (
|
||||
#{id},
|
||||
#{autoUpload},
|
||||
#{orderSyncTime},
|
||||
#{orderUnCheck},
|
||||
#{orderUnReceive},
|
||||
#{orderScanFinish}
|
||||
)
|
||||
</insert>
|
||||
|
||||
|
||||
</mapper>
|
Loading…
Reference in New Issue