From b3496bf0a58dd7ae45f930add0f4acecafa67dab Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9B=B9=E7=A3=8A?= <45566618@qq.com> Date: Fri, 6 Dec 2024 17:37:52 +0800 Subject: [PATCH] =?UTF-8?q?=E6=95=B0=E6=8D=AE=E6=8A=BD=E5=8F=96=E8=A7=84?= =?UTF-8?q?=E5=88=99=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../DataExtractConfigController.java | 153 ++++++++++++++++++ .../heating/entity/DataExtractConfig.java | 68 ++++++++ .../modules/heating/entity/Heatanalysis.java | 1 + .../mapper/DataExtractConfigMapper.java | 17 ++ .../mapper/xml/DataExtractConfigMapper.xml | 97 +++++++++++ .../heating/mapper/xml/HeatanalysisMapper.xml | 4 +- .../service/DataExtractConfigService.java | 16 ++ .../impl/DataExtractConfigServiceImpl.java | 27 ++++ .../mapper/xml/TemperatureMapper.xml | 4 +- 9 files changed, 383 insertions(+), 4 deletions(-) create mode 100644 jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/heating/controller/DataExtractConfigController.java create mode 100644 jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/heating/entity/DataExtractConfig.java create mode 100644 jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/heating/mapper/DataExtractConfigMapper.java create mode 100644 jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/heating/mapper/xml/DataExtractConfigMapper.xml create mode 100644 jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/heating/service/DataExtractConfigService.java create mode 100644 jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/heating/service/impl/DataExtractConfigServiceImpl.java diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/heating/controller/DataExtractConfigController.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/heating/controller/DataExtractConfigController.java new file mode 100644 index 0000000..667ccb9 --- /dev/null +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/heating/controller/DataExtractConfigController.java @@ -0,0 +1,153 @@ +package org.jeecg.modules.heating.controller; + +import java.util.Arrays; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import org.jeecg.common.api.vo.Result; + +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import lombok.extern.slf4j.Slf4j; + +import org.jeecg.modules.heating.entity.DataExtractConfig; +import org.jeecg.modules.heating.service.DataExtractConfigService; +import org.jeecg.common.system.base.controller.JeecgController; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; +import org.springframework.web.servlet.ModelAndView; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.jeecg.common.aspect.annotation.AutoLog; + +/** + * @Description: 数据抽取配置 + * @Author: jeecg-boot + * @Date: 2024-12-06 + * @Version: V1.0 + */ +@Api(tags="数据抽取配置") +@RestController +@RequestMapping("/heating/dataExtractConfig") +@Slf4j +public class DataExtractConfigController extends JeecgController { + @Autowired + private DataExtractConfigService dataExtractConfigService; + + /** + * 分页列表查询 + * + * @param dataExtractConfig + * @param pageNo + * @param pageSize + * @param req + * @return + */ + //@AutoLog(value = "数据抽取配置-分页列表查询") + @ApiOperation(value="数据抽取配置-分页列表查询", notes="数据抽取配置-分页列表查询") + @GetMapping(value = "/list") + public Result> queryPageList(DataExtractConfig dataExtractConfig, + @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, + @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, + HttpServletRequest req) { + Page page = new Page(pageNo, pageSize); + IPage pageList = dataExtractConfigService.findPage(page, dataExtractConfig); + return Result.OK(pageList); + } + + /** + * 添加 + * + * @param dataExtractConfig + * @return + */ + @AutoLog(value = "数据抽取配置-添加") + @ApiOperation(value="数据抽取配置-添加", notes="数据抽取配置-添加") + @PostMapping(value = "/add") + public Result add(@RequestBody DataExtractConfig dataExtractConfig) { + dataExtractConfigService.save(dataExtractConfig); + return Result.OK("添加成功！"); + } + + /** + * 编辑 + * + * @param dataExtractConfig + * @return + */ + @AutoLog(value = "数据抽取配置-编辑") + @ApiOperation(value="数据抽取配置-编辑", notes="数据抽取配置-编辑") + @RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST}) + public Result edit(@RequestBody DataExtractConfig dataExtractConfig) { + dataExtractConfigService.updateById(dataExtractConfig); + return Result.OK("编辑成功!"); + } + + /** + * 通过id删除 + * + * @param id + * @return + */ + @AutoLog(value = "数据抽取配置-通过id删除") + @ApiOperation(value="数据抽取配置-通过id删除", notes="数据抽取配置-通过id删除") + @DeleteMapping(value = "/delete") + public Result delete(@RequestParam(name="id",required=true) String id) { + dataExtractConfigService.removeById(id); + return Result.OK("删除成功!"); + } + + /** + * 批量删除 + * + * @param ids + * @return + */ + @AutoLog(value = "数据抽取配置-批量删除") + @ApiOperation(value="数据抽取配置-批量删除", notes="数据抽取配置-批量删除") + @DeleteMapping(value = "/deleteBatch") + public Result deleteBatch(@RequestParam(name="ids",required=true) String ids) { + this.dataExtractConfigService.removeByIds(Arrays.asList(ids.split(","))); + return Result.OK("批量删除成功!"); + } + + /** + * 通过id查询 + * + * @param id + * @return + */ + //@AutoLog(value = "数据抽取配置-通过id查询") + @ApiOperation(value="数据抽取配置-通过id查询", notes="数据抽取配置-通过id查询") + @GetMapping(value = "/queryById") + public Result queryById(@RequestParam(name="id",required=true) String id) { + DataExtractConfig dataExtractConfig = dataExtractConfigService.getById(id); + if(dataExtractConfig==null) { + return Result.error("未找到对应数据"); + } + return Result.OK(dataExtractConfig); + } + + /** + * 导出excel + * + * @param request + * @param dataExtractConfig + */ + @RequestMapping(value = "/exportXls") + public ModelAndView exportXls(HttpServletRequest request, DataExtractConfig dataExtractConfig) { + return super.exportXls(request, dataExtractConfig, DataExtractConfig.class, "数据抽取配置"); + } + + /** + * 通过excel导入数据 + * + * @param request + * @param response + * @return + */ + @RequestMapping(value = "/importExcel", method = RequestMethod.POST) + public Result importExcel(HttpServletRequest request, HttpServletResponse response) { + return super.importExcel(request, response, DataExtractConfig.class); + } + +} diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/heating/entity/DataExtractConfig.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/heating/entity/DataExtractConfig.java new file mode 100644 index 0000000..f0c563c --- /dev/null +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/heating/entity/DataExtractConfig.java @@ -0,0 +1,68 @@ +package org.jeecg.modules.heating.entity; + +import com.baomidou.mybatisplus.annotation.*; +import lombok.Data; +import org.jeecg.common.system.base.entity.JeecgEntity; + +import java.io.Serializable; + +/** + *

Class :数据抽取配置Entity + *

功能描述:功能描述 + */ +@Data +@TableName("bl_data_extract_config") +public class DataExtractConfig implements Serializable { + + private static final long serialVersionUID = 1L; + /** + * id + */ + @TableId(type = IdType.AUTO) + private Long id; + private String sim; //手机号 + private String onePipeSim; //一次网抽取sim卡号 + private String onePipeType; //一次网抽取类型 0无 1一次网 2二次网 + private String twoPipeSim; //二次网抽取sim卡号 + private String twoPipeType; //二次网抽取类型 0无 1一次网 2二次网 + private String flag; //是否生效 0失效 1生效 + + @TableField(exist = false) + private Integer companyId;//热力公司 + @TableField(exist = false) + private String company; + @TableField(exist = false) + private Integer sourceId;//热源站 + @TableField(exist = false) + private String source; + @TableField(exist = false) + private Integer stationId;//换热站 + @TableField(exist = false) + private String station; + + @TableField(exist = false) + private Integer oneCompanyId;//一次网热力公司 + @TableField(exist = false) + private String oneCompany; + @TableField(exist = false) + private Integer oneSourceId;//一次网热源站 + @TableField(exist = false) + private String oneSource; + @TableField(exist = false) + private Integer oneStationId;//一次网换热站 + @TableField(exist = false) + private String oneStation; + @TableField(exist = false) + private Integer twoCompanyId;//二次网热力公司 + @TableField(exist = false) + private String twoCompany; + @TableField(exist = false) + private Integer twoSourceId;//二次网热源站 + @TableField(exist = false) + private String twoSource; + @TableField(exist = false) + private Integer twoStationId;//二次网换热站 + @TableField(exist = false) + private String twoStation; + +} \ No newline at end of file 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 e75f352..9b352e1 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 @@ -77,6 +77,7 @@ public class Heatanalysis extends JeecgEntity { private String view030; // view030 private String sim; // sim private String code; // code + private Integer reportType;//上报类型 @TableField(exist = false) private String SDate;//开始时间 diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/heating/mapper/DataExtractConfigMapper.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/heating/mapper/DataExtractConfigMapper.java new file mode 100644 index 0000000..f23725d --- /dev/null +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/heating/mapper/DataExtractConfigMapper.java @@ -0,0 +1,17 @@ +package org.jeecg.modules.heating.mapper; + +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import org.apache.ibatis.annotations.Param; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.jeecg.modules.heating.entity.DataExtractConfig; + +/** + * @Description: 数据抽取配置 + * @Author: jeecg-boot + * @Date: 2024-12-06 + * @Version: V1.0 + */ +public interface DataExtractConfigMapper extends BaseMapper { + Page findPage(Page page, @Param("params") DataExtractConfig dataExtractConfig); + +} diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/heating/mapper/xml/DataExtractConfigMapper.xml b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/heating/mapper/xml/DataExtractConfigMapper.xml new file mode 100644 index 0000000..b142ccf --- /dev/null +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/heating/mapper/xml/DataExtractConfigMapper.xml @@ -0,0 +1,97 @@ + + + + + + + \ No newline at end of file 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 d30c05b..223b03f 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 @@ -194,11 +194,11 @@ SELECT * FROM HEATANALYSIS a where a.del_flag = #{DEL_FLAG_NORMAL} - and a.create_by = '-1' + and a.report_type = 2 - CALL P_Q_D_HEATANALYSIS_SIMULATE(#{code}, #{sim}, #{datatime}, #{view005}, #{view006}, #{view007}, #{view008}, #{view009}, #{view010}, #{view011}, #{view012}) + CALL P_Q_D_HEATANALYSIS_SIMULATE_NEW(#{code}, #{sim}, #{datatime}, #{view005}, #{view006}, #{view007}, #{view008}, #{view009}, #{view010}, #{view011}, #{view012})