From b621dfd1e0fd8cbb5c92520e7698a4c53278c135 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9B=B9=E7=A3=8A?= <45566618@qq.com> Date: Thu, 4 Sep 2025 14:50:35 +0800 Subject: [PATCH] =?UTF-8?q?=E8=BF=90=E7=BB=B4=E6=97=A5=E5=BF=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/HeatanalysisController.java | 12 +++ .../HeatanalysisRemarksController.java | 99 +++++++++++++++++++ .../modules/heating/entity/Heatanalysis.java | 1 + .../heating/entity/HeatanalysisReamrks.java | 51 ++++++++++ .../heating/mapper/HeatanalysisMapper.java | 1 + .../mapper/HeatanalysisReamrksMapper.java | 10 ++ .../heating/mapper/xml/HeatanalysisMapper.xml | 18 +++- .../mapper/xml/HeatanalysisReamrksMapper.xml | 26 +++++ .../mapper/xml/ThermalcompanyMapper.xml | 4 +- .../service/HeatanalysisReamrksService.java | 10 ++ .../heating/service/HeatanalysisService.java | 1 + .../impl/HeatanalysisReamrksServiceImpl.java | 17 ++++ .../service/impl/HeatanalysisServiceImpl.java | 4 + 13 files changed, 251 insertions(+), 3 deletions(-) create mode 100644 jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/heating/controller/HeatanalysisRemarksController.java create mode 100644 jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/heating/entity/HeatanalysisReamrks.java create mode 100644 jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/heating/mapper/HeatanalysisReamrksMapper.java create mode 100644 jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/heating/mapper/xml/HeatanalysisReamrksMapper.xml create mode 100644 jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/heating/service/HeatanalysisReamrksService.java create mode 100644 jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/heating/service/impl/HeatanalysisReamrksServiceImpl.java diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/heating/controller/HeatanalysisController.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/heating/controller/HeatanalysisController.java index 93c2a9b..6087de5 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/heating/controller/HeatanalysisController.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/heating/controller/HeatanalysisController.java @@ -59,6 +59,18 @@ public class HeatanalysisController extends JeecgController updateFaultLevel(@RequestBody Heatanalysis heatanalysis){ + heatanalysisService.updateFaultLevel(heatanalysis); + return Result.OK("修改故障等级!"); + } + /** * 列表查询 * diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/heating/controller/HeatanalysisRemarksController.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/heating/controller/HeatanalysisRemarksController.java new file mode 100644 index 0000000..969726d --- /dev/null +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/heating/controller/HeatanalysisRemarksController.java @@ -0,0 +1,99 @@ +package org.jeecg.modules.heating.controller; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import lombok.extern.slf4j.Slf4j; +import org.apache.shiro.authz.annotation.RequiresPermissions; +import org.jeecg.common.api.vo.Result; +import org.jeecg.common.system.base.controller.JeecgController; +import org.jeecg.common.system.query.QueryGenerator; +import org.jeecg.common.system.query.QueryRuleEnum; +import org.jeecg.modules.heating.entity.HeatanalysisReamrks; +import org.jeecg.modules.heating.service.HeatanalysisReamrksService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; +import org.springframework.web.servlet.ModelAndView; + +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import java.util.*; + +@Slf4j +@RestController +@RequestMapping("/heating/heatanalysisRemarks") +public class HeatanalysisRemarksController extends JeecgController { + + @Autowired + private HeatanalysisReamrksService service; + + /** + * 分页列表查询 + * + * @param HeatanalysisReamrks + * @param pageNo + * @param pageSize + * @param req + * @return + */ + @GetMapping(value = "/page") + public Result> queryPageList(HeatanalysisReamrks HeatanalysisReamrks, + @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, + @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, + HttpServletRequest req) { + Page page = new Page(pageNo, pageSize); + IPage pageList = service.findPage(page, HeatanalysisReamrks); + return Result.OK(pageList); + } + + /** + * 添加 + * + * @param HeatanalysisReamrks + * @return + */ + @PostMapping(value = "/add") + public Result add(@RequestBody HeatanalysisReamrks HeatanalysisReamrks) { + HeatanalysisReamrks.setCreateDate(new Date()); + service.save(HeatanalysisReamrks); + return Result.OK("添加成功！"); + } + + /** + * 编辑 + * + * @param HeatanalysisReamrks + * @return + */ + @RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST}) + public Result edit(@RequestBody HeatanalysisReamrks HeatanalysisReamrks) { + HeatanalysisReamrks.setUpdateDate(new Date()); + service.updateById(HeatanalysisReamrks); + return Result.OK("编辑成功!"); + } + + /** + * 通过id删除 + * + * @param id + * @return + */ + @DeleteMapping(value = "/delete") + public Result delete(@RequestParam(name="id",required=true) String id) { + service.removeById(id); + return Result.OK("删除成功!"); + } + + /** + * 批量删除 + * + * @param ids + * @return + */ + @DeleteMapping(value = "/deleteBatch") + public Result deleteBatch(@RequestParam(name="ids",required=true) String ids) { + this.service.removeByIds(Arrays.asList(ids.split(","))); + return Result.OK("批量删除成功!"); + } + +} diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/heating/entity/Heatanalysis.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/heating/entity/Heatanalysis.java index c47b5d0..bbe1474 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/heating/entity/Heatanalysis.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/heating/entity/Heatanalysis.java @@ -133,6 +133,7 @@ public class Heatanalysis extends JeecgEntity { @TableField(exist = false) private String tableName;//表名字 private String delFlag; // 删除标识 + private String faultLevel; // 故障等级 diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/heating/entity/HeatanalysisReamrks.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/heating/entity/HeatanalysisReamrks.java new file mode 100644 index 0000000..ac6bc46 --- /dev/null +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/heating/entity/HeatanalysisReamrks.java @@ -0,0 +1,51 @@ +package org.jeecg.modules.heating.entity; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableLogic; +import com.baomidou.mybatisplus.annotation.TableName; +import com.fasterxml.jackson.annotation.JsonFormat; +import io.swagger.v3.oas.annotations.tags.Tag; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.experimental.Accessors; +import org.jeecg.common.aspect.annotation.Dict; +import org.jeecgframework.poi.excel.annotation.Excel; +import org.springframework.format.annotation.DateTimeFormat; + +import java.io.Serializable; +import java.util.Date; + +/** + *

Class :运维备注Entity + *

功能描述:功能描述 + */ +@Data +@TableName("bl_heatanalysis_remarks") +@Accessors(chain = true) +@EqualsAndHashCode(callSuper = false) +@Tag(name ="bl_heatanalysis_remarks对象", description="运维备注") +public class HeatanalysisReamrks implements Serializable { + private static final long serialVersionUID = 1L; + /**主键*/ + @TableId(type = IdType.AUTO) + private Integer id; + private Integer mainId; + private Integer companyId; + private String companyName; + private Integer sourceId; + private String sourceName; + private Integer stationId; + private String stationName; + private String remarks; + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") + private Date createDate; + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") + private Date updateDate; + @TableLogic + private String delFlag; + + +} diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/heating/mapper/HeatanalysisMapper.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/heating/mapper/HeatanalysisMapper.java index edeadad..d3df544 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/heating/mapper/HeatanalysisMapper.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/heating/mapper/HeatanalysisMapper.java @@ -12,6 +12,7 @@ public interface HeatanalysisMapper extends BaseMapper { Heatanalysis getHeatOne(Heatanalysis heatanalysis); Page findPage(Page page, @Param("params") Heatanalysis heatanalysis); void updateType(Heatanalysis heatanalysis); + void updateFaultLevel(Heatanalysis heatanalysis); List findSourceList(Heatanalysis heatanalysis); List findList(Heatanalysis heatanalysis); List findStaticList(Heatanalysis heatanalysis); diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/heating/mapper/HeatanalysisReamrksMapper.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/heating/mapper/HeatanalysisReamrksMapper.java new file mode 100644 index 0000000..a7dbb18 --- /dev/null +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/heating/mapper/HeatanalysisReamrksMapper.java @@ -0,0 +1,10 @@ +package org.jeecg.modules.heating.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import org.apache.ibatis.annotations.Param; +import org.jeecg.modules.heating.entity.HeatanalysisReamrks; + +public interface HeatanalysisReamrksMapper extends BaseMapper { + Page findPage(Page page, @Param("params") HeatanalysisReamrks heatanalysisReamrks); +} diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/heating/mapper/xml/HeatanalysisMapper.xml b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/heating/mapper/xml/HeatanalysisMapper.xml index 50b1856..80af762 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/heating/mapper/xml/HeatanalysisMapper.xml +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/heating/mapper/xml/HeatanalysisMapper.xml @@ -73,6 +73,7 @@ a.view046 AS "view046", a.view047 AS "view047", a.sim AS "sim", + a.code AS "code", a.create_by AS "createBy.id", a.create_date AS "createDate", a.update_by AS "updateBy.id", @@ -80,12 +81,16 @@ a.del_flag AS "delFlag", a.report_type AS "reportType", a.is_extract AS "isExtract", + a.region_type AS "regionType", + a.fault_level AS "faultLevel", (select count(*) from bl_data_extract_config bl where bl.one_pipe_sim = a.sim or bl.two_pipe_sim = a.sim) as isExtracted, (case when datatime > DATE_ADD(NOW(), INTERVAL -10 MINUTE) then 0 else 1 end) as isTimeout FROM BL_HEATANALYSIS a - a.region_type = #{params.regionType} - And a.del_flag = '0' + a.del_flag = '0' + + AND a.region_type = #{params.regionType} + AND a.view001 = #{params.view001} @@ -122,6 +127,9 @@ AND a.sim = #{params.sim} + + AND a.fault_level = #{params.faultLevel} + ) t @@ -143,6 +151,12 @@ where id = #{id} + + UPDATE BL_HEATANALYSIS + SET fault_level = #{faultLevel} + where id = #{id} + + + SELECT + id, + main_id, + company_id, + company_name, + source_id, + source_name, + station_id, + station_name, + remarks, + create_date, + update_date, + del_flag + FROM bl_heatanalysis_remarks + + + AND del_flag = #{params.delFlag} + + + ORDER BY id desc + + diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/heating/mapper/xml/ThermalcompanyMapper.xml b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/heating/mapper/xml/ThermalcompanyMapper.xml index 71c11a6..b045d71 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/heating/mapper/xml/ThermalcompanyMapper.xml +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/heating/mapper/xml/ThermalcompanyMapper.xml @@ -40,8 +40,10 @@ FROM BL_thermalcompany a - a.region_type = #{regionType} AND a.del_flag = '0' + + AND a.region_type = #{regionType} + AND a.company_name LIKE concat('%',#{companyName},'%') diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/heating/service/HeatanalysisReamrksService.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/heating/service/HeatanalysisReamrksService.java new file mode 100644 index 0000000..8856752 --- /dev/null +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/heating/service/HeatanalysisReamrksService.java @@ -0,0 +1,10 @@ +package org.jeecg.modules.heating.service; + +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.extension.service.IService; +import org.jeecg.modules.heating.entity.HeatanalysisReamrks; + +public interface HeatanalysisReamrksService extends IService { + IPage findPage(Page page, HeatanalysisReamrks heatanalysisReamrks); +} diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/heating/service/HeatanalysisService.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/heating/service/HeatanalysisService.java index fd5ed7d..4640e84 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/heating/service/HeatanalysisService.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/heating/service/HeatanalysisService.java @@ -12,6 +12,7 @@ public interface HeatanalysisService extends JeecgService { Heatanalysis getHeatOne(Heatanalysis heatanalysis); IPage findPage(Page page,Heatanalysis heatanalysis); void updateType(Heatanalysis heatanalysis); + void updateFaultLevel(Heatanalysis heatanalysis); List findSourceList(Heatanalysis heatanalysis); List findList(Heatanalysis heatanalysis); List findStaticList(Heatanalysis heatanalysis); diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/heating/service/impl/HeatanalysisReamrksServiceImpl.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/heating/service/impl/HeatanalysisReamrksServiceImpl.java new file mode 100644 index 0000000..9ef988a --- /dev/null +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/heating/service/impl/HeatanalysisReamrksServiceImpl.java @@ -0,0 +1,17 @@ +package org.jeecg.modules.heating.service.impl; + +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import org.jeecg.modules.heating.entity.HeatanalysisReamrks; +import org.jeecg.modules.heating.mapper.HeatanalysisReamrksMapper; +import org.jeecg.modules.heating.service.HeatanalysisReamrksService; +import org.springframework.stereotype.Service; + +@Service +public class HeatanalysisReamrksServiceImpl extends ServiceImpl implements HeatanalysisReamrksService { + + public IPage findPage(Page page, HeatanalysisReamrks heatanalysisReamrks){ + return baseMapper.findPage(page,heatanalysisReamrks); + } +} diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/heating/service/impl/HeatanalysisServiceImpl.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/heating/service/impl/HeatanalysisServiceImpl.java index 7c09184..327fa5e 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/heating/service/impl/HeatanalysisServiceImpl.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/heating/service/impl/HeatanalysisServiceImpl.java @@ -29,6 +29,10 @@ public class HeatanalysisServiceImpl extends JeecgServiceImpl findList(Heatanalysis heatanalysis){ return baseMapper.findList(heatanalysis); }