DaShangDao/daShangDao_erp
8
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

版本提交

Browse Source
This commit is contained in:
凌尛 2026-06-29 09:11:43 +08:00
parent bde639c717
commit 129ea0e597
7 changed files with 16 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ruoyi-admin/src/main/resources/application-dev.yml
View File

@ -58,9 +58,9 @@ spring:
lazy: true
type: ${spring.datasource.type}
driverClassName: com.mysql.cj.jdbc.Driver
url: jdbc:mysql://nj-cynosdbmysql-grp-1v6vxn5f.sql.tencentcdb.com:26247/task?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&autoReconnect=true&rewriteBatchedStatements=true&allowPublicKeyRetrieval=true&nullCatalogMeansCurrent=true
username: root
password: Long6166@@
url: jdbc:mysql://36.212.7.35:3306/task?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&autoReconnect=true&rewriteBatchedStatements=true&allowPublicKeyRetrieval=true&nullCatalogMeansCurrent=true
username: zhishu
password: KSwx1MDcRW
taskSlave:
lazy: true
type: ${spring.datasource.type}

6
ruoyi-admin/src/main/resources/application-prod.yml
View File

@ -61,9 +61,9 @@ spring:
lazy: true
type: ${spring.datasource.type}
driverClassName: com.mysql.cj.jdbc.Driver
url: jdbc:mysql://nj-cynosdbmysql-grp-1v6vxn5f.sql.tencentcdb.com:26247/task?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&autoReconnect=true&rewriteBatchedStatements=true&allowPublicKeyRetrieval=true&nullCatalogMeansCurrent=true
username: root
password: Long6166@@
url: jdbc:mysql://36.212.7.35:3306/task?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&autoReconnect=true&rewriteBatchedStatements=true&allowPublicKeyRetrieval=true&nullCatalogMeansCurrent=true
username: zhishu
password: KSwx1MDcRW
taskSlave:
lazy: true
type: ${spring.datasource.type}

15
ruoyi-modules/ruoyi-zhishu/src/main/java/org/dromara/zhishu/controller/TLogisticsController.java
View File

