2024-4-25 资源要求-设备管理后端调整

Crunchy

2024-04-25 1ebe2726a5f8fe55f01481b37d1ac1f75a088520

2024-4-25 资源要求-设备管理后端调整

 cnas-server/src/main/java/com/yuanchu/mom/controller/CapacityScopeController.java

@@ -29,7 +29,7 @@

    private CapacityScopeService capacityScopeService;

    @ApiOperation(value = "获取项目检验参数列表")
    @ApiOperation(value = "能力范围-获取项目检验参数列表")
    @PostMapping("/selectItemParameterList")
    public Result selectItemParameterList(@RequestBody Map<String, Object> data) throws Exception {
        Page page = JackSonUtil.unmarshal(JackSonUtil.marshal(data.get("page")), Page.class);
@@ -37,25 +37,25 @@
        return Result.success(capacityScopeService.selectItemParameterList(page, itemParameter));
    }

    @ApiOperation(value = "添加项目检验参数")
    @ApiOperation(value = "能力范围-添加项目检验参数")
    @PostMapping("/addItemParameter")
    public Result addItemParameter(@RequestBody StructureItemParameter itemParameter) {
        return Result.success(capacityScopeService.addItemParameter(itemParameter));
    }

    @ApiOperation(value = "删除项目检验参数")
    @ApiOperation(value = "能力范围-删除项目检验参数")
    @PostMapping("/delItemParameter")
    public Result<?> delItemParameter(Integer id) {
        return Result.success(capacityScopeService.delItemParameter(id));
    }

    @ApiOperation(value = "修改项目检验参数")
    @ApiOperation(value = "能力范围-修改项目检验参数")
    @PostMapping("/upItemParameter")
    public Result<?> upItemParameter(@RequestBody StructureItemParameter itemParameter) {
        return Result.success(capacityScopeService.upItemParameter(itemParameter));
    }

    @ApiOperation(value = "获取检验对象")
    @ApiOperation(value = "能力范围-获取检验对象")
    @PostMapping("/selectTestObjectList")
    public Result selectTestObjectList(@RequestBody Map<String, Object> data) throws Exception {
        Page page = JackSonUtil.unmarshal(JackSonUtil.marshal(data.get("page")), Page.class);
@@ -63,32 +63,32 @@
        return Result.success(capacityScopeService.selectTestObjectList(page, pageTestObjectDto));
    }

    @ApiOperation(value = "添加检验对象")
    @ApiOperation(value = "能力范围-添加检验对象")
    @PostMapping("/addTestObject")
    public Result addTestObject(@RequestBody StructureTestObject testObject) {
        return Result.success(capacityScopeService.addTestObject(testObject));
    }

    @ApiOperation(value = "删除检验对象")
    @ApiOperation(value = "能力范围-删除检验对象")
    @PostMapping("/delTestObject")
    public Result<?> delTestObject(Integer id) {
        return Result.success(capacityScopeService.delTestObject(id));
    }

    @ApiOperation(value = "修改检验对象")
    @ApiOperation(value = "能力范围-修改检验对象")
    @PostMapping("/upTestObject")
    public Result upTestObject(@RequestBody StructureTestObject testObject) {
        return Result.success(capacityScopeService.upTestObject(testObject));
    }

    @ApiOperation(value = "获取检验对象枚举")
    @ApiOperation(value = "能力范围-获取检验对象枚举")
    @GetMapping("/selectTestObjectByName")
    @ValueAuth
    public Result selectTestObjectByName() {
        return Result.success(capacityScopeService.selectTestObjectByName());
    }

    @ApiOperation(value = "设备里面选择检验项目(树形结构)")
    @ApiOperation(value = "能力范围-设备里面选择检验项目(树形结构)")
    @PostMapping("/getInsProduction")
    public Result getInsProduction(){
        return Result.success(capacityScopeService.getInsProduction());

 cnas-server/src/main/java/com/yuanchu/mom/controller/CertificationController.java

@@ -26,7 +26,7 @@

    private CertificationService certificationService;

    @ApiOperation(value = "查询资质明细列表")
    @ApiOperation(value = "资质说明-查询资质明细列表")
    @PostMapping("/getCertificationDetail")
    @ValueAuth
    public Result getCertificationDetail(@RequestBody Map<String, Object> data) throws Exception {
@@ -35,13 +35,13 @@
        return Result.success(certificationService.getCertificationDetail(page, certification));
    }

    @ApiOperation(value = "添加资质明细列表")
    @ApiOperation(value = "资质说明-添加资质明细列表")
    @PostMapping("/addCertificationDetail")
    public Result addCertificationDetail(@RequestBody Certification certification) {
        return Result.success(certificationService.addCertificationDetail(certification));
    }

    @ApiOperation(value = "删除资质明细列表")
    @ApiOperation(value = "资质说明-删除资质明细列表")
    @PostMapping("/delCertificationDetail")
    public Result<?> delCertificationDetail( String ids) {
        return Result.success(certificationService.delCertificationDetail(ids));

 cnas-server/src/main/java/com/yuanchu/mom/controller/DepartmentController.java

@@ -32,25 +32,25 @@

    DepartmentService departmentService;

    @ApiOperation(value = "添加部门")
    @ApiOperation(value = "人员明细-添加部门")
    @PostMapping("/addDepartment")
    public Result addDepartment(@RequestBody Department department) {
        return Result.success(departmentService.addDepartment(department));
    }

    @ApiOperation(value = "获取部门树")
    @ApiOperation(value = "人员明细-获取部门树")
    @GetMapping("/selectDepartment")
    public Result selectDepartment() {
        return Result.success(departmentService.selectDepartment());
    }

    @ApiOperation(value = "删除部门")
    @ApiOperation(value = "人员明细-删除部门")
    @PostMapping("/delDepartment")
    public Result delDepartment(Integer id) {
        return Result.success(departmentService.delDepartment(id));
    }

    @ApiOperation(value = "根据选择的树展示相关的人员")
    @ApiOperation(value = "人员明细-根据选择的树展示相关的人员")
    @PostMapping("/showUserById")
    public Result showUserById(@RequestBody Map<String, Object> data) throws Exception {
        Page page = JackSonUtil.unmarshal(JackSonUtil.marshal(data.get("page")), Page.class);

 cnas-server/src/main/java/com/yuanchu/mom/controller/DeviceController.java

@@ -4,6 +4,7 @@
import cn.hutool.core.lang.UUID;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.yuanchu.mom.annotation.ValueAuth;
import com.yuanchu.mom.dto.DeviceDto;
import com.yuanchu.mom.pojo.Device;
import com.yuanchu.mom.service.DeviceService;
import com.yuanchu.mom.utils.JackSonUtil;
@@ -40,7 +41,7 @@
    @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);
        DeviceDto itemParameter = JackSonUtil.unmarshal(JackSonUtil.marshal(data.get("entity")), DeviceDto.class);
        return Result.success(deviceService.selectDeviceParameter(page, itemParameter));
    }


 cnas-server/src/main/java/com/yuanchu/mom/dto/DeviceDto.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,26 @@
package com.yuanchu.mom.dto;

import com.yuanchu.mom.annotation.ValueTableShow;
import com.yuanchu.mom.pojo.Device;
import io.swagger.annotations.ApiModelProperty;
import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.NoArgsConstructor;

@Data
@AllArgsConstructor
@NoArgsConstructor
public class DeviceDto extends Device {

    @ValueTableShow(10)
    @ApiModelProperty(value = "管理人")
    private String equipmentManagerUser;

    @ValueTableShow(value = 12, name = "所属部门")
    @ApiModelProperty(value = "所属部门")
    private String laboratoryName;

    @ValueTableShow(13)
    @ApiModelProperty(value = "检验项目")
    private Integer insProductItem;
}

 cnas-server/src/main/java/com/yuanchu/mom/mapper/DepartmentMapper.java

@@ -2,12 +2,10 @@

import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.yuanchu.mom.dto.DepartmentDto;
import com.yuanchu.mom.dto.UserDto;
import com.yuanchu.mom.pojo.Department;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.yuanchu.mom.pojo.User;
import org.apache.ibatis.annotations.Param;

import java.util.List;

 cnas-server/src/main/java/com/yuanchu/mom/mapper/DeviceMapper.java

@@ -4,8 +4,9 @@
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.dto.DeviceDto;
import com.yuanchu.mom.pojo.Device;
import org.springframework.data.repository.query.Param;
import org.apache.ibatis.annotations.Param;

import java.util.List;

@@ -16,9 +17,6 @@

    IPage<Device> selectDeviceParameter(Page page, QueryWrapper<Device> ew);
    List<Device> selectEquipmentOverview(Page page, QueryWrapper<Device> ew);

    //更新
    int upDeviceParameter(Device itemParameter);

    //获取被授权人
    List<Device> authorizedPerson();
@@ -33,5 +31,6 @@
    //查询设备负责人
    List<Device> selectDevicePrincipal();

    IPage<DeviceDto> selectDeviceParameterPage(Page page, @Param("ew") QueryWrapper<DeviceDto> queryWrappers);
}


 cnas-server/src/main/java/com/yuanchu/mom/pojo/Device.java

