v3项目-修改0901

app-admin/src/main/java/com/ruoyi/web/v2/v1/controller/JsReportController.java

@@ -14,11 +14,14 @@ import com.ruoyi.web.v2.v1.service.IJsReportService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.core.Authentication;
+import org.springframework.security.core.context.SecurityContextHolder;
 import org.springframework.util.ObjectUtils;
 import org.springframework.web.bind.annotation.*;
 
 import java.util.Date;
 import java.util.List;
+import java.util.Optional;
 
 import static com.ruoyi.common.core.domain.AjaxResult.success;
 
@@ -106,6 +109,9 @@ public class JsReportController {
         //保存完工报告记录
         JsReport jsReport = new JsReport();
         jsReport.setCreateTime(new Date());
+        jsReport.setUserName(Optional.ofNullable(SecurityContextHolder.getContext().getAuthentication())
+                .map(Authentication::getName)
+                .orElse("system"));
         return success(reportService.save(jsReport));
     }
 }

app-admin/src/main/java/com/ruoyi/web/v3/controller/HbDeviceMaintenanceDictionaryController.java

@@ -0,0 +1,60 @@
+package com.ruoyi.web.v3.controller;
+
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.web.v3.entity.HbDeviceMaintenanceDictionaryEntity;
+import com.ruoyi.web.v3.model.request.HbDeviceMaintenanceDictionaryPageReq;
+import com.ruoyi.web.v3.service.IHbDeviceMaintenanceDictionaryService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+import java.util.Map;
+
+/**
+ * <p>
+ * v3.0 设备维护条目字典 前端控制器
+ * </p>
+ *
+ */
+@RestController
+@RequestMapping("/v3/hb_device_maintenance_dictionary")
+@Api("3.0 设备维护条目字典管理")
+public class HbDeviceMaintenanceDictionaryController {
+
+    @Resource
+    private IHbDeviceMaintenanceDictionaryService dictionaryService;
+
+    @ApiOperation(" 设备维护条目字典记录添加")
+    @PostMapping("/add")
+    public AjaxResult add(@RequestBody HbDeviceMaintenanceDictionaryEntity request){
+        return dictionaryService.add(request);
+    }
+
+    @ApiOperation(" 设备维护条目字典记录修改")
+    @PostMapping("/edit")
+    public AjaxResult edit(@RequestBody HbDeviceMaintenanceDictionaryEntity request){
+        return dictionaryService.edit(request);
+    }
+
+    @ApiOperation(" 设备维护条目字典记录删除")
+    @PostMapping("/delete")
+    public AjaxResult delete(@RequestBody Map<String, String> paramsMap) {
+        String ids = paramsMap.get("ids");
+        return dictionaryService.delete(ids);
+    }
+
+    @ApiOperation(" 设备维护条目字典记录分页查询")
+    @GetMapping("/page")
+    public AjaxResult page(@ModelAttribute HbDeviceMaintenanceDictionaryPageReq request) {
+        return dictionaryService.page(request);
+    }
+
+
+    @ApiOperation(" 设备维护条目字典记录列表全量查询")
+    @GetMapping("/list")
+    public AjaxResult listAll(){
+        return dictionaryService.listAll();
+    }
+
+}

app-admin/src/main/java/com/ruoyi/web/v3/entity/HbDeviceMaintenanceDictionaryEntity.java