@ -43,6 +43,7 @@ public class TLogisticsController extends BaseController {
/**
* 查询物流管理列表
*/
@SaCheckPermission("zhishu:logistics:list")
@GetMapping("/list")
public TableDataInfo<TLogisticsVo> list(TLogisticsBo bo, PageQuery pageQuery) {
return tLogisticsService.queryPageList(bo, pageQuery);
@ -53,6 +54,7 @@ public class TLogisticsController extends BaseController {
* @param bo
* @return
*/
@SaCheckPermission("zhishu:logistics:list")
@GetMapping("/listNoPage")
public List<TLogisticsVo> listNoPage(TLogisticsBo bo){
return tLogisticsService.queryList(bo);
@ -84,10 +86,10 @@ public class TLogisticsController extends BaseController {
/**
* 新增物流管理
*/
@SaCheckPermission("zhishu:logistics:add")
@Log(title = "物流管理", businessType = BusinessType.INSERT)
@RepeatSubmit()
@PostMapping()
@SaIgnore
public R<Void> add(@Validated(AddGroup.class) @RequestBody TLogisticsBo bo) {
return toAjax(tLogisticsService.insertByBo(bo));
}
@ -95,10 +97,10 @@ public class TLogisticsController extends BaseController {
/**
* 修改物流管理
*/
@SaCheckPermission("zhishu:logistics:edit")
@Log(title = "物流管理", businessType = BusinessType.UPDATE)
@RepeatSubmit()
@PutMapping()
@SaIgnore
public R<Void> edit(@Validated(EditGroup.class) @RequestBody TLogisticsBo bo) {
return toAjax(tLogisticsService.updateByBo(bo));
}
@ -108,9 +110,9 @@ public class TLogisticsController extends BaseController {
*
* @param ids 主键串
*/
@SaCheckPermission("zhishu:logistics:remove")
@Log(title = "物流管理", businessType = BusinessType.DELETE)
@DeleteMapping("/{ids}")
@SaIgnore
public R<Void> remove(@NotEmpty(message = "主键不能为空")
@PathVariable Long[] ids) {
return toAjax(tLogisticsService.deleteWithValidByIds(List.of(ids), true));
@ -124,13 +126,6 @@ public class TLogisticsController extends BaseController {
return TableDataInfo.build(list);
}
@GetMapping("/getList")
@SaIgnore
public TableDataInfo<TLogisticsVo> getList(Long userId) {
List<TLogisticsVo> list= tLogisticsService.getList(userId);
return TableDataInfo.build(list);
}
/**
* 小程序获取运费模板
*/

2
ruoyi-modules/ruoyi-zhishu/src/main/java/org/dromara/zhishu/service/ITLogisticsService.java
View File

@ -68,7 +68,5 @@ public interface ITLogisticsService {
List<TLogisticsVo> queryNameList();
List<TLogisticsVo> getList(Long userId);
List<TLogisticsVo> queryNameListByXcx(Long userId);
}

21
ruoyi-modules/ruoyi-zhishu/src/main/java/org/dromara/zhishu/service/impl/TLogisticsServiceImpl.java
View File

@ -17,7 +17,6 @@ import org.dromara.zhishu.domain.vo.ExcelTaskVo;
import org.dromara.zhishu.domain.vo.TDepotVo;
import org.dromara.zhishu.domain.vo.TLogisticsVo;
import org.dromara.zhishu.mapper.TLogisticsMapper;
import org.dromara.zhishu.service.IFastMailService;
import org.dromara.zhishu.service.ITLogisticsService;
import org.springframework.stereotype.Service;
@ -61,13 +60,7 @@ public class TLogisticsServiceImpl implements ITLogisticsService {
*/
@Override
public TableDataInfo<TLogisticsVo> queryPageList(TLogisticsBo bo, PageQuery pageQuery) {
Long userId;
if (bo.getUserId() != null){
userId = bo.getUserId();
}else{
userId = LoginHelper.getUserId();
}
Long userId = LoginHelper.getUserId();
bo.setUserId(userId);
LambdaQueryWrapper<TLogistics> lqw = buildQueryWrapper(bo);
// 物流类型转换
@ -92,12 +85,7 @@ public class TLogisticsServiceImpl implements ITLogisticsService {
@Override
public List<TLogisticsVo> queryList(TLogisticsBo bo) {
// 获取当前用户id
Long userId;
if (bo.getUserId() != null){
userId = bo.getUserId();
}else{
userId = LoginHelper.getUserId();
}
Long userId = LoginHelper.getUserId();
// 获取白名单
if (userId != 1) {
bo.setCreateBy(userId);
@ -213,11 +201,6 @@ public class TLogisticsServiceImpl implements ITLogisticsService {
return list;
}
@Override
public List<TLogisticsVo> getList(Long userId){
return baseMapper.selectUserId(userId);
}
@Override
public List<TLogisticsVo> queryNameListByXcx(Long userId) {
return baseMapper.selectUserId(userId);

1
ruoyi-modules/ruoyi-zhishu/src/main/java/org/dromara/zhishu/service/impl/WarehouseSettingsServiceImpl.java
View File

@ -59,6 +59,7 @@ public class WarehouseSettingsServiceImpl implements IWarehouseSettingsService {
params.put("pageNum",pageQuery.getPageNum());
params.put("pageSize",pageQuery.getPageSize());
params.put("delFlag",0);
params.put("createBy",LoginHelper.getUserId());
String WarehouseSettingsListStr = InterfaceUtils.getInterfaceGetWithParams(UrlUtil.getOrderServiceUrl(),"/api/warehouseSetting/getList",params);
Map dataMap = JsonUtil.transferToObj(WarehouseSettingsListStr,Map.class);
List WarehouseSettingsList = (List) dataMap.get("data");

4
ruoyi-modules/ruoyi-zhishu/src/main/java/org/dromara/zhishu/util/UrlUtil.java
View File

@ -44,8 +44,8 @@ public final class UrlUtil {
* 新订单服务地址
*/
public static String getOrderServiceUrl(){
return "http://119.45.237.193:8073";
//return "http://localhost:8075";
// return "http://119.45.237.193:8073";
return "http://localhost:8075";
}
public static String getNewTaskUrl(){