@@ -8,6 +8,7 @@
import lombok.Data;

import java.io.Serializable;
import java.math.BigDecimal;
import java.time.LocalDate;
import java.time.LocalDateTime;

@@ -21,113 +22,83 @@
    @TableId(type = IdType.AUTO)
    private Integer id;

    //@ValueTableShow(2)
    @ApiModelProperty(value = "大类")
    private String largeCategory;

    @ValueTableShow(13)
    @ApiModelProperty(value = "出厂日期")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    private String dateProduction;

    @ValueTableShow(4)
    @ApiModelProperty(value = "设备负责人")
    private Integer equipmentManager;

    @ValueTableShow(5)
    @ApiModelProperty(value = "被授权人")
    private String authorizedPerson;

    @ValueTableShow(1)
    @ApiModelProperty(value = "设备名称")
    private String deviceName;

    @ValueTableShow(7)
    @ApiModelProperty(value = "内部编码")
    private String internalCode;
    @ValueTableShow(value = 2, name = "en设备名称")
    @ApiModelProperty(value = "en设备名称")
    private String enDeviceName;

    @ValueTableShow(8)
    @ApiModelProperty(value = "资产编码")
    private String assetCode;
    @ValueTableShow(3)
    @ApiModelProperty(value = "规格型号")
    private String specificationModel;

    @ValueTableShow(9)
    @ApiModelProperty(value = "校准日期（月）")
    private String calibrationDate;
    @ValueTableShow(4)
    @ApiModelProperty(value = "生产厂家")
    private String manufacturer;

    @ValueTableShow(10)
    @ApiModelProperty(value = "报废日期")
    @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 = "设备编码")
    @ValueTableShow(5)
    @ApiModelProperty(value = "出厂编号")
    private String factoryNo;

    @ValueTableShow(14)
    @ValueTableShow(value = 6, name = "管理编号")
    @ApiModelProperty(value = "管理编号")
    private String managementNumber;

    @ValueTableShow(value = 7, name = "技术指标")
    @ApiModelProperty(value = "技术指标")
    private String technicalIndicators;

    @ValueTableShow(8)
    @ApiModelProperty(value = "购置日期")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    private String acquisitionDate;

    @ValueTableShow(15)
    @ApiModelProperty(value = "准确度量值")
    private String accurateMeasurement;
    @ValueTableShow(value = 9, name = "启用日期")
    @ApiModelProperty(value = "启用日期")
    private LocalDateTime activationDate;

    @ValueTableShow(16)
    @ApiModelProperty(value = "备注")
    private String notes;
    @ApiModelProperty(value = "管理人Id")
    private Integer equipmentManager;

    @ValueTableShow(17)
    @ApiModelProperty(value = "规格型号")
    private String specificationModel;

    @ValueTableShow(6)
    @ApiModelProperty(value = "设备状态")
    private Integer deviceStatus;

    @ValueTableShow(19)
    @ValueTableShow(11)
    @ApiModelProperty(value = "存放点")
    private String storagePoint;

    @ApiModelProperty(value = "所属部门Id")
    private Integer subordinateDepartmentsId;

    @ApiModelProperty(value = "检验项目Id")
    private String insProductIds;

    @ValueTableShow(value = 14, name = "校准服务机构")
    @ApiModelProperty(value = "校准服务机构")
    private String calibrationServices;

    @ValueTableShow(value = 15, name = "最近校准日期")
    @ApiModelProperty(value = "最近校准日期")
    private LocalDateTime lastCalibrationDate;

    @ValueTableShow(value = 16, name = "下次校准日期")
    @ApiModelProperty(value = "下次校准日期")
    private LocalDateTime nextCalibrationDate;

    @ValueTableShow(value = 17, name = "设备分类")
    @ApiModelProperty(value = "设备类型")
    private String largeCategory;

    @ValueTableShow(value = 18, name = "单价")
    @ApiModelProperty(value = "单价")
    private BigDecimal unitPrice;

    @ValueTableShow(19)
    @ApiModelProperty(value = "设备状态")
    private Integer deviceStatus;

    @ValueTableShow(20)
    @ApiModelProperty(value = "最近追溯日期")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    private LocalDateTime latestTraceability;

    @ValueTableShow(21)
    @ApiModelProperty(value = "停用时间")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    private LocalDateTime downTime;

    @ValueTableShow(22)
    @ApiModelProperty(value = "维修记录")
    private String maintenanceRecords;

    @ValueTableShow(23)
    @ApiModelProperty(value = "生产厂家")
    private String manufacturer;

    @ValueTableShow(24)
    @ApiModelProperty(value = "检测类型")
    private String detectionType;

    @ValueTableShow(25)
    @ApiModelProperty(value = "采购费用")
    private String procurementCosts;

    @ValueTableShow(26)
    @ApiModelProperty(value = "校准证书")
    private String calibrationCerticate;

    @ApiModelProperty(value = "状态")
    private Integer status;
    @ApiModelProperty(value = "校准周期（月）")
    private String calibrationDate;

    @ApiModelProperty(value = "图片上传")
    private String imageUpload;
