feat: 设备管理-卡片开发

dev_fifo1.0
chenhc 1 year ago
parent 8fa0556e89
commit 371c37c35f

@ -1,5 +1,7 @@
package com.glxp.api.controller.dev;
import com.glxp.api.service.CustomService;
import com.glxp.api.service.auth.CustomerService;
import org.springframework.beans.BeanUtils;
import cn.hutool.core.util.IdUtil;
import com.github.pagehelper.PageInfo;
@ -41,6 +43,8 @@ public class DeviceAssetCertController extends BaseController {
private String filePath;
@Resource
private DeviceAssetCertService deviceAssetCertService;
@Resource
private CustomerService customerService;
@AuthRuleAnnotation("")
@GetMapping("/inv/device/cert/filter")
@ -59,8 +63,12 @@ public class DeviceAssetCertController extends BaseController {
@PostMapping("/inv/info/insertDeviceCert")
@Log(title = "资质证书", businessType = BusinessType.INSERT)
public BaseResponse insertDeviceCert(@RequestBody DeviceAssetCertEntity deviceAssetCertEntity) {
deviceAssetCertEntity.setCreateTime(LocalDate.now());
deviceAssetCertEntity.setUpdateTime(LocalDate.now());
String userId = customerService.getUserId()+ "";
LocalDate now = LocalDate.now();
deviceAssetCertEntity.setCreateTime(now);
deviceAssetCertEntity.setUpdateTime(now);
deviceAssetCertEntity.setCreateUser(userId);
deviceAssetCertEntity.setUpdateUser(userId);
deviceAssetCertEntity.setStatus(0);
deviceAssetCertEntity.setId(IdUtil.getSnowflakeNextId());
boolean b = deviceAssetCertService.insertDeviceCert(deviceAssetCertEntity);
@ -94,14 +102,18 @@ public class DeviceAssetCertController extends BaseController {
long milliseconds2 = instant2.toEpochMilli();
if (postDeviceCertRequest.getVailDate() != null && postDeviceCertRequest.getExpireDate() != null) {
if (milliseconds > milliseconds2) {
return ResultVOUtils.error(999, "生效期不能小于失效期!");
return ResultVOUtils.error( "生效期不能小于失效期!");
}
}
String userId = customerService.getUserId()+ "";
LocalDate now = LocalDate.now();
deviceAssetCertEntity.setUpdateTime(now);
deviceAssetCertEntity.setUpdateUser(userId);
boolean b = deviceAssetCertService.updateDeviceCert(deviceAssetCertEntity);
if (b){
return ResultVOUtils.success("修改成功");
}else {
return ResultVOUtils.error(999,"修改失败!");
return ResultVOUtils.error("修改失败!");
}
}

@ -1,13 +1,91 @@
package com.glxp.api.controller.dev;
import cn.hutool.core.util.IdUtil;
import com.github.pagehelper.PageInfo;
import com.glxp.api.annotation.AuthRuleAnnotation;
import com.glxp.api.annotation.Log;
import com.glxp.api.common.res.BaseResponse;
import com.glxp.api.common.util.ResultVOUtils;
import com.glxp.api.constant.BusinessType;
import com.glxp.api.controller.BaseController;
import com.glxp.api.entity.dev.DeviceAssetUserEntity;
import com.glxp.api.req.inv.FilterInvUserRequest;
import com.glxp.api.req.system.DeleteDeviceFileRequest;
import com.glxp.api.res.PageSimpleResponse;
import com.glxp.api.service.auth.CustomerService;
import com.glxp.api.service.dev.DeviceAssetUserService;
import lombok.extern.slf4j.Slf4j;
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 java.util.Date;
import java.util.List;
/**
*
*/
@Slf4j
@RestController
public class DeviceAssetUserController extends BaseController {
@Resource
private DeviceAssetUserService deviceAssetUserService;
@Resource
private CustomerService customerService;
@AuthRuleAnnotation("")
@GetMapping("/inv/device/user/filter")
public BaseResponse filterDeviceUser(FilterInvUserRequest filterInvUserRequest) {
List<DeviceAssetUserEntity> deviceAssetUserEntityList
= deviceAssetUserService.filterDeviceUser(filterInvUserRequest);
PageInfo<DeviceAssetUserEntity> pageInfo;
pageInfo = new PageInfo<>(deviceAssetUserEntityList);
PageSimpleResponse<DeviceAssetUserEntity> pageSimpleResponse = new PageSimpleResponse<>();
pageSimpleResponse.setTotal(pageInfo.getTotal());
pageSimpleResponse.setList(deviceAssetUserEntityList);
return ResultVOUtils.success(pageSimpleResponse);
}
@AuthRuleAnnotation("")
@PostMapping("/inv/info/insertDeviceUser")
@Log(title = "相关人员", businessType = BusinessType.INSERT)
public BaseResponse insertDeviceUser(@RequestBody DeviceAssetUserEntity deviceAssetUserEntity) {
String userId = customerService.getUserId()+ "";
Date now = new Date();
deviceAssetUserEntity.setCreateTime(now);
deviceAssetUserEntity.setUpdateTime(now);
deviceAssetUserEntity.setCreateUser(userId);
deviceAssetUserEntity.setUpdateUser(userId);
deviceAssetUserEntity.setId(IdUtil.getSnowflakeNextId());
boolean b = deviceAssetUserService.insertDeviceUser(deviceAssetUserEntity);
return ResultVOUtils.success("成功");
}
@AuthRuleAnnotation("")
@PostMapping("/inv/info/deleteDeviceUser")
public BaseResponse deleteDeviceUser(@RequestBody DeleteDeviceFileRequest deleteDeviceFileRequest) {
boolean b = deviceAssetUserService.deleteById(deleteDeviceFileRequest.getId());
return ResultVOUtils.success("成功");
}
@AuthRuleAnnotation("")
@PostMapping("/inv/info/updateDeviceUser")
@Log(title = "相关人员", businessType = BusinessType.UPDATE)
public BaseResponse updateDeviceUser(@RequestBody DeviceAssetUserEntity deviceAssetUserEntity) {
String userId = customerService.getUserId()+ "";
Date now = new Date();
deviceAssetUserEntity.setUpdateTime(now);
deviceAssetUserEntity.setUpdateUser(userId);
boolean b = deviceAssetUserService.updateDeviceUser(deviceAssetUserEntity);
if (b){
return ResultVOUtils.success("修改成功");
}else {
return ResultVOUtils.error("修改失败!");
}
}
}

@ -2,8 +2,20 @@ package com.glxp.api.dao.dev;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.glxp.api.entity.dev.DeviceAssetUserEntity;
import com.glxp.api.entity.dev.DeviceAssetUserEntity;
import com.glxp.api.req.inv.FilterInvUserRequest;
import org.apache.ibatis.annotations.Mapper;
import java.util.List;
@Mapper
public interface DeviceAssetUserMapper extends BaseMapper<DeviceAssetUserEntity> {
List<DeviceAssetUserEntity> filterCompanyUser(FilterInvUserRequest filterInvUserRequest);
boolean deleteById(String id);
boolean updateDeviceUser(DeviceAssetUserEntity deviceAssetUserEntity);
}

@ -68,5 +68,11 @@ public class DeviceAssetUserEntity implements Serializable {
@TableField(value = "updateTime")
private Date updateTime;
/**
*
*/
@TableField(value = "userType")
private String userType;
private static final long serialVersionUID = 1L;
}

@ -125,6 +125,12 @@ public class DeviceChangeOrderItemEntity implements Serializable {
@TableField(value = "sourceType")
private String sourceType;
/**
*
*/
@TableField(value = "remark")
private String remark;
@TableField(exist = false)
private static final long serialVersionUID = 1L;

@ -161,6 +161,23 @@ public class DeviceChangeOrderParam {
*
*/
private String sourceType;
/**
* ID
*/
@TableField(value = "supId")
private String supId;
/**
*
*/
@TableField(value = "supName")
private String supName;
/**
*
*/
@TableField(value = "remark")
private String remark;
}

@ -0,0 +1,75 @@
package com.glxp.api.req.inv;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.glxp.api.util.page.ListPageRequest;
import lombok.Data;
import java.time.LocalDateTime;
import java.util.Date;
/**
*
*/
@Data
public class FilterInvUserRequest extends ListPageRequest {
@TableId(value = "id", type = IdType.INPUT)
private Long id;
/**
*
*/
@TableField(value = "devCodeFk")
private String devCodeFk;
/**
*
*/
@TableField(value = "userName")
private String userName;
/**
* 1
*/
@TableField(value = "contact1")
private String contact1;
/**
* 2
*/
@TableField(value = "contact2")
private String contact2;
/**
*
*/
@TableField(value = "remark")
private String remark;
/**
*
*/
@TableField(value = "`createUser`")
private String createUser;
/**
*
*/
@TableField(value = "createTime")
private Date createTime;
/**
*
*/
@TableField(value = "updateUser")
private String updateUser;
/**
*
*/
@TableField(value = "updateTime")
private Date updateTime;
}

@ -1,10 +1,22 @@
package com.glxp.api.service.dev;
import org.springframework.stereotype.Service;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.baomidou.mybatisplus.extension.service.IService;
import com.glxp.api.entity.dev.DeviceAssetUserEntity;
import com.glxp.api.dao.dev.DeviceAssetUserMapper;
import com.glxp.api.req.inv.FilterInvUserRequest;
import org.springframework.stereotype.Service;
import java.util.List;
@Service
public class DeviceAssetUserService extends ServiceImpl<DeviceAssetUserMapper, DeviceAssetUserEntity> {
public interface DeviceAssetUserService extends IService<DeviceAssetUserEntity> {
List<DeviceAssetUserEntity> filterDeviceUser(FilterInvUserRequest filterInvUserRequest);
boolean insertDeviceUser(DeviceAssetUserEntity deviceAssetUserEntity);
boolean deleteById(String id);
boolean updateDeviceUser(DeviceAssetUserEntity deviceAssetUserEntity);
}

@ -0,0 +1,54 @@
package com.glxp.api.service.dev.impl;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.github.pagehelper.PageHelper;
import com.glxp.api.dao.dev.DeviceAssetUserMapper;
import com.glxp.api.entity.dev.DeviceAssetUserEntity;
import com.glxp.api.req.inv.FilterInvUserRequest;
import com.glxp.api.service.dev.DeviceAssetUserService;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import javax.annotation.Resource;
import java.util.Collections;
import java.util.List;
@Slf4j
@Service
@Transactional(rollbackFor = Exception.class)
public class DeviceAssetUserServiceImpl extends ServiceImpl<DeviceAssetUserMapper, DeviceAssetUserEntity> implements DeviceAssetUserService {
@Resource
DeviceAssetUserMapper deviceAssetUserMapper;
@Override
public List<DeviceAssetUserEntity> filterDeviceUser(FilterInvUserRequest filterInvUserRequest) {
if (filterInvUserRequest == null) {
return Collections.emptyList();
}
if (filterInvUserRequest.getPage() != null) {
int offset = (filterInvUserRequest.getPage() - 1) * filterInvUserRequest.getLimit();
PageHelper.offsetPage(offset, filterInvUserRequest.getLimit());
}
return deviceAssetUserMapper.filterCompanyUser(filterInvUserRequest);
}
@Override
public boolean insertDeviceUser(DeviceAssetUserEntity deviceAssetUserEntity) {
return deviceAssetUserMapper.insert(deviceAssetUserEntity) > 0 ? true : false;
}
@Override
public boolean deleteById(String id) {
return deviceAssetUserMapper.deleteById(id);
}
@Override
public boolean updateDeviceUser(DeviceAssetUserEntity deviceAssetUserEntity) {
return deviceAssetUserMapper.updateDeviceUser(deviceAssetUserEntity);
}
}

@ -69,6 +69,8 @@
<if test="type != null">`type`=#{type},</if>
<if test="code != null">`code`=#{code},</if>
<if test="status != null">`status`=#{status},</if>
<if test="updateUser != null">`updateUser`=#{updateUser},</if>
<if test="updateTime != null">`updateTime`=#{updateTime},</if>
</trim>
WHERE id = #{id}

@ -20,4 +20,51 @@
id, devCodeFk, userName, contact1, contact2, remark, `createUser`, createTime, updateUser,
updateTime
</sql>
<select id="filterCompanyUser" parameterType="com.glxp.api.req.inv.FilterInvUserRequest"
resultType="com.glxp.api.entity.dev.DeviceAssetUserEntity">
select * from device_asset_user
<where>
devCodeFk = #{devCodeFk}
<!-- <if test="devCodeFk != '' and devCodeFk!=null">-->
<!-- and devCodeFk = #{devCodeFk}-->
<!-- </if>-->
<if test="userName != '' and userName!=null">
and userName = #{userName}
</if>
<if test="contact1 != '' and contact1!=null">
and contact1 = #{contact1}
</if>
<if test="contact2 != '' and contact2!=null">
and contact2 = #{contact2}
</if>
</where>
ORDER BY id DESC
</select>
<delete id="deleteById" parameterType="Map">
DELETE
FROM device_asset_user
WHERE id = #{id}
</delete>
<update id="updateDeviceUser" parameterType="com.glxp.api.entity.dev.DeviceAssetUserEntity">
UPDATE device_asset_user
<trim prefix="set" suffixOverrides=",">
<if test="userName != null">userName=#{userName},</if>
<if test="devCodeFk != null">devCodeFk=#{devCodeFk},</if>
<if test="contact1 != null">contact1=#{contact1},</if>
<if test="contact2 != null">contact2=#{contact2},</if>
<if test="remark != null">`remark`=#{remark},</if>
<if test="updateUser != null">`updateUser`=#{updateUser},</if>
<if test="updateTime != null">`updateTime`=#{updateTime},</if>
</trim>
WHERE id = #{id}
</update>
</mapper>

@ -1788,6 +1788,9 @@ VALUES (38031, 46, '1', 1, 'auditRemark', '审核详情', 'button', NULL, NULL,
CALL Pro_Temp_ColumnWork('device_change_order_item', 'sourceType',
' varchar(10) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_as_cs NULL DEFAULT NULL COMMENT ''来源类型'' ',
1);
CALL Pro_Temp_ColumnWork('device_change_order_item', 'remark',
' varchar(526) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_as_cs NULL DEFAULT NULL COMMENT ''备注'' ',
1);
INSERT IGNORE INTO auth_menu(`menu_id`, `menu_name`, `parent_id`, `order_num`, `path`, `component`, `query_param`,
`is_frame`, `is_cache`, `menu_type`, `visible`, `status`, `perms`, `icon`, `create_by`,
@ -1818,5 +1821,20 @@ ALTER TABLE sys_dict_data
ALTER TABLE sys_dict_type
MODIFY COLUMN `dict_id` bigint(0) NOT NULL AUTO_INCREMENT COMMENT '字典主键' FIRST;
INSERT IGNORE INTO sys_dict_type(`dict_id`, `dict_name`, `dict_type`, `status`, `create_by`, `create_time`, `update_by`, `update_time`, `remark`)
VALUES (9, '相关人员类别', 'device_user_type', '0', 'admin', '2024-03-20 11:47:55', 'admin', '2024-03-20 11:47:55', '相关人员类别列表');
insert IGNORE into sys_dict_data values(11, 1, '维护员', '1', 'device_user_type', '', 'primary', 'Y', '0', 'admin', sysdate(), '', null, '维护人员');
insert IGNORE into sys_dict_data values(12, 2, '厂家技术支持', '2', 'device_user_type', '', 'primary', 'N', '0', 'admin', sysdate(), '', null, '厂家技术支持人员');
insert IGNORE into sys_dict_data values(13, 3, '操作员', '3', 'device_user_type', '', 'primary', 'N', '0', 'admin', sysdate(), '', null, '操作人员');
CALL Pro_Temp_ColumnWork('device_asset_user', 'userType',
' varchar(10) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_as_cs NULL DEFAULT NULL COMMENT ''用户类型'' ',
1);
ALTER TABLE device_asset_cert
MODIFY COLUMN `updateUser` varchar(255) NULL DEFAULT NULL COMMENT '更新人' AFTER `createTime`;
ALTER TABLE device_asset_user
MODIFY COLUMN `updateUser` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '更新人' AFTER `createTime`;
CALL Pro_Temp_ColumnWork('thr_inv_order_detail', 'batchNo', 'varchar(60)', 2);

Loading…
Cancel
Save