yangjun
/
panshi_java_new
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

菜单拆分为城区/郊县

This commit is contained in:
1378012178@qq.com 2025-08-25 20:00:36 +08:00
parent fd733f8540
commit 1c14f8a8c5
6 changed files with 35 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/heating/controller/SimconfigController.java
View File

@ -106,11 +106,12 @@ public class SimconfigController extends JeecgController<Simconfig, SimconfigSer
customeRuleMap.put("code", QueryRuleEnum.LIKE_WITH_OR); customeRuleMap.put("code", QueryRuleEnum.LIKE_WITH_OR);
customeRuleMap.put("sim", QueryRuleEnum.LIKE_WITH_OR); customeRuleMap.put("sim", QueryRuleEnum.LIKE_WITH_OR);
QueryWrapper<Simconfig> queryWrapper = QueryGenerator.initQueryWrapper(simconfig, req.getParameterMap(),customeRuleMap); QueryWrapper<Simconfig> queryWrapper = QueryGenerator.initQueryWrapper(simconfig, req.getParameterMap(),customeRuleMap);
queryWrapper.eq("region_type",simconfig.getRegionType());
Page<Simconfig> page = new Page<Simconfig>(pageNo, pageSize); Page<Simconfig> page = new Page<Simconfig>(pageNo, pageSize);
IPage<Simconfig> pageList = simconfigService.page(page, queryWrapper); IPage<Simconfig> pageList = simconfigService.page(page, queryWrapper);
return Result.OK(pageList); return Result.OK(pageList);
} }
/** /**
* 添加 * 添加
* *
@ -143,7 +144,7 @@ public class SimconfigController extends JeecgController<Simconfig, SimconfigSer
simconfigService.save(simconfig); simconfigService.save(simconfig);
return Result.OK("添加成功！"); return Result.OK("添加成功！");
} }
/** /**
* 编辑 * 编辑
* *
@ -178,7 +179,7 @@ public class SimconfigController extends JeecgController<Simconfig, SimconfigSer
simconfigService.updateById(simconfig); simconfigService.updateById(simconfig);
return Result.OK("编辑成功!"); return Result.OK("编辑成功!");
} }
/** /**
* 通过id删除 * 通过id删除
* *
@ -193,7 +194,7 @@ public class SimconfigController extends JeecgController<Simconfig, SimconfigSer
simconfigService.removeById(id); simconfigService.removeById(id);
return Result.OK("删除成功!"); return Result.OK("删除成功!");
} }
/** /**
* 批量删除 * 批量删除
* *
@ -208,7 +209,7 @@ public class SimconfigController extends JeecgController<Simconfig, SimconfigSer
this.simconfigService.removeByIds(Arrays.asList(ids.split(","))); this.simconfigService.removeByIds(Arrays.asList(ids.split(",")));
return Result.OK("批量删除成功!"); return Result.OK("批量删除成功!");
} }
/** /**
* 通过id查询 * 通过id查询
* *

14
jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/heating/entity/Heatanalysis.java
View File

@ -5,6 +5,7 @@ import java.util.Date;
import com.baomidou.mybatisplus.annotation.FieldStrategy; import com.baomidou.mybatisplus.annotation.FieldStrategy;
import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.annotation.TableName;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data; import lombok.Data;
import org.jeecg.common.system.base.entity.JeecgEntity; import org.jeecg.common.system.base.entity.JeecgEntity;
import org.jeecgframework.poi.excel.annotation.Excel; import org.jeecgframework.poi.excel.annotation.Excel;
@ -17,7 +18,7 @@ import org.springframework.format.annotation.DateTimeFormat;
@Data @Data
@TableName("bl_heatanalysis") @TableName("bl_heatanalysis")
public class Heatanalysis extends JeecgEntity { public class Heatanalysis extends JeecgEntity {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
@TableField(exist = false) @TableField(exist = false)
@ -79,6 +80,11 @@ public class Heatanalysis extends JeecgEntity {
private String code; // code private String code; // code
private Integer reportType;//数据采集类型 1设备自动上报 2定时模拟 private Integer reportType;//数据采集类型 1设备自动上报 2定时模拟
private Integer isExtract;//是否抽取 0否 1是 private Integer isExtract;//是否抽取 0否 1是
/**地区类型*/
@Excel(name = "地区类型", width = 15)
@ApiModelProperty(value = "地区类型")
private java.lang.String regionType;
@TableField(exist = false) @TableField(exist = false)
private Integer isExtracted;//是否被抽取 0否 1是 private Integer isExtracted;//是否被抽取 0否 1是
@TableField(exist = false) @TableField(exist = false)
@ -91,5 +97,7 @@ public class Heatanalysis extends JeecgEntity {
@TableField(exist = false) @TableField(exist = false)
private String tableName;//表名字 private String tableName;//表名字
private String delFlag; // 删除标识 private String delFlag; // 删除标识
}
}