@@ -148,9 +119,4 @@
    @TableField(fill = FieldFill.INSERT)
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    private LocalDateTime createTime;

    @ValueTableShow(12)
    @ApiModelProperty(value = "检验项目")
    private String insProductIds;

}

 cnas-server/src/main/java/com/yuanchu/mom/service/DeviceService.java

@@ -2,6 +2,7 @@

import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.IService;
import com.yuanchu.mom.dto.DeviceDto;
import com.yuanchu.mom.pojo.Device;

import java.util.List;
@@ -12,7 +13,7 @@
 */
public interface DeviceService extends IService<Device> {

    Map<String, Object> selectDeviceParameter(Page page, Device itemParameter);
    Map<String, Object> selectDeviceParameter(Page page, DeviceDto itemParameter);

    int addDeviceParameter(Device itemParameter);


 cnas-server/src/main/java/com/yuanchu/mom/service/impl/DeviceServiceImpl.java

@@ -1,10 +1,12 @@
package com.yuanchu.mom.service.impl;

import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
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.dto.DeviceDto;
import com.yuanchu.mom.mapper.DeviceMapper;
import com.yuanchu.mom.pojo.Device;
import com.yuanchu.mom.service.DeviceService;
@@ -28,12 +30,13 @@
    private DeviceMapper deviceMapper;