@@ -0,0 +1,37 @@
+package com.ruoyi.web.v3.entity;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.ruoyi.common.core.domain.AbstractEntity;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+
+
+/**
+ * <p>
+ * v3.0 设备维护条目字典表
+ * </p>
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("hb_device_maintenance_dictionary")
+@ApiModel(value="HbDeviceMaintenanceDictionary", description="v3.0 设备维护条目字典表")
+public class HbDeviceMaintenanceDictionaryEntity extends AbstractEntity implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "设备名称")
+    private String deviceName;
+
+    @ApiModelProperty(value = "维护条目")
+    private String maintenanceItem;
+
+    @ApiModelProperty(value = "备注")
+    private String remarks;
+
+}

app-admin/src/main/java/com/ruoyi/web/v3/mapper/HbDeviceMaintenanceDictionaryMapper.java

@@ -0,0 +1,15 @@
+package com.ruoyi.web.v3.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.ruoyi.web.v3.entity.HbCheckAsfEntity;
+import com.ruoyi.web.v3.entity.HbDeviceMaintenanceDictionaryEntity;
+
+/**
+ * <p>
+ * v3.0 设备维护字典管理 Mapper 接口
+ * </p>
+ *
+ */
+public interface HbDeviceMaintenanceDictionaryMapper extends BaseMapper<HbDeviceMaintenanceDictionaryEntity> {
+
+}

app-admin/src/main/java/com/ruoyi/web/v3/model/request/HbDeviceMaintenanceDictionaryPageReq.java

@@ -0,0 +1,31 @@
+package com.ruoyi.web.v3.model.request;
+
+import com.ruoyi.web.v3.model.BasePageRequest;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+
+
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@ApiModel(value="HbDeviceMaintenanceDictionaryPageReq", description="v3.0 设备维护条目字典管理")
+public class HbDeviceMaintenanceDictionaryPageReq extends BasePageRequest implements Serializable {
+
+    @ApiModelProperty(value = "数据唯一性标识id")
+    private String id;
+
+    @ApiModelProperty(value = "设备名称")
+    private String deviceName;
+
+    @ApiModelProperty(value = "维护条目")
+    private String maintenanceItem;
+
+    @ApiModelProperty(value = "备注")
+    private String remarks;
+
+}

app-admin/src/main/java/com/ruoyi/web/v3/service/IHbDeviceMaintenanceDictionaryService.java

@@ -0,0 +1,25 @@
+package com.ruoyi.web.v3.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.web.v3.entity.HbDeviceMaintenanceDictionaryEntity;
+import com.ruoyi.web.v3.model.request.HbDeviceMaintenanceDictionaryPageReq;
+
+/**
+ * <p>
+ * v3.0 设备维护条目字典管理 服务类
+ * </p>
+ */
+public interface IHbDeviceMaintenanceDictionaryService extends IService<HbDeviceMaintenanceDictionaryEntity> {
+
+    AjaxResult add(HbDeviceMaintenanceDictionaryEntity request);
+
+    AjaxResult edit(HbDeviceMaintenanceDictionaryEntity request);
+
+    AjaxResult delete(String ids);
+
+    AjaxResult page(HbDeviceMaintenanceDictionaryPageReq request);
+
+    AjaxResult listAll();
+
+}

app-admin/src/main/java/com/ruoyi/web/v3/service/impl/HbDeviceMaintenanceDictionaryServiceImpl.java

