From 88a500b74a6f59f7f0ba19d6bb464e3a4ae8255c Mon Sep 17 00:00:00 2001
From: gaoaoy <1042166043@qq.com>
Date: 星期一, 04 三月 2024 13:07:33 +0800
Subject: [PATCH] 6 设备工具明细
---
cnas-server/src/main/java/com/yuanchu/mom/mapper/DeviceMapper.java | 20 ++
cnas-server/src/main/java/com/yuanchu/mom/service/impl/DeviceServiceImpl.java | 60 ++++++++
system-run/src/test/java/com/yuanchu/mom/SystemRunApplicationTest.java | 4
cnas-server/src/main/resources/mapper/DeviceMapper.xml | 59 ++++++++
cnas-server/src/main/java/com/yuanchu/mom/controller/DeviceController.java | 62 ++++++++
cnas-server/src/main/java/com/yuanchu/mom/service/DeviceService.java | 26 +++
cnas-server/src/main/java/com/yuanchu/mom/pojo/Device.java | 144 ++++++++++++++++++++
7 files changed, 372 insertions(+), 3 deletions(-)
diff --git a/cnas-server/src/main/java/com/yuanchu/mom/controller/DeviceController.java b/cnas-server/src/main/java/com/yuanchu/mom/controller/DeviceController.java
new file mode 100644
index 0000000..0757f5c
--- /dev/null
+++ b/cnas-server/src/main/java/com/yuanchu/mom/controller/DeviceController.java
@@ -0,0 +1,62 @@
+package com.yuanchu.mom.controller;
+
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.yuanchu.mom.annotation.ValueAuth;
+import com.yuanchu.mom.pojo.Device;
+import com.yuanchu.mom.service.DeviceService;
+import com.yuanchu.mom.utils.JackSonUtil;
+import com.yuanchu.mom.vo.Result;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.AllArgsConstructor;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.Map;
+
+/**
+ * 璁惧(DeviceController)琛ㄦ帶鍒跺眰
+ */
+@Api(tags = "璁惧")
+@AllArgsConstructor
+@RestController
+@RequestMapping("/deviceScope")
+public class DeviceController {
+
+ private DeviceService deviceService;
+
+ @ApiOperation(value = "鏌ヨ璁惧璇︽儏鍒楄〃")
+ @PostMapping("/selectDeviceParameter")
+ public Result selectDeviceParameter(@RequestBody Map<String, Object> data) throws Exception {
+ Page page = JackSonUtil.unmarshal(JackSonUtil.marshal(data.get("page")), Page.class);
+ Device itemParameter = JackSonUtil.unmarshal(JackSonUtil.marshal(data.get("entity")), Device.class);
+ return Result.success(deviceService.selectDeviceParameter(page, itemParameter));
+ }
+
+ @ApiOperation(value = "娣诲姞璁惧璇︽儏鍙傛暟")
+ @PostMapping("/addDeviceParameter")
+ public Result addDeviceParameter(@RequestBody Device itemParameter) {
+ return Result.success(deviceService.addDeviceParameter(itemParameter));
+ }
+
+ @ApiOperation(value = "鍒犻櫎璁惧璇︽儏鍙傛暟")
+ @PostMapping("/delDeviceParameter")
+ public Result<?> delDeviceParameter(Integer id) {
+ return Result.success(deviceService.delDeviceParameter(id));
+ }
+
+ @ApiOperation(value = "淇敼璁惧璇︽儏鍙傛暟")
+ @PostMapping("/upDeviceParameter")
+ public Result<?> upDeviceParameter(@RequestBody Device itemParameter) {
+ return Result.success(deviceService.upDeviceParameter(itemParameter));
+ }
+
+ @ApiOperation(value = "鑾峰彇璁惧鎬昏")
+ @GetMapping("/selectEquipmentOverview")
+ @ValueAuth
+ public Result selectEquipmentOverview() {
+ return Result.success(deviceService.selectEquipmentOverview());
+ }
+
+}
+
diff --git a/cnas-server/src/main/java/com/yuanchu/mom/mapper/DeviceMapper.java b/cnas-server/src/main/java/com/yuanchu/mom/mapper/DeviceMapper.java
new file mode 100644
index 0000000..74a72d1
--- /dev/null
+++ b/cnas-server/src/main/java/com/yuanchu/mom/mapper/DeviceMapper.java
@@ -0,0 +1,20 @@
+package com.yuanchu.mom.mapper;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.yuanchu.mom.pojo.Device;
+
+import java.util.List;
+
+/**
+ * 璁惧(Device)琛ㄦ暟鎹簱璁块棶灞�
+ */
+public interface DeviceMapper extends BaseMapper<Device> {
+
+ IPage<Device> selectDeviceParameter(Page page, QueryWrapper<Device> ew);
+
+ List<Device> selectEquipmentOverview();
+}
+
diff --git a/cnas-server/src/main/java/com/yuanchu/mom/pojo/Device.java b/cnas-server/src/main/java/com/yuanchu/mom/pojo/Device.java
new file mode 100644
index 0000000..236bdbd
--- /dev/null
+++ b/cnas-server/src/main/java/com/yuanchu/mom/pojo/Device.java
@@ -0,0 +1,144 @@
+package com.yuanchu.mom.pojo;
+
+import com.baomidou.mybatisplus.annotation.*;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.yuanchu.mom.annotation.ValueTableShow;
+import com.yuanchu.mom.common.OrderBy;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
+/**
+ * 璁惧(Device)琛ㄥ璞�
+ */
+@TableName(value = "device")
+@Data
+public class Device extends OrderBy implements Serializable {
+ @ApiModelProperty(value = "涓婚敭")
+ @TableId(type = IdType.AUTO)
+ private Integer id;
+
+ @ValueTableShow(2)
+ @ApiModelProperty(value = "澶х被")
+ private String largeCategory;
+
+ @ValueTableShow(3)
+ @ApiModelProperty(value = "鍑哄巶鏃ユ湡")
+ @TableField(fill = FieldFill.INSERT)
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private String dateProduction;
+
+ @ValueTableShow(4)
+ @ApiModelProperty(value = "璁惧璐熻矗浜�")
+ private String equipmentManager;
+
+ @ValueTableShow(5)
+ @ApiModelProperty(value = "琚巿鏉冧汉")
+ private String authorizedPerson;
+
+ @ValueTableShow(6)
+ @ApiModelProperty(value = "璁惧鍚嶇О")
+ private String deviceName;
+
+ @ValueTableShow(7)
+ @ApiModelProperty(value = "鍐呴儴缂栫爜")
+ private String internalCode;
+
+ @ValueTableShow(8)
+ @ApiModelProperty(value = "璧勪骇缂栫爜")
+ private String assetCode;
+
+ @ValueTableShow(9)
+ @ApiModelProperty(value = "鏍″噯鏃ユ湡锛堟湀锛�")
+ @TableField(fill = FieldFill.INSERT)
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private LocalDateTime calibrationDate;
+
+ @ValueTableShow(10)
+ @ApiModelProperty(value = "鎶ュ簾鏃ユ湡")
+ @TableField(fill = FieldFill.INSERT)
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private LocalDateTime scrapTime;
+
+ @ValueTableShow(11)
+ @ApiModelProperty(value = "楠屾敹璁板綍")
+ private String acceptanceRecords;
+
+ @ValueTableShow(12)
+ @ApiModelProperty(value = "缁嗙被")
+ private String subclass;
+
+ @ValueTableShow(13)
+ @ApiModelProperty(value = "鍑哄巶缂栧彿")
+ private String factoryNo;
+
+ @ValueTableShow(14)
+ @ApiModelProperty(value = "璐疆鏃ユ湡")
+ @TableField(fill = FieldFill.INSERT)
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private String acquisitionDate;
+
+ @ValueTableShow(15)
+ @ApiModelProperty(value = "鍑嗙‘搴﹂噺鍊�")
+ private String accurateMeasurement;
+
+ @ValueTableShow(16)
+ @ApiModelProperty(value = "瑙勬牸鍨嬪彿")
+ private String specificationModel;
+
+ @ValueTableShow(17)
+ @ApiModelProperty(value = "璁惧鐘舵��")
+ private String deviceStatus;
+
+ @ValueTableShow(18)
+ @ApiModelProperty(value = "瀛樻斁鐐�")
+ private String storagePoint;
+
+ @ValueTableShow(19)
+ @ApiModelProperty(value = "鏈�杩戣拷婧棩鏈�")
+ @TableField(fill = FieldFill.INSERT)
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private LocalDateTime latestTraceability;
+
+ @ValueTableShow(20)
+ @ApiModelProperty(value = "鍋滅敤鏃堕棿")
+ @TableField(fill = FieldFill.INSERT_UPDATE)
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private LocalDateTime downTime;
+
+ @ValueTableShow(21)
+ @ApiModelProperty(value = "缁翠慨璁板綍")
+ private String maintenanceRecords;
+
+ @ValueTableShow(22)
+ @ApiModelProperty(value = "鐢熶骇鍘傚")
+ private String manufacturer;
+
+ @ValueTableShow(23)
+ @ApiModelProperty(value = "妫�娴嬬被鍨�")
+ private String detectionType;
+
+ @ValueTableShow(24)
+ @ApiModelProperty(value = "閲囪喘璐圭敤")
+ private String procurementCosts;
+
+ @ValueTableShow(25)
+ @ApiModelProperty(value = "鏍″噯璇佷功")
+ private String calibrationCerticate;
+
+ @ApiModelProperty(value = "鍒涘缓浜篿d")
+ @TableField(fill = FieldFill.INSERT)
+ private Integer createUser;
+
+ @ApiModelProperty(value = "鏇存柊鏃堕棿")
+ @TableField(fill = FieldFill.INSERT_UPDATE)
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private LocalDateTime updateTime;
+
+ @ApiModelProperty(value = "鍒涘缓鏃堕棿")
+ @TableField(fill = FieldFill.INSERT)
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private LocalDateTime createTime;
+}
diff --git a/cnas-server/src/main/java/com/yuanchu/mom/service/DeviceService.java b/cnas-server/src/main/java/com/yuanchu/mom/service/DeviceService.java
new file mode 100644
index 0000000..de8f127
--- /dev/null
+++ b/cnas-server/src/main/java/com/yuanchu/mom/service/DeviceService.java
@@ -0,0 +1,26 @@
+package com.yuanchu.mom.service;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.yuanchu.mom.pojo.Device;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 璁惧(Device)琛ㄦ湇鍔℃帴鍙�
+ */
+public interface DeviceService extends IService<Device> {
+
+ Map<String, Object> selectDeviceParameter(Page page, Device itemParameter);
+
+ int addDeviceParameter(Device itemParameter);
+
+ int delDeviceParameter(Integer id);
+
+ int upDeviceParameter(Device itemParameter);
+
+ List<Device> selectEquipmentOverview();
+
+}
+
diff --git a/cnas-server/src/main/java/com/yuanchu/mom/service/impl/DeviceServiceImpl.java b/cnas-server/src/main/java/com/yuanchu/mom/service/impl/DeviceServiceImpl.java
new file mode 100644
index 0000000..4715647
--- /dev/null
+++ b/cnas-server/src/main/java/com/yuanchu/mom/service/impl/DeviceServiceImpl.java
@@ -0,0 +1,60 @@
+package com.yuanchu.mom.service.impl;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.yuanchu.mom.common.GetLook;
+import com.yuanchu.mom.common.PrintChina;
+import com.yuanchu.mom.mapper.DeviceMapper;
+import com.yuanchu.mom.pojo.Device;
+import com.yuanchu.mom.service.DeviceService;
+import com.yuanchu.mom.utils.QueryWrappers;
+import lombok.AllArgsConstructor;
+import org.springframework.stereotype.Service;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 璁惧(Device)琛ㄦ湇鍔″疄鐜扮被
+ */
+@Service
+@AllArgsConstructor
+public class DeviceServiceImpl extends ServiceImpl<DeviceMapper, Device> implements DeviceService {
+
+ private GetLook getLook;
+
+ private DeviceMapper deviceMapper;
+
+ @Override
+ public Map<String, Object> selectDeviceParameter(Page page, Device itemParameter) {
+ Map<String, Object> map = new HashMap<>();
+ map.put("head", PrintChina.printChina(Device.class));
+ Map<String, Integer> map1 = getLook.selectPowerByMethodAndUserId("selectDeviceParameter");
+ if(map1.get("look")==1) itemParameter.setCreateUser(map1.get("userId"));
+ map.put("body", deviceMapper.selectDeviceParameter(page, QueryWrappers.queryWrappers(itemParameter)));
+ return map;
+ }
+
+ @Override
+ public int addDeviceParameter(Device itemParameter) {
+ return deviceMapper.insert(itemParameter);
+ }
+
+ @Override
+ public int delDeviceParameter(Integer id) {
+ return deviceMapper.deleteById(id);
+ }
+
+ @Override
+ public int upDeviceParameter(Device itemParameter) {
+ return deviceMapper.updateById(itemParameter);
+ }
+
+ @Override
+ public List<Device> selectEquipmentOverview() {
+ return deviceMapper.selectEquipmentOverview();
+ }
+
+}
+
diff --git a/cnas-server/src/main/resources/mapper/DeviceMapper.xml b/cnas-server/src/main/resources/mapper/DeviceMapper.xml
new file mode 100644
index 0000000..e15e4f1
--- /dev/null
+++ b/cnas-server/src/main/resources/mapper/DeviceMapper.xml
@@ -0,0 +1,59 @@
+<?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.yuanchu.mom.mapper.DeviceMapper">
+
+ <select id="selectDeviceParameter" resultType="com.yuanchu.mom.pojo.Device">
+ select * from(
+ select id,
+ large_category,
+ date_production,
+ equipment_manager,
+ authorized_person,
+ device_name,
+ internal_code,
+ asset_code,
+ calibration_date,
+ scrap_time,
+ acceptance_records,
+ subclass,
+ factory_no,
+ acquisition_date,
+ accurate_measurement,
+ specification_model,
+ device_status,
+ storage_point,
+ activation_date,
+ latest_traceability,
+ down_time,
+ maintenance_records,
+ manufacturer,
+ detection_type,
+ procurement_costs,
+ calibration_certicate,
+ create_user,
+ create_time,
+ update_user,
+ update_time
+ from device
+ ) a
+ <if test="ew.customSqlSegment != null and ew.customSqlSegment != ''">
+ ${ew.customSqlSegment}
+ </if>
+ </select>
+ <select id="selectEquipmentOverview" resultType="com.yuanchu.mom.pojo.Device">
+ select * from(
+ select id,
+ deviceName,
+ specificationModel,
+ deviceStatus,
+ create_user,
+ update_time
+ from device
+ ) a
+ <if test="ew.customSqlSegment != null and ew.customSqlSegment != ''">
+ ${ew.customSqlSegment}
+ </if>
+ </select>
+</mapper>
diff --git a/system-run/src/test/java/com/yuanchu/mom/SystemRunApplicationTest.java b/system-run/src/test/java/com/yuanchu/mom/SystemRunApplicationTest.java
index a125d72..1e7fcb4 100644
--- a/system-run/src/test/java/com/yuanchu/mom/SystemRunApplicationTest.java
+++ b/system-run/src/test/java/com/yuanchu/mom/SystemRunApplicationTest.java
@@ -1,6 +1,5 @@
package com.yuanchu.mom;
-import com.yuanchu.mom.utils.MyUtil;
import org.junit.jupiter.api.Test;
import org.springframework.boot.test.context.SpringBootTest;
@@ -8,7 +7,6 @@
class SystemRunApplicationTest {
@Test
- void contextLoads() {
-
+ void contextLoads() {
}
}
--
Gitblit v1.9.3