From f74921920333a639162022a760c2402380eaa97f Mon Sep 17 00:00:00 2001
From: zfhai <15856818120@163.com>
Date: Sat, 9 Dec 2023 20:43:17 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E7=9B=B8=E5=85=B3=E4=BB=A3?=
=?UTF-8?q?=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../zlpt/equip/api/domain/vo/DevInfoVo.java | 5 +
.../zlpt/equip/api/enums/MaStatusEnum.java | 10 +-
.../common/core/web/domain/BaseEntity.java | 6 +-
.../controller/BmCompanyInfoController.java | 8 +-
.../impl/BmCompanyInfoServiceImpl.java | 4 +-
.../resources/mapper/BmCompanyInfoMapper.xml | 2 +-
.../equip/controller/DevInfoController.java | 14 ++
.../zlpt/equip/mapper/DevInfoMapper.java | 2 +
.../zlpt/equip/service/IDevInfoService.java | 2 +
.../service/impl/DevInfoServiceImpl.java | 24 ++-
.../impl/TypeInfoRecordServiceImpl.java | 2 +-
.../service/impl/TypeInfoServiceImpl.java | 2 +-
.../equip/service/impl/UpOffServiceImpl.java | 12 ++
.../main/resources/mapper/DevInfoMapper.xml | 142 ++++++++++--------
14 files changed, 153 insertions(+), 82 deletions(-)
diff --git a/zlpt-api/zlpt-api-equip/src/main/java/com/bonus/zlpt/equip/api/domain/vo/DevInfoVo.java b/zlpt-api/zlpt-api-equip/src/main/java/com/bonus/zlpt/equip/api/domain/vo/DevInfoVo.java
index ecc24b1..358661e 100644
--- a/zlpt-api/zlpt-api-equip/src/main/java/com/bonus/zlpt/equip/api/domain/vo/DevInfoVo.java
+++ b/zlpt-api/zlpt-api-equip/src/main/java/com/bonus/zlpt/equip/api/domain/vo/DevInfoVo.java
@@ -79,5 +79,10 @@ public class DevInfoVo extends DevInfo {
private String cityStr;
@ApiModelProperty(value = "区名称")
private String areaStr;
+ @ApiModelProperty(value = "装备类别Id")
+ private String companyId;
+ /* 装备组别 parent */
+ @ApiModelProperty(value = "装备组别Id")
+ private String groupId;
private Long userId;
}
diff --git a/zlpt-api/zlpt-api-equip/src/main/java/com/bonus/zlpt/equip/api/enums/MaStatusEnum.java b/zlpt-api/zlpt-api-equip/src/main/java/com/bonus/zlpt/equip/api/enums/MaStatusEnum.java
index 330db46..c850433 100644
--- a/zlpt-api/zlpt-api-equip/src/main/java/com/bonus/zlpt/equip/api/enums/MaStatusEnum.java
+++ b/zlpt-api/zlpt-api-equip/src/main/java/com/bonus/zlpt/equip/api/enums/MaStatusEnum.java
@@ -2,8 +2,8 @@ package com.bonus.zlpt.equip.api.enums;
public enum MaStatusEnum {
- /** 待上架审批 */
- PENDING_APPROVAL(15, "待上架审批"),
+ /** 待上架 */
+ TO_BE_LISTED (15, "待上架"),
/** 待租 */
ON_HIRE(16, "待租"),
/** 在租 */
@@ -11,7 +11,11 @@ public enum MaStatusEnum {
/** 下架 */
DELIST(18,"下架"),
/** 自有 */
- SELF_OWNED(43,"自有");
+ SELF_OWNED(43,"自有"),
+ /** 待审批 */
+ PENDING_APPROVAL(331,"待审批"),
+ /** 上架驳回 */
+ LISTING_REJECTED(332,"上架驳回");
diff --git a/zlpt-common/zlpt-common-core/src/main/java/com/bonus/zlpt/common/core/web/domain/BaseEntity.java b/zlpt-common/zlpt-common-core/src/main/java/com/bonus/zlpt/common/core/web/domain/BaseEntity.java
index 6c31f9c..167f34f 100644
--- a/zlpt-common/zlpt-common-core/src/main/java/com/bonus/zlpt/common/core/web/domain/BaseEntity.java
+++ b/zlpt-common/zlpt-common-core/src/main/java/com/bonus/zlpt/common/core/web/domain/BaseEntity.java
@@ -25,7 +25,7 @@ public class BaseEntity implements Serializable
/** 创建时间 */
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
- private Date createTime;
+ private String createTime;
/** 更新者 */
private String updateBy;
@@ -61,12 +61,12 @@ public class BaseEntity implements Serializable
this.createBy = createBy;
}
- public Date getCreateTime()
+ public String getCreateTime()
{
return createTime;
}
- public void setCreateTime(Date createTime)
+ public void setCreateTime(String createTime)
{
this.createTime = createTime;
}
diff --git a/zlpt-modules/zlpt-company/src/main/java/com/bonus/zlpt/company/controller/BmCompanyInfoController.java b/zlpt-modules/zlpt-company/src/main/java/com/bonus/zlpt/company/controller/BmCompanyInfoController.java
index f271749..a94fe93 100644
--- a/zlpt-modules/zlpt-company/src/main/java/com/bonus/zlpt/company/controller/BmCompanyInfoController.java
+++ b/zlpt-modules/zlpt-company/src/main/java/com/bonus/zlpt/company/controller/BmCompanyInfoController.java
@@ -52,7 +52,7 @@ public class BmCompanyInfoController extends BaseController {
/**
* 获取公司列表
*/
- @RequiresPermissions("system:company:list")
+// @RequiresPermissions("system:company:list")
@GetMapping("/list")
@ApiOperation("获取公司列表")
public AjaxResult list(BmCompanyInfo obj) {
@@ -63,7 +63,7 @@ public class BmCompanyInfoController extends BaseController {
/**
* 新增 -- 录入企业信息
*/
- @RequiresPermissions("system:company:add")
+ // @RequiresPermissions("system:company:add")
@Log(title = "企业管理", businessType = BusinessType.INSERT)
@PostMapping("addCompanyInfo")
@ApiOperation("录入企业信息")
@@ -74,7 +74,7 @@ public class BmCompanyInfoController extends BaseController {
/**
* 修改 -- 企业信息变更
*/
- @RequiresPermissions("system:company:edit")
+ // @RequiresPermissions("system:company:edit")
@Log(title = "企业管理", businessType = BusinessType.UPDATE)
@PostMapping("updateCompanyInfo")
@ApiOperation("企业信息变更")
@@ -92,7 +92,7 @@ public class BmCompanyInfoController extends BaseController {
/**
* 删除 -- 企业注销
*/
- @RequiresPermissions("system:company:remove")
+ // @RequiresPermissions("system:company:remove")
@Log(title = "企业管理", businessType = BusinessType.DELETE)
@DeleteMapping("/{deptId}")
@ApiOperation("企业注销")
diff --git a/zlpt-modules/zlpt-company/src/main/java/com/bonus/zlpt/company/service/impl/BmCompanyInfoServiceImpl.java b/zlpt-modules/zlpt-company/src/main/java/com/bonus/zlpt/company/service/impl/BmCompanyInfoServiceImpl.java
index e92bca6..e9c66ea 100644
--- a/zlpt-modules/zlpt-company/src/main/java/com/bonus/zlpt/company/service/impl/BmCompanyInfoServiceImpl.java
+++ b/zlpt-modules/zlpt-company/src/main/java/com/bonus/zlpt/company/service/impl/BmCompanyInfoServiceImpl.java
@@ -36,10 +36,10 @@ public class BmCompanyInfoServiceImpl implements BmCompanyInfoService {
@Resource
private BmCompanyInfoDao bmCompanyInfoMapper;
- @Autowired
+ @Resource
private BmCoBankMapper bmCoBankMapper;
- @Autowired
+ @Resource
private RemoteUserService remoteUserService;
diff --git a/zlpt-modules/zlpt-company/src/main/resources/mapper/BmCompanyInfoMapper.xml b/zlpt-modules/zlpt-company/src/main/resources/mapper/BmCompanyInfoMapper.xml
index 5403439..5022945 100644
--- a/zlpt-modules/zlpt-company/src/main/resources/mapper/BmCompanyInfoMapper.xml
+++ b/zlpt-modules/zlpt-company/src/main/resources/mapper/BmCompanyInfoMapper.xml
@@ -248,7 +248,7 @@
#{idNationUrl,jdbcType=VARCHAR},
- #{auth_email,jdbcType=VARCHAR},
+ #{authEmail,jdbcType=VARCHAR},
#{createTime,jdbcType=VARCHAR},
diff --git a/zlpt-modules/zlpt-equip/src/main/java/com/bonus/zlpt/equip/controller/DevInfoController.java b/zlpt-modules/zlpt-equip/src/main/java/com/bonus/zlpt/equip/controller/DevInfoController.java
index 58ae5bd..2d29453 100644
--- a/zlpt-modules/zlpt-equip/src/main/java/com/bonus/zlpt/equip/controller/DevInfoController.java
+++ b/zlpt-modules/zlpt-equip/src/main/java/com/bonus/zlpt/equip/controller/DevInfoController.java
@@ -152,4 +152,18 @@ public class DevInfoController extends BaseController
Map sumType =devInfoService.sumType();
return success(sumType);
}
+
+
+ /**
+ * 查询商品列表
+ */
+ //@RequiresPermissions("equip:info:list")
+ @ApiOperation(value = "查询商品列表")
+ @PostMapping("/devList")
+ public TableDataInfo devList(@RequestBody DevInfoVo devInfo)
+ {
+ startPage(devInfo.getPageNum(), devInfo.getPageSize());
+ List list = devInfoService.selectDevInfoLists(devInfo);
+ return getDataTable(list);
+ }
}
diff --git a/zlpt-modules/zlpt-equip/src/main/java/com/bonus/zlpt/equip/mapper/DevInfoMapper.java b/zlpt-modules/zlpt-equip/src/main/java/com/bonus/zlpt/equip/mapper/DevInfoMapper.java
index 916b2cb..13f78c1 100644
--- a/zlpt-modules/zlpt-equip/src/main/java/com/bonus/zlpt/equip/mapper/DevInfoMapper.java
+++ b/zlpt-modules/zlpt-equip/src/main/java/com/bonus/zlpt/equip/mapper/DevInfoMapper.java
@@ -96,4 +96,6 @@ public interface DevInfoMapper
public List getBaseAddress();
public String getBaseAddressById(Integer id);
+
+ List selectDevInfoLists(DevInfoVo devInfo);
}
diff --git a/zlpt-modules/zlpt-equip/src/main/java/com/bonus/zlpt/equip/service/IDevInfoService.java b/zlpt-modules/zlpt-equip/src/main/java/com/bonus/zlpt/equip/service/IDevInfoService.java
index eabf03f..4d36b98 100644
--- a/zlpt-modules/zlpt-equip/src/main/java/com/bonus/zlpt/equip/service/IDevInfoService.java
+++ b/zlpt-modules/zlpt-equip/src/main/java/com/bonus/zlpt/equip/service/IDevInfoService.java
@@ -76,4 +76,6 @@ public interface IDevInfoService
public Map sumType();
+
+ List selectDevInfoLists(DevInfoVo devInfo);
}
diff --git a/zlpt-modules/zlpt-equip/src/main/java/com/bonus/zlpt/equip/service/impl/DevInfoServiceImpl.java b/zlpt-modules/zlpt-equip/src/main/java/com/bonus/zlpt/equip/service/impl/DevInfoServiceImpl.java
index faa12d2..59b9130 100644
--- a/zlpt-modules/zlpt-equip/src/main/java/com/bonus/zlpt/equip/service/impl/DevInfoServiceImpl.java
+++ b/zlpt-modules/zlpt-equip/src/main/java/com/bonus/zlpt/equip/service/impl/DevInfoServiceImpl.java
@@ -205,15 +205,23 @@ public class DevInfoServiceImpl implements IDevInfoService
@Override
public int insertDevInfo(DevInfo devInfo)
{
- devInfo.setCreateTime(DateUtils.getNowDate());
+ devInfo.setCreateTime(DateUtils.getDate());
+ //获取用户信息
+ Long userId = SecurityUtils.getUserId();
+ //保存用户信息
+ devInfo.setCreator(userId);
+ devInfo.setCode(String.valueOf(UUID.randomUUID()));
+ devInfoMapper.insertDevInfo(devInfo);
//把文件保存到附件中
List fileInfoList = devInfo.getFileList();
if (fileInfoList.size()>0){
for (SysFileInfo sysFileInfo: fileInfoList) {
+ sysFileInfo.setModelId(Math.toIntExact(devInfo.getMaId()));
+ sysFileInfo.setCreator(String.valueOf(userId));
sysFileInfoMapper.insertFileInfo(sysFileInfo);
}
}
- return devInfoMapper.insertDevInfo(devInfo);
+ return 1;
}
/**
@@ -289,4 +297,16 @@ public class DevInfoServiceImpl implements IDevInfoService
}
return sumTypeMap;
}
+
+ @Override
+ public List selectDevInfoLists(DevInfoVo devInfo) {
+
+ List list = devInfoMapper.selectDevInfoLists(devInfo);
+ //获取设备的附件
+ for (DevInfoVo devInfoVo: list) {
+ List fileInfoList = sysFileInfoMapper.selectByMaId(devInfoVo.getMaId());
+ devInfoVo.setFileList(fileInfoList);
+ }
+ return list;
+ }
}
diff --git a/zlpt-modules/zlpt-equip/src/main/java/com/bonus/zlpt/equip/service/impl/TypeInfoRecordServiceImpl.java b/zlpt-modules/zlpt-equip/src/main/java/com/bonus/zlpt/equip/service/impl/TypeInfoRecordServiceImpl.java
index c562220..d0b511f 100644
--- a/zlpt-modules/zlpt-equip/src/main/java/com/bonus/zlpt/equip/service/impl/TypeInfoRecordServiceImpl.java
+++ b/zlpt-modules/zlpt-equip/src/main/java/com/bonus/zlpt/equip/service/impl/TypeInfoRecordServiceImpl.java
@@ -56,7 +56,7 @@ public class TypeInfoRecordServiceImpl implements ITypeInfoRecordService
@Override
public int insertTypeInfoRecord(TypeInfoRecord typeInfoRecord)
{
- typeInfoRecord.setCreateTime(DateUtils.getNowDate());
+ typeInfoRecord.setCreateTime(DateUtils.getDate());
return typeInfoRecordMapper.insertTypeInfoRecord(typeInfoRecord);
}
diff --git a/zlpt-modules/zlpt-equip/src/main/java/com/bonus/zlpt/equip/service/impl/TypeInfoServiceImpl.java b/zlpt-modules/zlpt-equip/src/main/java/com/bonus/zlpt/equip/service/impl/TypeInfoServiceImpl.java
index 5e436ec..32f74bf 100644
--- a/zlpt-modules/zlpt-equip/src/main/java/com/bonus/zlpt/equip/service/impl/TypeInfoServiceImpl.java
+++ b/zlpt-modules/zlpt-equip/src/main/java/com/bonus/zlpt/equip/service/impl/TypeInfoServiceImpl.java
@@ -65,7 +65,7 @@ public class TypeInfoServiceImpl implements ITypeInfoService
@Override
public int insertTypeInfo(TypeInfo typeInfo)
{
- typeInfo.setCreateTime(DateUtils.getNowDate());
+ typeInfo.setCreateTime(DateUtils.getDate());
return typeInfoMapper.insertTypeInfo(typeInfo);
}
diff --git a/zlpt-modules/zlpt-equip/src/main/java/com/bonus/zlpt/equip/service/impl/UpOffServiceImpl.java b/zlpt-modules/zlpt-equip/src/main/java/com/bonus/zlpt/equip/service/impl/UpOffServiceImpl.java
index b996ceb..cdca758 100644
--- a/zlpt-modules/zlpt-equip/src/main/java/com/bonus/zlpt/equip/service/impl/UpOffServiceImpl.java
+++ b/zlpt-modules/zlpt-equip/src/main/java/com/bonus/zlpt/equip/service/impl/UpOffServiceImpl.java
@@ -5,11 +5,14 @@ import java.util.stream.Collectors;
import com.bonus.zlpt.common.security.utils.SecurityUtils;
+import com.bonus.zlpt.equip.api.domain.DevInfo;
import com.bonus.zlpt.equip.api.domain.SysFileInfo;
import com.bonus.zlpt.equip.api.domain.TypeInfo;
import com.bonus.zlpt.equip.api.domain.UpOff;
import com.bonus.zlpt.equip.api.domain.dto.UpOffDto;
import com.bonus.zlpt.common.core.enums.FileDictEnum;
+import com.bonus.zlpt.equip.api.enums.MaStatusEnum;
+import com.bonus.zlpt.equip.mapper.DevInfoMapper;
import com.bonus.zlpt.equip.mapper.SysFileInfoMapper;
import com.bonus.zlpt.equip.mapper.TypeInfoMapper;
import com.bonus.zlpt.equip.api.domain.vo.MaDevInfoVo;
@@ -39,6 +42,9 @@ public class UpOffServiceImpl implements IUpOffService
@Resource
private SysFileInfoMapper sysFileInfoMapper;
+ @Resource
+ private DevInfoMapper devInfoMapper;
+
/**
* 查询设备上下架管理
@@ -85,7 +91,13 @@ public class UpOffServiceImpl implements IUpOffService
for (int i = 0; i < upOffList.size(); i++) {
UpOff UpOff = upOffList.get(i);
UpOff.setApplyUser(name);
+ //新增一条上架数据
upOffMapper.insertUpOff(UpOff);
+ DevInfo devInfo = new DevInfo();
+ devInfo.setMaId(UpOff.getMaId());
+ devInfo.setMaStatus(String.valueOf(MaStatusEnum.PENDING_APPROVAL.getCode()));
+ //修改此时商品的状态
+ devInfoMapper.updateDevInfo(devInfo);
}
return 1;
}
diff --git a/zlpt-modules/zlpt-equip/src/main/resources/mapper/DevInfoMapper.xml b/zlpt-modules/zlpt-equip/src/main/resources/mapper/DevInfoMapper.xml
index fa6d178..fb75fc7 100644
--- a/zlpt-modules/zlpt-equip/src/main/resources/mapper/DevInfoMapper.xml
+++ b/zlpt-modules/zlpt-equip/src/main/resources/mapper/DevInfoMapper.xml
@@ -261,75 +261,75 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
GROUP BY d.own_co
-
+
insert into ma_dev_info
- ma_id,
- code,
- type_id,
- ma_status,
- lease_scope,
- location,
- provinceId,
- cityId,
- areaId,
- brand,
- model_name,
- production_date,
- working_hours,
- serial_number,
- month_lease_price,
- day_lease_price,
- pic_url,
- js_month_price,
- js_day_price,
- description,
- gps_code,
- own_co,
- create_time,
- creator,
- update_time,
- update_by,
- specification,
- deposit,
- is_operator,
- is_active,
- update_time,
- update_by,
+ ma_id,
+ code,
+ type_id,
+ ma_status,
+ lease_scope,
+ location,
+ province_id,
+ city_id,
+ area_id,
+ brand,
+ model_name,
+ production_date,
+ working_hours,
+ serial_number,
+ month_lease_price,
+ day_lease_price,
+ pic_url,
+ js_month_price,
+ js_day_price,
+ description,
+ gps_code,
+ own_co,
+ create_time,
+ creator,
+ update_time,
+ update_by,
+ specification,
+ deposit,
+ is_operator,
+ is_active,
+ update_time,
+ update_by,
- #{maId},
- #{code},
- #{typeId},
- #{maStatus},
- #{leaseScope},
- #{location},
- #{provinceId},
- #{cityId},
- #{areaId},
- #{brand},
- #{modelName},
- #{productionDate},
- #{workingHours},
- #{serialNumber},
- #{monthLeasePrice},
- #{dayLeasePrice},
- #{picUrl},
- #{jsMonthPrice},
- #{jsDayPrice},
- #{description},
- #{gpsCode},
- #{ownCo},
- #{createTime},
- #{creator},
- #{update_time},
- #{update_by},
- #{specification},
- #{deposit},
- #{isOperator},
- #{isActive},
- #{updateTime},
- #{updateBy},
+ #{maId},
+ #{code},
+ #{typeId},
+ #{maStatus},
+ #{leaseScope},
+ #{location},
+ #{provinceId},
+ #{cityId},
+ #{areaId},
+ #{brand},
+ #{modelName},
+ #{productionDate},
+ #{workingHours},
+ #{serialNumber},
+ #{monthLeasePrice},
+ #{dayLeasePrice},
+ #{picUrl},
+ #{jsMonthPrice},
+ #{jsDayPrice},
+ #{description},
+ #{gpsCode},
+ #{ownCo},
+ #{createTime},
+ #{creator},
+ #{update_time},
+ #{update_by},
+ #{specification},
+ #{deposit},
+ #{isOperator},
+ #{isActive},
+ #{updateTime},
+ #{updateBy},
@@ -436,4 +436,16 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+
\ No newline at end of file