@@ -0,0 +1,74 @@
+package com.ruoyi.web.v3.service.impl;
+
+import cn.hutool.core.bean.BeanUtil;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.web.v3.entity.HbDeviceMaintenanceDictionaryEntity;
+import com.ruoyi.web.v3.mapper.HbDeviceMaintenanceDictionaryMapper;
+import com.ruoyi.web.v3.model.request.HbDeviceMaintenanceDictionaryPageReq;
+import com.ruoyi.web.v3.service.IHbDeviceMaintenanceDictionaryService;
+import com.ruoyi.web.v3.utils.QueryWrapperBuildUtil;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.util.ObjectUtils;
+
+import java.util.Arrays;
+
+import static com.ruoyi.common.core.domain.AjaxResult.error;
+import static com.ruoyi.common.core.domain.AjaxResult.success;
+
+/**
+ * <p>
+ * v3.0 设备维护条目字典管理 服务实现类
+ * </p>
+ *
+ */
+@Service
+public class HbDeviceMaintenanceDictionaryServiceImpl extends ServiceImpl<HbDeviceMaintenanceDictionaryMapper, HbDeviceMaintenanceDictionaryEntity> implements IHbDeviceMaintenanceDictionaryService {
+
+    @Transactional
+    @Override
+    public AjaxResult add(HbDeviceMaintenanceDictionaryEntity request) {
+        //入参检测
+        if(ObjectUtils.isEmpty(request.getDeviceName())) {
+            return error("请输入【设备名称】！");
+        }
+        if(ObjectUtils.isEmpty(request.getMaintenanceItem())) {
+            return error("请输入【维护条目】！");
+        }
+        return success("添加成功", baseMapper.insert(request));
+    }
+
+    @Transactional
+    @Override
+    public AjaxResult edit(HbDeviceMaintenanceDictionaryEntity request) {
+        //数据格式校验
+        if(ObjectUtils.isEmpty(request.getId())){
+            return error("待更新数据未传入有效ID，请设置数据的唯一标识ID！");
+        }
+        //根据数据的id更新所有不为空的字段
+        return updateById(request) ? success("修改成功！") : error("修改失败，请重试！");
+    }
+
+    @Transactional
+    @Override
+    public AjaxResult delete(String ids) {
+        String[] idList = ids.split(",");
+        return success("删除成功", removeByIds(Arrays.asList(idList)));
+    }
+
+    @Override
+    public AjaxResult page(HbDeviceMaintenanceDictionaryPageReq request) {
+        //将请求报文转为实体类
+        HbDeviceMaintenanceDictionaryEntity entity = BeanUtil.toBean(request, HbDeviceMaintenanceDictionaryEntity.class);
+        //构造查询条件（检索条件未定时，先按不为空的字段进行等值查询）
+        QueryWrapper<HbDeviceMaintenanceDictionaryEntity> wrapper = QueryWrapperBuildUtil.notNoneEqWrapperHelper(entity);
+        return success(baseMapper.selectPage(request.toPage(), wrapper));
+    }
+
+    @Override
+    public AjaxResult listAll() {
+        return success(lambdaQuery().list());
+    }
+}

sql/v3_biz_20250814.sql

