From 8b2f8d5732f4f1a8c7d70946a15d846aaa4a53cb Mon Sep 17 00:00:00 2001 From: "pref_mail@163.com" <123456> Date: Tue, 30 May 2023 10:43:32 +0800 Subject: [PATCH 01/10] =?UTF-8?q?1.=E4=BF=AE=E6=94=B9basic=E7=9A=84dockerf?= =?UTF-8?q?ile?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- blade-service/logpm-basic/Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/blade-service/logpm-basic/Dockerfile b/blade-service/logpm-basic/Dockerfile index 4a617fe2c..711c5c479 100644 --- a/blade-service/logpm-basic/Dockerfile +++ b/blade-service/logpm-basic/Dockerfile @@ -2,9 +2,9 @@ FROM bladex/alpine-java:openjdk8-openj9_cn_slim MAINTAINER h5u@163.com -RUN mkdir -p /logpm/basic +RUN mkdir -p /xxx/app -WORKDIR /logpm/basic +WORKDIR /xxx/app EXPOSE 8300 From 4368795d5b268e460d312ab4f05074e633ad3dae Mon Sep 17 00:00:00 2001 From: "0.0" <1092404103.qq.com> Date: Tue, 30 May 2023 16:56:40 +0800 Subject: [PATCH 02/10] =?UTF-8?q?1.=E5=85=B3=E8=81=94=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E8=BD=A6=E8=BE=86=E5=8E=86=E5=8F=B2=E7=85=A7=E7=89=87?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../entity/BasicdataVehicleEntity.java | 50 +++++++++---------- .../BasicdataVehicleController.java | 2 + .../mapper/BasicdataVehicleMapper.xml | 4 +- 3 files changed, 29 insertions(+), 27 deletions(-) diff --git a/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/entity/BasicdataVehicleEntity.java b/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/entity/BasicdataVehicleEntity.java index 439e5b5ab..437d87919 100644 --- a/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/entity/BasicdataVehicleEntity.java +++ b/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/entity/BasicdataVehicleEntity.java @@ -282,30 +282,30 @@ public class BasicdataVehicleEntity extends TenantEntity { */ @ApiModelProperty(value = "GPS型号") private String gpsModel; -// /** -// * 预留1 -// */ -// @ApiModelProperty(value = "预留1") -// private String reserve1; -// /** -// * 预留2 -// */ -// @ApiModelProperty(value = "预留2") -// private String reserve2; -// /** -// * 预留3 -// */ -// @ApiModelProperty(value = "预留3") -// private String reserve3; -// /** -// * 预留4 -// */ -// @ApiModelProperty(value = "预留4") -// private String reserve4; -// /** -// * 预留5 -// */ -// @ApiModelProperty(value = "预留5") -// private String reserve5; + /** + * 预留1 + */ + @ApiModelProperty(value = "预留1") + private String reserve1; + /** + * 预留2 + */ + @ApiModelProperty(value = "预留2") + private String reserve2; + /** + * 预留3 + */ + @ApiModelProperty(value = "预留3") + private String reserve3; + /** + * 预留4 + */ + @ApiModelProperty(value = "预留4") + private String reserve4; + /** + * 预留5 + */ + @ApiModelProperty(value = "预留5") + private String reserve5; } diff --git a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/controller/BasicdataVehicleController.java b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/controller/BasicdataVehicleController.java index 01cca302b..0a48c4276 100644 --- a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/controller/BasicdataVehicleController.java +++ b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/controller/BasicdataVehicleController.java @@ -29,6 +29,7 @@ import lombok.AllArgsConstructor; import javax.validation.Valid; import lombok.extern.slf4j.Slf4j; +import org.apache.poi.ss.formula.functions.T; import org.springblade.core.secure.BladeUser; import org.springblade.core.mp.support.Condition; import org.springblade.core.mp.support.Query; @@ -81,6 +82,7 @@ public class BasicdataVehicleController extends BladeController { BasicdataVehicleVO basicdataVehicleVO = new BasicdataVehicleVO(); BeanUtils.copyProperties(detail,basicdataVehicleVO); List urls =basicdataVehicleService.selectPhotoBymasterId(basicdataVehicleVO.getId()); + log.info("urls>>>>>{}",urls); if (urls.size()>0){basicdataVehicleVO.setHistoricPhotos(StringUtils.join(urls, ","));} return R.data(basicdataVehicleVO); } diff --git a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataVehicleMapper.xml b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataVehicleMapper.xml index 62dfd402d..0d408f0e8 100644 --- a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataVehicleMapper.xml +++ b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataVehicleMapper.xml @@ -131,7 +131,7 @@ lbv.gps_model gpsModel, ( SELECT - lbvp.photo_url + group_concat(lbvp.photo_url) FROM logpm_basicdata_vehicle_photo lbvp where @@ -139,7 +139,7 @@ AND lbvp.create_time <= DATE_SUB( CURDATE(), INTERVAL 1 YEAR ) ORDER BY lbvp.create_time - LIMIT 1 + LIMIT 3 ) historicPhotos FROM logpm_basicdata_vehicle lbv From 48de08de0451ff01d24ac49fd267c114df063bdf Mon Sep 17 00:00:00 2001 From: zhenghaoyu Date: Tue, 30 May 2023 17:42:34 +0800 Subject: [PATCH 03/10] =?UTF-8?q?1.=E5=A4=84=E7=90=86=E5=B7=A5=E5=8E=82?= =?UTF-8?q?=E6=95=B0=E6=8D=AEserviceNum=E4=B8=BA=E7=A9=BA=E7=9A=84?= =?UTF-8?q?=E6=83=85=E5=86=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../oldproject/service/impl/ServiceNumServiceImpl.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/blade-service/logpm-old-project/src/main/java/com/logpm/oldproject/service/impl/ServiceNumServiceImpl.java b/blade-service/logpm-old-project/src/main/java/com/logpm/oldproject/service/impl/ServiceNumServiceImpl.java index a10bb40c1..6a6af20e6 100644 --- a/blade-service/logpm-old-project/src/main/java/com/logpm/oldproject/service/impl/ServiceNumServiceImpl.java +++ b/blade-service/logpm-old-project/src/main/java/com/logpm/oldproject/service/impl/ServiceNumServiceImpl.java @@ -23,6 +23,7 @@ import lombok.AllArgsConstructor; import org.springframework.stereotype.Service; import java.util.List; +import java.util.Objects; /** * 包内产品明细 服务实现类 @@ -38,6 +39,9 @@ public class ServiceNumServiceImpl implements IServiceNumService { @Override public Boolean addServiceNum(List serviceNum) { - return serviceNumMapper.addAll(serviceNum); + if(!Objects.isNull(serviceNum)&&serviceNum.size()>0){ + return serviceNumMapper.addAll(serviceNum); + } + return true; } } From 88b525a4861198b16ff888bc29d04da766eb0fda Mon Sep 17 00:00:00 2001 From: kilo Date: Tue, 30 May 2023 18:09:51 +0800 Subject: [PATCH 04/10] =?UTF-8?q?=E4=BB=93=E5=BA=93=E5=88=A0=E9=99=A4?= =?UTF-8?q?=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../basicdata/controller/BasicdataWarehouseController.java | 1 + .../com/logpm/basicdata/mapper/BasicdataWarehouseMapper.xml | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/controller/BasicdataWarehouseController.java b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/controller/BasicdataWarehouseController.java index 74f382214..4517ad8f8 100644 --- a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/controller/BasicdataWarehouseController.java +++ b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/controller/BasicdataWarehouseController.java @@ -153,6 +153,7 @@ public class BasicdataWarehouseController extends BladeController { @ApiOperation(value = "逻辑删除", notes = "传入ids") public R remove(@ApiParam(value = "主键集合", required = true) @RequestParam List ids) { boolean result = warehouseService.removeWarehouse(ids); + return R.status(result); } diff --git a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataWarehouseMapper.xml b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataWarehouseMapper.xml index 471a5f400..7b8ec2be8 100644 --- a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataWarehouseMapper.xml +++ b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataWarehouseMapper.xml @@ -51,8 +51,8 @@ UPDATE logpm_warehouse_warehouse SET is_deleted = 1 WHERE - NOT EXISTS ( SELECT b.id FROM logpm_warehouse_goods_area b WHERE b.warehouse_id = #{id} ) - AND NOT EXISTS (SELECT f.id FROM logpm_basic_team_group f WHERE f.belong_to=#{id}) + NOT EXISTS ( SELECT b.id FROM logpm_warehouse_goods_area b WHERE b.warehouse_id = #{id} AND b.is_deleted = 0) + AND NOT EXISTS (SELECT f.id FROM logpm_basic_team_group f WHERE f.belong_to=#{id} AND f.is_deleted = 0 ) AND id = #{id} From 97e0f871b828f0db3511572fd81e24fb244e126e Mon Sep 17 00:00:00 2001 From: caoyizhong <1270296080@qq.com> Date: Tue, 30 May 2023 18:11:23 +0800 Subject: [PATCH 05/10] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=8C=BA=E5=9F=9F?= =?UTF-8?q?=E4=BB=B7=E6=A0=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../logpm/basicdata/vo/BasicdataStoreBrandVO.java | 6 ++++++ .../com/logpm/basicdata/vo/BasicdataZonePriceVO.java | 2 ++ .../com/logpm/basicdata/BasicDataApplication.java | 2 +- .../controller/BasicdataStoreBrandController.java | 10 ++++++++++ .../controller/BasicdataZonePriceController.java | 7 +++++-- .../logpm/basicdata/dto/BasicdataZonePriceDTO.java | 4 ++++ .../logpm/basicdata/mapper/BasicdataShopMapper.xml | 3 +-- .../mapper/BasicdataStorageServicesMapper.xml | 6 +++--- .../basicdata/mapper/BasicdataStoreBrandMapper.java | 1 + .../basicdata/mapper/BasicdataStoreBrandMapper.xml | 10 +++++++++- .../basicdata/mapper/BasicdataStoreContactMapper.xml | 3 ++- .../service/IBasicdataStoreBrandService.java | 2 ++ .../service/IBasicdataZonePriceService.java | 3 +++ .../service/impl/BasicdataStoreBrandServiceImpl.java | 5 +++++ .../service/impl/BasicdataZonePriceServiceImpl.java | 12 ++++++++++-- 15 files changed, 64 insertions(+), 12 deletions(-) diff --git a/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/vo/BasicdataStoreBrandVO.java b/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/vo/BasicdataStoreBrandVO.java index c3f7f362c..079ebd7e5 100644 --- a/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/vo/BasicdataStoreBrandVO.java +++ b/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/vo/BasicdataStoreBrandVO.java @@ -32,4 +32,10 @@ import lombok.EqualsAndHashCode; public class BasicdataStoreBrandVO extends BasicdataStoreBrandEntity { private static final long serialVersionUID = 1L; + private String storeName; + + private String brandName; + + private String storeBrandName; + } diff --git a/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/vo/BasicdataZonePriceVO.java b/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/vo/BasicdataZonePriceVO.java index 1786b1f58..054f46071 100644 --- a/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/vo/BasicdataZonePriceVO.java +++ b/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/vo/BasicdataZonePriceVO.java @@ -35,4 +35,6 @@ public class BasicdataZonePriceVO extends BasicdataZonePriceEntity { private String name; private String brandName; + + } diff --git a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/BasicDataApplication.java b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/BasicDataApplication.java index d0b239072..ac5a16f39 100644 --- a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/BasicDataApplication.java +++ b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/BasicDataApplication.java @@ -15,7 +15,7 @@ import org.springblade.core.launch.BladeApplication; public class BasicDataApplication { public static void main(String[] args) { - BladeApplication.run(ModuleNameConstant.APPLICATION_BASICDATA_NAME, BasicDataApplication.class, args); + BladeApplication.run(ModuleNameConstant.APPLICATION_BASICDATA_NAME.concat("-cyz"), BasicDataApplication.class, args); } diff --git a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/controller/BasicdataStoreBrandController.java b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/controller/BasicdataStoreBrandController.java index 89ec0de3a..cd945740c 100644 --- a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/controller/BasicdataStoreBrandController.java +++ b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/controller/BasicdataStoreBrandController.java @@ -78,6 +78,16 @@ public class BasicdataStoreBrandController extends BladeController { IPage pages = basicdataStoreBrandService.page(Condition.getPage(query), Condition.getQueryWrapper(basicdataStoreBrand, BasicdataStoreBrandEntity.class)); return R.data(pages); } + /** + * 门店品牌中间表 分页 + */ + @GetMapping("/listName") + @ApiOperationSupport(order = 2) + @ApiOperation(value = "分页", notes = "传入basicdataStoreBrand") + public R> listName(String name) { + List pages = basicdataStoreBrandService.listName(name); + return R.data(pages); + } /** * 门店品牌中间表 自定义分页 diff --git a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/controller/BasicdataZonePriceController.java b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/controller/BasicdataZonePriceController.java index d4501cac9..a8d302578 100644 --- a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/controller/BasicdataZonePriceController.java +++ b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/controller/BasicdataZonePriceController.java @@ -16,6 +16,7 @@ */ package com.logpm.basicdata.controller; +import com.logpm.basicdata.dto.BasicdataZonePriceDTO; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiParam; @@ -138,8 +139,10 @@ public class BasicdataZonePriceController extends BladeController { @PostMapping("/submit") @ApiOperationSupport(order = 6) @ApiOperation(value = "新增或修改", notes = "传入basicdataZonePrice") - public R submit(@Valid @RequestBody BasicdataZonePriceEntity basicdataZonePrice) { - return R.status(basicdataZonePriceService.saveOrUpdate(basicdataZonePrice)); + public R submit(@Valid @RequestBody BasicdataZonePriceDTO basicdataZonePrice) { + + + return R.status(basicdataZonePriceService.ownSaveOrUpdate(basicdataZonePrice)); } /** diff --git a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/dto/BasicdataZonePriceDTO.java b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/dto/BasicdataZonePriceDTO.java index 8849a1342..a24952b33 100644 --- a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/dto/BasicdataZonePriceDTO.java +++ b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/dto/BasicdataZonePriceDTO.java @@ -20,6 +20,8 @@ import com.logpm.basicdata.entity.BasicdataZonePriceEntity; import lombok.Data; import lombok.EqualsAndHashCode; +import java.util.Map; + /** * 区域品牌价格表 数据传输对象实体类 * @@ -31,4 +33,6 @@ import lombok.EqualsAndHashCode; public class BasicdataZonePriceDTO extends BasicdataZonePriceEntity { private static final long serialVersionUID = 1L; + private Map fei; + private Map feishi; } diff --git a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataShopMapper.xml b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataShopMapper.xml index 4e0e90f37..c2696df42 100644 --- a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataShopMapper.xml +++ b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataShopMapper.xml @@ -22,6 +22,7 @@ from logpm_basicdata_shop lbs left JOIN logpm_basicdata_client lbc on lbs.client_id = lbc.id + lbs.is_deleted = 0 and lbc.client_name like concat('%',#{param.clientId},'%') and lbs.store_code like concat('%',#{param.storeCode},'%') and lbs.store_name like concat('%',#{param.storeName},'%') @@ -30,8 +31,6 @@ and lbs.blade_region_area_id like concat('%',#{param.bladeRegionAreaId},'%') and date_format (lbs.check_in_time,'%Y-%m-%d') = ]]> date_format (#{param.checkInTime},'%Y-%m-%d') and date_format (lbs.post_set_time,'%Y-%m-%d') date_format (#{param.postSetTime},'%Y-%m-%d') - - diff --git a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataStorageServicesMapper.xml b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataStorageServicesMapper.xml index c6f3c78f3..0d245238a 100644 --- a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataStorageServicesMapper.xml +++ b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataStorageServicesMapper.xml @@ -17,9 +17,9 @@ LEFT JOIN logpm_basicdata_store_contact lbsc on lbsc.id = lbss.forwarding_unit lbss.is_deleted = 0 - and lbs.store_name = #{param.shopId} - and lbsc.linkman = #{param.forwardingUnit} - and lbss.warehouseService = #{param.warehouseService} + and lbs.store_name like concat('%',#{param.shopId},'%') + and lbsc.linkman like concat('%',#{param.forwardingUnit} ,'%') + and lbss.warehouse_service like concat('%',#{param.warehouseService},'%') diff --git a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataStoreBrandMapper.java b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataStoreBrandMapper.java index ed2a93c6a..61d8ce931 100644 --- a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataStoreBrandMapper.java +++ b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataStoreBrandMapper.java @@ -51,4 +51,5 @@ public interface BasicdataStoreBrandMapper extends BaseMapper exportBasicdataStoreBrand(@Param("ew") Wrapper queryWrapper); + List listName(String name); } diff --git a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataStoreBrandMapper.xml b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataStoreBrandMapper.xml index 5c81ac394..a28a6db73 100644 --- a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataStoreBrandMapper.xml +++ b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataStoreBrandMapper.xml @@ -5,7 +5,15 @@ - + select lbsc.tenant_id, lbsc.create_user, lbsc.create_time,lbsc.update_user,lbsc.update_time, lbsc.status, lbsc.is_deleted, lbsc.create_dept, lbsc.id, lbsc.reserve1, lbsc.reserve2, lbsc.reserve3, lbsc.reserve4, lbsc.reserve5, lbsc.shop_id, lbsc.linkman, lbsc.phone,lbs.store_name storeName - from logpm_basicdata_store_contact lbsc LEFT JOIN logpm_basicdata_shop lbs on lbs.id = lbsc.shop_id + from logpm_basicdata_store_contact lbsc + LEFT JOIN logpm_basicdata_shop lbs on lbs.id = lbsc.shop_id where lbsc.is_deleted = 0 diff --git a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/IBasicdataStoreBrandService.java b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/IBasicdataStoreBrandService.java index 5c43062e0..cf763aaf2 100644 --- a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/IBasicdataStoreBrandService.java +++ b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/IBasicdataStoreBrandService.java @@ -50,4 +50,6 @@ public interface IBasicdataStoreBrandService extends BaseService exportBasicdataStoreBrand(Wrapper queryWrapper); Boolean submitSave(BasicdataStoreBrandEntity basicdataStoreBrand); + + List listName(String name); } diff --git a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/IBasicdataZonePriceService.java b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/IBasicdataZonePriceService.java index c3895ee32..7cd47a323 100644 --- a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/IBasicdataZonePriceService.java +++ b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/IBasicdataZonePriceService.java @@ -17,6 +17,7 @@ package com.logpm.basicdata.service; import com.baomidou.mybatisplus.core.conditions.Wrapper; +import com.logpm.basicdata.dto.BasicdataZonePriceDTO; import com.logpm.basicdata.entity.BasicdataZonePriceEntity; import com.logpm.basicdata.vo.BasicdataZonePriceVO; import com.logpm.basicdata.excel.BasicdataZonePriceExcel; @@ -55,4 +56,6 @@ public interface IBasicdataZonePriceService extends BaseService pageListName(String name); + + Boolean ownSaveOrUpdate(BasicdataZonePriceDTO basicdataZonePrice); } diff --git a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataStoreBrandServiceImpl.java b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataStoreBrandServiceImpl.java index 10c4f6463..a8e91f52c 100644 --- a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataStoreBrandServiceImpl.java +++ b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataStoreBrandServiceImpl.java @@ -65,4 +65,9 @@ public class BasicdataStoreBrandServiceImpl extends BaseServiceImpl listName(String name) { + return baseMapper.listName(name); + } + } diff --git a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataZonePriceServiceImpl.java b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataZonePriceServiceImpl.java index 3a2b40ce0..25a93ffec 100644 --- a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataZonePriceServiceImpl.java +++ b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataZonePriceServiceImpl.java @@ -17,8 +17,7 @@ package com.logpm.basicdata.service.impl; import com.alibaba.fastjson.JSONObject; -import com.baomidou.mybatisplus.core.toolkit.StringUtils; -import com.baomidou.mybatisplus.core.toolkit.Wrappers; +import com.logpm.basicdata.dto.BasicdataZonePriceDTO; import com.logpm.basicdata.entity.BasicdataZonePriceEntity; import com.logpm.basicdata.vo.BasicdataZonePriceVO; import com.logpm.basicdata.excel.BasicdataZonePriceExcel; @@ -71,4 +70,13 @@ public class BasicdataZonePriceServiceImpl extends BaseServiceImpl Date: Wed, 31 May 2023 09:03:38 +0800 Subject: [PATCH 06/10] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=90=8D=E7=A7=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/logpm/basicdata/BasicDataApplication.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/BasicDataApplication.java b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/BasicDataApplication.java index ac5a16f39..d0b239072 100644 --- a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/BasicDataApplication.java +++ b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/BasicDataApplication.java @@ -15,7 +15,7 @@ import org.springblade.core.launch.BladeApplication; public class BasicDataApplication { public static void main(String[] args) { - BladeApplication.run(ModuleNameConstant.APPLICATION_BASICDATA_NAME.concat("-cyz"), BasicDataApplication.class, args); + BladeApplication.run(ModuleNameConstant.APPLICATION_BASICDATA_NAME, BasicDataApplication.class, args); } From 5b35a58a85f4564ae7ae2dd0a910666735b830b3 Mon Sep 17 00:00:00 2001 From: "pref_mail@163.com" <123456> Date: Wed, 31 May 2023 11:34:20 +0800 Subject: [PATCH 07/10] =?UTF-8?q?1.=E4=BF=AE=E6=94=B9basedata=20test?= =?UTF-8?q?=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/application-test.yml | 41 +++++++++++++++++-- 1 file changed, 38 insertions(+), 3 deletions(-) diff --git a/blade-service/logpm-basicdata/src/main/resources/application-test.yml b/blade-service/logpm-basicdata/src/main/resources/application-test.yml index c4f22a92f..abb6e8a17 100644 --- a/blade-service/logpm-basicdata/src/main/resources/application-test.yml +++ b/blade-service/logpm-basicdata/src/main/resources/application-test.yml @@ -3,8 +3,43 @@ server: port: 8400 #数据源配置 +#spring: +# datasource: +# url: ${blade.datasource.dev.url} +# username: ${blade.datasource.dev.username} +# password: ${blade.datasource.dev.password} + spring: + #排除DruidDataSourceAutoConfigure + autoconfigure: + exclude: com.alibaba.druid.spring.boot.autoconfigure.DruidDataSourceAutoConfigure datasource: - url: ${blade.datasource.test.url} - username: ${blade.datasource.test.username} - password: ${blade.datasource.test.password} + dynamic: + druid: + #通用校验配置 + validation-query: select 1 + #启用sql日志拦截器 + proxy-filters: + - sqlLogInterceptor + #设置默认的数据源或者数据源组,默认值即为master + primary: master + datasource: + master: + druid: + #独立校验配置 + validation-query: select 1 + #oracle校验 + #validation-query: select 1 from dual + url: ${blade.datasource.basicdata.master.url} + username: ${blade.datasource.basicdata.master.username} + password: ${blade.datasource.basicdata.master.password} + slave: + druid: + #独立校验配置 + validation-query: select 1 + #oracle校验 + #validation-query: select 1 from dual + url: ${blade.datasource.basicdata.slave.url} + username: ${blade.datasource.basicdata.slave.username} + password: ${blade.datasource.basicdata.slave.password} + From 201b6dcb0ccdf67c6d42d923212ce692f8753d73 Mon Sep 17 00:00:00 2001 From: "pref_mail@163.com" <123456> Date: Wed, 31 May 2023 11:46:33 +0800 Subject: [PATCH 08/10] =?UTF-8?q?1.=E4=BF=AE=E6=94=B9based=20test=E9=85=8D?= =?UTF-8?q?=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/application-test.yml | 41 +++++++++++++++++-- 1 file changed, 38 insertions(+), 3 deletions(-) diff --git a/blade-service/logpm-basic/src/main/resources/application-test.yml b/blade-service/logpm-basic/src/main/resources/application-test.yml index 2e131d6b3..3ff547cac 100644 --- a/blade-service/logpm-basic/src/main/resources/application-test.yml +++ b/blade-service/logpm-basic/src/main/resources/application-test.yml @@ -3,8 +3,43 @@ server: port: 8300 #数据源配置 +#spring: +# datasource: +# url: ${blade.datasource.dev.url} +# username: ${blade.datasource.dev.username} +# password: ${blade.datasource.dev.password} + spring: + #排除DruidDataSourceAutoConfigure + autoconfigure: + exclude: com.alibaba.druid.spring.boot.autoconfigure.DruidDataSourceAutoConfigure datasource: - url: ${blade.datasource.test.url} - username: ${blade.datasource.test.username} - password: ${blade.datasource.test.password} + dynamic: + druid: + #通用校验配置 + validation-query: select 1 + #启用sql日志拦截器 + proxy-filters: + - sqlLogInterceptor + #设置默认的数据源或者数据源组,默认值即为master + primary: master + datasource: + master: + druid: + #独立校验配置 + validation-query: select 1 + #oracle校验 + #validation-query: select 1 from dual + url: ${blade.datasource.basic.master.url} + username: ${blade.datasource.basic.master.username} + password: ${blade.datasource.basic.master.password} + slave: + druid: + #独立校验配置 + validation-query: select 1 + #oracle校验 + #validation-query: select 1 from dual + url: ${blade.datasource.basic.slave.url} + username: ${blade.datasource.basic.slave.username} + password: ${blade.datasource.basic.slave.password} + From 21eb851eac5c8f52a76ee54ab8185764de0ebe6c Mon Sep 17 00:00:00 2001 From: "pref_mail@163.com" <123456> Date: Wed, 31 May 2023 12:15:14 +0800 Subject: [PATCH 09/10] =?UTF-8?q?1.=E4=BF=AE=E6=94=B9based=20test=E9=85=8D?= =?UTF-8?q?=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/logpm/basic/BasicApplication.java | 2 -- .../src/main/resources/application-test.yml | 12 ++++++------ 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/blade-service/logpm-basic/src/main/java/com/logpm/basic/BasicApplication.java b/blade-service/logpm-basic/src/main/java/com/logpm/basic/BasicApplication.java index 1de74f605..59665d0fc 100644 --- a/blade-service/logpm-basic/src/main/java/com/logpm/basic/BasicApplication.java +++ b/blade-service/logpm-basic/src/main/java/com/logpm/basic/BasicApplication.java @@ -1,11 +1,9 @@ package com.logpm.basic; -import org.springblade.common.constant.LauncherConstant; import org.springblade.common.constant.ModuleNameConstant; import org.springblade.core.cloud.client.BladeCloudApplication; -import org.springblade.core.cloud.feign.EnableBladeFeign; import org.springblade.core.launch.BladeApplication; /** diff --git a/blade-service/logpm-basic/src/main/resources/application-test.yml b/blade-service/logpm-basic/src/main/resources/application-test.yml index 3ff547cac..4ead24f3d 100644 --- a/blade-service/logpm-basic/src/main/resources/application-test.yml +++ b/blade-service/logpm-basic/src/main/resources/application-test.yml @@ -30,16 +30,16 @@ spring: validation-query: select 1 #oracle校验 #validation-query: select 1 from dual - url: ${blade.datasource.basic.master.url} - username: ${blade.datasource.basic.master.username} - password: ${blade.datasource.basic.master.password} + url: ${blade.datasource.basicdata.master.url} + username: ${blade.datasource.basicdata.master.username} + password: ${blade.datasource.basicdata.master.password} slave: druid: #独立校验配置 validation-query: select 1 #oracle校验 #validation-query: select 1 from dual - url: ${blade.datasource.basic.slave.url} - username: ${blade.datasource.basic.slave.username} - password: ${blade.datasource.basic.slave.password} + url: ${blade.datasource.basicdata.slave.url} + username: ${blade.datasource.basicdata.slave.username} + password: ${blade.datasource.basicdata.slave.password} From 48c4ab2d3b13fab1c263cf892bb3791c8a416f81 Mon Sep 17 00:00:00 2001 From: "pref_mail@163.com" <123456> Date: Wed, 31 May 2023 12:17:20 +0800 Subject: [PATCH 10/10] =?UTF-8?q?1.=E4=BF=AE=E6=94=B9based=20test=E9=85=8D?= =?UTF-8?q?=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/application-test.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/blade-service/logpm-basic/src/main/resources/application-test.yml b/blade-service/logpm-basic/src/main/resources/application-test.yml index 4ead24f3d..3ff547cac 100644 --- a/blade-service/logpm-basic/src/main/resources/application-test.yml +++ b/blade-service/logpm-basic/src/main/resources/application-test.yml @@ -30,16 +30,16 @@ spring: validation-query: select 1 #oracle校验 #validation-query: select 1 from dual - url: ${blade.datasource.basicdata.master.url} - username: ${blade.datasource.basicdata.master.username} - password: ${blade.datasource.basicdata.master.password} + url: ${blade.datasource.basic.master.url} + username: ${blade.datasource.basic.master.username} + password: ${blade.datasource.basic.master.password} slave: druid: #独立校验配置 validation-query: select 1 #oracle校验 #validation-query: select 1 from dual - url: ${blade.datasource.basicdata.slave.url} - username: ${blade.datasource.basicdata.slave.username} - password: ${blade.datasource.basicdata.slave.password} + url: ${blade.datasource.basic.slave.url} + username: ${blade.datasource.basic.slave.username} + password: ${blade.datasource.basic.slave.password}