    @Override
    public Map<String, Object> selectDeviceParameter(Page page, Device itemParameter) {
    public Map<String, Object> selectDeviceParameter(Page page, DeviceDto itemParameter) {
        Map<String, Object> map = new HashMap<>();
        map.put("head", PrintChina.printChina(Device.class));
        map.put("head", PrintChina.printChina(DeviceDto.class));
        Map<String, Integer> map1 = getLook.selectPowerByMethodAndUserId("selectDeviceParameter");
        if (map1.get("look") == 1) itemParameter.setCreateUser(map1.get("userId"));
        map.put("body", deviceMapper.selectPage(page, QueryWrappers.queryWrappers(itemParameter)));
        IPage<DeviceDto> iPage = deviceMapper.selectDeviceParameterPage(page, QueryWrappers.queryWrappers(itemParameter));
        map.put("body", iPage);
        return map;
    }


 cnas-server/src/main/java/com/yuanchu/mom/service/impl/LaboratoryServiceImpl.java

@@ -54,7 +54,7 @@

    @Override
    public List<Laboratory> obtainItemParameterList() {
        return laboratoryMapper.selectList(Wrappers.<Laboratory>lambdaQuery().select(Laboratory::getLaboratoryName));
        return laboratoryMapper.selectList(Wrappers.<Laboratory>lambdaQuery().select(Laboratory::getLaboratoryName, Laboratory::getId));
    }



 cnas-server/src/main/resources/mapper/DeviceMapper.xml

@@ -79,44 +79,6 @@
        </where>
    </select>

    <update id="upDeviceParameter" parameterType="com.yuanchu.mom.pojo.Device">
        UPDATE device
        <set>
            <if test="largeCategory!=null and largeCategory!='' ">large_category=#{largeCategory},</if>
            <if test="dateProduction!=null  ">date_production=#{dateProduction},</if>
            <if test="equipmentManager!=null  ">equipment_manager=#{equipmentManager},</if>
            <if test="authorizedPerson!=null  ">authorized_person=#{authorizedPerson}</if>
            <if test="deviceName!=null  ">device_name=#{deviceName}</if>
            <if test="internalCode!=null  ">internal_code=#{internalCode}</if>
            <if test="assetCode!=null  ">asset_code=#{assetCode}</if>
            <if test="calibrationDate!=null  ">calibration_date=#{calibrationDate}</if>
            <if test="scrapTime!=null  ">scrap_time=#{scrapTime}</if>
            <if test="acceptanceRecords!=null  ">acceptance_records=#{acceptanceRecords}</if>
            <if test="subclass!=null  ">subclass=#{subclass}</if>
            <if test="factoryNo!=null  ">factory_no=#{factoryNo}</if>
            <if test="acquisitionDate!=null  ">create_time=#{acquisition_date}</if>
            <if test="factoryNo!=null  ">create_time=#{factory_no}</if>
            <if test="acquisitionDate!=null  ">acquisition_date=#{acquisitionDate}</if>
            <if test="accurateMeasurement!=null  ">accurate_measurement=#{accurateMeasurement}</if>
            <if test="notes!=null  ">notes=#{notes}</if>
            <if test="specificationModel!=null  ">specification_model=#{specificationModel}</if>
            <if test="deviceStatus!=null  ">device_status=#{deviceStatus}</if>
            <if test="storagePoint!=null  ">storage_point=#{storagePoint}</if>
            <if test="latestTraceability!=null  ">latest_traceability=#{latestTraceability}</if>
            <if test="downTime!=null  ">down_time=#{downTime}</if>
            <if test="maintenanceRecords!=null  ">maintenance_records=#{maintenanceRecords}</if>
            <if test="manufacturer!=null  ">manufacturer=#{manufacturer}</if>
            <if test="detectionType!=null  ">detection_type=#{detectionType}</if>
            <if test="procurementCosts!=null  ">procurement_costs=#{procurementCosts}</if>
            <if test="calibrationCerticate!=null  ">calibration_certicate=#{calibrationCerticate}</if>
            <if test="status!=null  ">status=#{status}</if>
            <if test="imageUpload!=null  ">image_upload=#{imageUpload}</if>
            <if test="imageName!=null  ">image_name=#{imageName}</if>
        </set>
        <where>
            id=#{id}
        </where>
    </update>
    <select id="selectDeviceImage" resultType="com.yuanchu.mom.pojo.Device">
        select (image_upload, create_user, create_time) values (#{image_upload}
             , #{createUser}
@@ -127,4 +89,19 @@
               equipment_manager
        from device
    </select>

    <select id="selectDeviceParameterPage" resultType="com.yuanchu.mom.dto.DeviceDto">
        select * from(
        SELECT
        d.*, u.name equipmentManagerUser, l.laboratory_name laboratoryName, i.inspection_item insProductItem
        FROM
        device d
        left join `user` u on u.id = d.equipment_manager
        left join laboratory l on l.id = d.subordinate_departments_id
        left join ins_product i on i.id = d.ins_product_ids
        ) a
        <if test="ew.customSqlSegment != null and ew.customSqlSegment != ''">
            ${ew.customSqlSegment}
        </if>
    </select>
</mapper>

 framework/src/main/java/com/yuanchu/mom/controller/InformationNotificationController.java

@@ -31,40 +31,40 @@
    @Autowired
    private InformationNotificationService informationNotificationService;

    @ApiOperation(value = "滚动分页查询")
    @ApiOperation(value = "消息通知-滚动分页查询")
    @GetMapping("page")
    public Result<?> getPage(Long size, Long current, String messageType) {
        return Result.success(informationNotificationService.getPage(new Page<>(current, size), messageType));
    }

    @ApiOperation(value = "更新消息状态（拒绝、接收）")
    @ApiOperation(value = "消息通知-更新消息状态（拒绝、接收）")
    @PutMapping("updateMessageStatus")
    public Result<?> updateMessageStatus(@RequestBody InformationNotification informationNotification) {
        informationNotificationService.updateById(informationNotification);
        return Result.success();
    }

    @ApiOperation(value = "标记所有信息为已读/删除所有已读消息")
    @ApiOperation(value = "消息通知-标记所有信息为已读/删除所有已读消息")
    @PutMapping("informationReadOrDelete/{isMarkAllInformationRead}")
    public Result<?> markAllInformationReadOrDeleteAllReadMessages(@PathVariable("isMarkAllInformationRead") Boolean isMarkAllInformationRead) {
        informationNotificationService.markAllInformationReadOrDeleteAllReadMessages(isMarkAllInformationRead);
        return Result.success();
    }

    @ApiOperation(value = "根据Id删除数据")
    @ApiOperation(value = "消息通知-删除数据")
    @DeleteMapping("deleteDataBasedOnId")
    public Result<?> deleteDataBasedOnId(Integer id) {
        informationNotificationService.removeById(id);
        return Result.success();
    }

    @ApiOperation(value = "查询是否存在未读数据")
    @ApiOperation(value = "消息通知-查询是否存在未读数据")
    @GetMapping("checkForUnreadData")
    public Result<?> checkForUnreadData() {
        return Result.success(informationNotificationService.checkForUnreadData());
    }

    @ApiOperation(value = "点击详情触发修改状态为已读")
    @ApiOperation(value = "消息通知-点击详情触发修改状态为已读")
    @PutMapping("triggerModificationStatusToRead/{id}")
    public Result<?> triggerModificationStatusToRead(@PathVariable("id") Integer id) {
        informationNotificationService.triggerModificationStatusToRead(id);