@@ -537,4 +537,30 @@ insert into `hb_risk_strategy_dictionary` (risk_position, risk, strategy, remark
 
 
 -- 分圈登记 增加一个状态字段status(opened-表示该批次的圈养猪存栏数未闭环，closed-表示存栏量已闭环)
-ALTER TABLE `js_divide_circle` ADD COLUMN status_flag VARCHAR(20) COMMENT '是否闭环标记：opened-表示该批次的圈养猪存栏数未闭环，closed-表示存栏量已闭环';
+ALTER TABLE `js_divide_circle` ADD COLUMN status_flag VARCHAR(20) COMMENT '是否闭环标记：opened-表示该批次的圈养猪存栏数未闭环，closed-表示存栏量已闭环';
+
+-- 新增 设备维护条目字典表
+CREATE TABLE `hb_device_maintenance_dictionary` (
+                                        `id` BIGINT NOT NULL AUTO_INCREMENT COMMENT '主键ID',
+                                        `device_name` VARCHAR ( 90 ) DEFAULT NULL COMMENT '设备名称',
+                                        `maintenance_item` VARCHAR ( 255 ) DEFAULT NULL COMMENT '维护条目',
+                                        `remarks` VARCHAR ( 255 ) DEFAULT NULL COMMENT '备注',
+                                        `is_deleted` TINYINT ( 1 ) DEFAULT 0 COMMENT '是否删除标志，0否1是',
+                                        `create_by` VARCHAR ( 255 ) DEFAULT NULL COMMENT '创建者',
+                                        `create_time` DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
+                                        `update_by` VARCHAR ( 255 ) DEFAULT NULL COMMENT '更新者',
+                                        `update_time` DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '更新时间',
+	                                    PRIMARY KEY ( `id` )
+) ENGINE = INNODB DEFAULT CHARSET = utf8mb4 COLLATE = utf8mb4_unicode_ci COMMENT = '设备维护条目字典表';
+
+INSERT INTO `hb_device_maintenance_dictionary` (id, device_name, maintenance_item, remarks, is_deleted, create_by, create_time, update_by, update_time) VALUES (NULL, '击晕机','检查轴承、链条',null, 0, 'admin', CURRENT_TIMESTAMP, NULL, CURRENT_TIMESTAMP);
+INSERT INTO `hb_device_maintenance_dictionary` (id, device_name, maintenance_item, remarks, is_deleted, create_by, create_time, update_by, update_time) VALUES (NULL, '击晕机','调查链条张紧度',null, 0, 'admin', CURRENT_TIMESTAMP, NULL, CURRENT_TIMESTAMP);
+INSERT INTO `hb_device_maintenance_dictionary` (id, device_name, maintenance_item, remarks, is_deleted, create_by, create_time, update_by, update_time) VALUES (NULL, '击晕机','链条加油',null, 0, 'admin', CURRENT_TIMESTAMP, NULL, CURRENT_TIMESTAMP);
+INSERT INTO `hb_device_maintenance_dictionary` (id, device_name, maintenance_item, remarks, is_deleted, create_by, create_time, update_by, update_time) VALUES (NULL, '生产线链条','检查链条、轮子、钩子',null, 0, 'admin', CURRENT_TIMESTAMP, NULL, CURRENT_TIMESTAMP);
+INSERT INTO `hb_device_maintenance_dictionary` (id, device_name, maintenance_item, remarks, is_deleted, create_by, create_time, update_by, update_time) VALUES (NULL, '生产线链条','调查链条张紧度',null, 0, 'admin', CURRENT_TIMESTAMP, NULL, CURRENT_TIMESTAMP);
+INSERT INTO `hb_device_maintenance_dictionary` (id, device_name, maintenance_item, remarks, is_deleted, create_by, create_time, update_by, update_time) VALUES (NULL, '生产线链条','保养润滑气缸',null, 0, 'admin', CURRENT_TIMESTAMP, NULL, CURRENT_TIMESTAMP);
+INSERT INTO `hb_device_maintenance_dictionary` (id, device_name, maintenance_item, remarks, is_deleted, create_by, create_time, update_by, update_time) VALUES (NULL, '刨毛机','检查刨毛片',null, 0, 'admin', CURRENT_TIMESTAMP, NULL, CURRENT_TIMESTAMP);
+INSERT INTO `hb_device_maintenance_dictionary` (id, device_name, maintenance_item, remarks, is_deleted, create_by, create_time, update_by, update_time) VALUES (NULL, '刨毛机','保养润滑气缸',null, 0, 'admin', CURRENT_TIMESTAMP, NULL, CURRENT_TIMESTAMP);
+INSERT INTO `hb_device_maintenance_dictionary` (id, device_name, maintenance_item, remarks, is_deleted, create_by, create_time, update_by, update_time) VALUES (NULL, '刨毛机','保养轴承',null, 0, 'admin', CURRENT_TIMESTAMP, NULL, CURRENT_TIMESTAMP);
+INSERT INTO `hb_device_maintenance_dictionary` (id, device_name, maintenance_item, remarks, is_deleted, create_by, create_time, update_by, update_time) VALUES (NULL, '劈半锯','检查限位导向器、启动开关、轴承',null, 0, 'admin', CURRENT_TIMESTAMP, NULL, CURRENT_TIMESTAMP);
+INSERT INTO `hb_device_maintenance_dictionary` (id, device_name, maintenance_item, remarks, is_deleted, create_by, create_time, update_by, update_time) VALUES (NULL, '劈半锯','检查锯片',null, 0, 'admin', CURRENT_TIMESTAMP, NULL, CURRENT_TIMESTAMP);