9
jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/heating/entity/HeatanalysisHistory.java
View File

@ -3,6 +3,7 @@ package org.jeecg.modules.heating.entity;
import com.baomidou.mybatisplus.annotation.FieldStrategy; import com.baomidou.mybatisplus.annotation.FieldStrategy;
import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.annotation.TableName;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data; import lombok.Data;
import org.jeecg.common.system.base.entity.JeecgEntity; import org.jeecg.common.system.base.entity.JeecgEntity;
import org.jeecgframework.poi.excel.annotation.Excel; import org.jeecgframework.poi.excel.annotation.Excel;
@ -17,7 +18,7 @@ import java.util.Date;
@Data @Data
@TableName("bl_heatanalysis_YYMM") @TableName("bl_heatanalysis_YYMM")
public class HeatanalysisHistory extends JeecgEntity { public class HeatanalysisHistory extends JeecgEntity {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
@TableField(exist = false) @TableField(exist = false)
@ -78,6 +79,10 @@ public class HeatanalysisHistory extends JeecgEntity {
private String sim; // sim private String sim; // sim
private String code; // code private String code; // code
private Integer reportType;//数据采集类型 1设备自动上报 2定时模拟 private Integer reportType;//数据采集类型 1设备自动上报 2定时模拟
/**地区类型*/
@Excel(name = "地区类型", width = 15)
@ApiModelProperty(value = "地区类型")
private java.lang.String regionType;
@TableField(exist = false) @TableField(exist = false)
private Date SDate;//开始时间 private Date SDate;//开始时间
@TableField(exist = false) @TableField(exist = false)
@ -89,4 +94,4 @@ public class HeatanalysisHistory extends JeecgEntity {
private String startDate;//开始时间 private String startDate;//开始时间
@TableField(exist = false) @TableField(exist = false)
private String endDate;//结束时间 private String endDate;//结束时间
} }

6
jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/heating/entity/Simconfig.java
View File

@ -99,5 +99,9 @@ public class Simconfig implements Serializable {
/**设备代码*/ /**设备代码*/
@Excel(name = "设备代码", width = 15) @Excel(name = "设备代码", width = 15)
@ApiModelProperty(value = "设备代码") @ApiModelProperty(value = "设备代码")
private String code; private String code;/**地区类型*/
@Excel(name = "地区类型", width = 15)
@ApiModelProperty(value = "地区类型")
private java.lang.String regionType;
} }

5
jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/heating/mapper/xml/HeatanalysisHistoryMapper.xml
View File

@ -47,7 +47,8 @@
a.report_type AS "reportType" a.report_type AS "reportType"
FROM ${params.tableName} a FROM ${params.tableName} a
<where> <where>
a.del_flag = '0' a.region_type = #{params.regionType}
And a.del_flag = '0'
<if test="params.view001 != null and params.view001 != ''"> <if test="params.view001 != null and params.view001 != ''">
AND a.view001 = #{params.view001} AND a.view001 = #{params.view001}
</if> </if>
@ -152,4 +153,4 @@
ORDER BY t.datatime ASC ORDER BY t.datatime ASC
</select> </select>
</mapper> </mapper>

5
jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/heating/mapper/xml/HeatanalysisMapper.xml
View File

@ -66,7 +66,8 @@
(case when datatime > DATE_ADD(NOW(), INTERVAL -10 MINUTE) then 0 else 1 end) as isTimeout (case when datatime > DATE_ADD(NOW(), INTERVAL -10 MINUTE) then 0 else 1 end) as isTimeout
FROM BL_HEATANALYSIS a FROM BL_HEATANALYSIS a
<where> <where>
a.del_flag = '0' a.region_type = #{params.regionType}
And a.del_flag = '0'
<if test="params.view001 != null and params.view001 != ''"> <if test="params.view001 != null and params.view001 != ''">
AND a.view001 = #{params.view001} AND a.view001 = #{params.view001}
</if> </if>
@ -481,4 +482,4 @@
ORDER BY view001 asc ,view002 asc,view004 asc,DATATIME DESC ORDER BY view001 asc ,view002 asc,view004 asc,DATATIME DESC
</select> </select>
</mapper> </mapper>