|
|
|
@ -1,5 +1,6 @@
|
|
|
|
|
package org.jeecg.modules.demo.ttelectricmeter.controller;
|
|
|
|
|
|
|
|
|
|
import java.util.ArrayList;
|
|
|
|
|
import java.util.Arrays;
|
|
|
|
|
import java.util.List;
|
|
|
|
|
import java.util.Map;
|
|
|
|
@ -25,6 +26,7 @@ import lombok.extern.slf4j.Slf4j;
|
|
|
|
|
import org.jeecg.modules.demo.tteqtbase.entity.TtEqtBase;
|
|
|
|
|
import org.jeecg.modules.demo.tteqtbase.service.ITtEqtBaseService;
|
|
|
|
|
import org.jeecg.modules.demo.ttfeedingequip.entity.TtFeedingEquip;
|
|
|
|
|
import org.jeecg.modules.demo.ttmoldtemperatureequip.entity.TtMoldTemperatureEquip;
|
|
|
|
|
import org.jeecgframework.poi.excel.ExcelImportUtil;
|
|
|
|
|
import org.jeecgframework.poi.excel.def.NormalExcelConstants;
|
|
|
|
|
import org.jeecgframework.poi.excel.entity.ExportParams;
|
|
|
|
@ -42,13 +44,13 @@ import io.swagger.annotations.ApiOperation;
|
|
|
|
|
import org.jeecg.common.aspect.annotation.AutoLog;
|
|
|
|
|
import org.apache.shiro.authz.annotation.RequiresPermissions;
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
|
/**
|
|
|
|
|
* @Description: tt_electric_meter
|
|
|
|
|
* @Author: jeecg-boot
|
|
|
|
|
* @Date: 2023-02-14
|
|
|
|
|
* @Version: V1.0
|
|
|
|
|
*/
|
|
|
|
|
@Api(tags="tt_electric_meter")
|
|
|
|
|
@Api(tags = "tt_electric_meter")
|
|
|
|
|
@RestController
|
|
|
|
|
@RequestMapping("/ttelectricmeter/ttElectricMeter")
|
|
|
|
|
@Slf4j
|
|
|
|
@ -59,16 +61,15 @@ public class TtElectricMeterController extends JeecgController<TtElectricMeter,
|
|
|
|
|
private ITtEqtBaseService ttEqtBaseService;
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
@ApiOperation(value="tt列表查询", notes="tt列表查询")
|
|
|
|
|
@ApiOperation(value = "tt列表查询", notes = "tt列表查询")
|
|
|
|
|
@GetMapping(value = "/QueryElectricMeterList")
|
|
|
|
|
public Result<IPage<TtElectricMeter>> QueryElectricMeterList(TtElectricMeter ttElectricMeter,
|
|
|
|
|
@RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
|
|
|
|
|
@RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
|
|
|
|
|
@RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
|
|
|
|
|
@RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
|
|
|
|
|
HttpServletRequest req) {
|
|
|
|
|
QueryWrapper<TtElectricMeter> queryWrapper = QueryGenerator.initQueryWrapper(ttElectricMeter, req.getParameterMap());
|
|
|
|
|
Page<TtElectricMeter> page = new Page<TtElectricMeter>(pageNo, pageSize);
|
|
|
|
|
IPage<TtElectricMeter> pageList = ttElectricMeterService.QueryElectricMeter(page,ttElectricMeter);
|
|
|
|
|
IPage<TtElectricMeter> pageList = ttElectricMeterService.QueryElectricMeter(page, ttElectricMeter);
|
|
|
|
|
return Result.OK(pageList);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
@ -83,26 +84,28 @@ public class TtElectricMeterController extends JeecgController<TtElectricMeter,
|
|
|
|
|
* @return
|
|
|
|
|
*/
|
|
|
|
|
//@AutoLog(value = "tt_electric_meter-分页列表查询")
|
|
|
|
|
@ApiOperation(value="tt_electric_meter-分页列表查询", notes="tt_electric_meter-分页列表查询")
|
|
|
|
|
@ApiOperation(value = "tt_electric_meter-分页列表查询", notes = "tt_electric_meter-分页列表查询")
|
|
|
|
|
@GetMapping(value = "/list")
|
|
|
|
|
public Result<IPage<TtElectricMeter>> queryPageList(TtElectricMeter ttElectricMeter,
|
|
|
|
|
@RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
|
|
|
|
|
@RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
|
|
|
|
|
@RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
|
|
|
|
|
@RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
|
|
|
|
|
HttpServletRequest req) {
|
|
|
|
|
QueryWrapper<TtElectricMeter> queryWrapper = QueryGenerator.initQueryWrapper(ttElectricMeter, req.getParameterMap());
|
|
|
|
|
Page<TtElectricMeter> page = new Page<TtElectricMeter>(pageNo, pageSize);
|
|
|
|
|
IPage<TtElectricMeter> pageList = ttElectricMeterService.page(page, queryWrapper);
|
|
|
|
|
List<TtElectricMeter> list=pageList.getRecords();
|
|
|
|
|
|
|
|
|
|
for (TtElectricMeter meter : list){
|
|
|
|
|
List<TtElectricMeter> list = pageList.getRecords();
|
|
|
|
|
if (list.size() > 0) {
|
|
|
|
|
for (TtElectricMeter meter : list) {
|
|
|
|
|
QueryWrapper<TtEqtBase> eqtBase = new QueryWrapper<>();
|
|
|
|
|
eqtBase.eq("eqt_no",meter.getEqtNo());
|
|
|
|
|
eqtBase.eq("eqt_type", 6 );
|
|
|
|
|
eqtBase.eq("eqt_no", meter.getEqtNo());
|
|
|
|
|
eqtBase.eq("eqt_type", 6);
|
|
|
|
|
eqtBase.eq("location", "数字电表");
|
|
|
|
|
TtEqtBase ttEqtBase = ttEqtBaseService.getOne(eqtBase);
|
|
|
|
|
if (ttEqtBase!=null){
|
|
|
|
|
if (ttEqtBase != null) {
|
|
|
|
|
meter.setLocation(ttEqtBase.getLocation());
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
return Result.OK(pageList);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
@ -113,7 +116,7 @@ public class TtElectricMeterController extends JeecgController<TtElectricMeter,
|
|
|
|
|
* @return
|
|
|
|
|
*/
|
|
|
|
|
@AutoLog(value = "tt_electric_meter-添加")
|
|
|
|
|
@ApiOperation(value="tt_electric_meter-添加", notes="tt_electric_meter-添加")
|
|
|
|
|
@ApiOperation(value = "tt_electric_meter-添加", notes = "tt_electric_meter-添加")
|
|
|
|
|
//@RequiresPermissions("ttelectricmeter:tt_electric_meter:add")
|
|
|
|
|
@PostMapping(value = "/add")
|
|
|
|
|
public Result<String> add(@RequestBody TtElectricMeter ttElectricMeter) {
|
|
|
|
@ -128,9 +131,9 @@ public class TtElectricMeterController extends JeecgController<TtElectricMeter,
|
|
|
|
|
* @return
|
|
|
|
|
*/
|
|
|
|
|
@AutoLog(value = "tt_electric_meter-编辑")
|
|
|
|
|
@ApiOperation(value="tt_electric_meter-编辑", notes="tt_electric_meter-编辑")
|
|
|
|
|
@ApiOperation(value = "tt_electric_meter-编辑", notes = "tt_electric_meter-编辑")
|
|
|
|
|
//@RequiresPermissions("ttelectricmeter:tt_electric_meter:edit")
|
|
|
|
|
@RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST})
|
|
|
|
|
@RequestMapping(value = "/edit", method = {RequestMethod.PUT, RequestMethod.POST})
|
|
|
|
|
public Result<String> edit(@RequestBody TtElectricMeter ttElectricMeter) {
|
|
|
|
|
ttElectricMeterService.updateById(ttElectricMeter);
|
|
|
|
|
return Result.OK("编辑成功!");
|
|
|
|
@ -143,10 +146,10 @@ public class TtElectricMeterController extends JeecgController<TtElectricMeter,
|
|
|
|
|
* @return
|
|
|
|
|
*/
|
|
|
|
|
@AutoLog(value = "tt_electric_meter-通过id删除")
|
|
|
|
|
@ApiOperation(value="tt_electric_meter-通过id删除", notes="tt_electric_meter-通过id删除")
|
|
|
|
|
@ApiOperation(value = "tt_electric_meter-通过id删除", notes = "tt_electric_meter-通过id删除")
|
|
|
|
|
//@RequiresPermissions("ttelectricmeter:tt_electric_meter:delete")
|
|
|
|
|
@DeleteMapping(value = "/delete")
|
|
|
|
|
public Result<String> delete(@RequestParam(name="id",required=true) String id) {
|
|
|
|
|
public Result<String> delete(@RequestParam(name = "id", required = true) String id) {
|
|
|
|
|
ttElectricMeterService.removeById(id);
|
|
|
|
|
return Result.OK("删除成功!");
|
|
|
|
|
}
|
|
|
|
@ -158,10 +161,10 @@ public class TtElectricMeterController extends JeecgController<TtElectricMeter,
|
|
|
|
|
* @return
|
|
|
|
|
*/
|
|
|
|
|
@AutoLog(value = "tt_electric_meter-批量删除")
|
|
|
|
|
@ApiOperation(value="tt_electric_meter-批量删除", notes="tt_electric_meter-批量删除")
|
|
|
|
|
@ApiOperation(value = "tt_electric_meter-批量删除", notes = "tt_electric_meter-批量删除")
|
|
|
|
|
//@RequiresPermissions("ttelectricmeter:tt_electric_meter:deleteBatch")
|
|
|
|
|
@DeleteMapping(value = "/deleteBatch")
|
|
|
|
|
public Result<String> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
|
|
|
|
|
public Result<String> deleteBatch(@RequestParam(name = "ids", required = true) String ids) {
|
|
|
|
|
this.ttElectricMeterService.removeByIds(Arrays.asList(ids.split(",")));
|
|
|
|
|
return Result.OK("批量删除成功!");
|
|
|
|
|
}
|
|
|
|
@ -173,11 +176,11 @@ public class TtElectricMeterController extends JeecgController<TtElectricMeter,
|
|
|
|
|
* @return
|
|
|
|
|
*/
|
|
|
|
|
//@AutoLog(value = "tt_electric_meter-通过id查询")
|
|
|
|
|
@ApiOperation(value="tt_electric_meter-通过id查询", notes="tt_electric_meter-通过id查询")
|
|
|
|
|
@ApiOperation(value = "tt_electric_meter-通过id查询", notes = "tt_electric_meter-通过id查询")
|
|
|
|
|
@GetMapping(value = "/queryById")
|
|
|
|
|
public Result<TtElectricMeter> queryById(@RequestParam(name="id",required=true) String id) {
|
|
|
|
|
public Result<TtElectricMeter> queryById(@RequestParam(name = "id", required = true) String id) {
|
|
|
|
|
TtElectricMeter ttElectricMeter = ttElectricMeterService.getById(id);
|
|
|
|
|
if(ttElectricMeter==null) {
|
|
|
|
|
if (ttElectricMeter == null) {
|
|
|
|
|
return Result.error("未找到对应数据");
|
|
|
|
|
}
|
|
|
|
|
return Result.OK(ttElectricMeter);
|
|
|
|
@ -190,9 +193,33 @@ public class TtElectricMeterController extends JeecgController<TtElectricMeter,
|
|
|
|
|
* @param ttElectricMeter
|
|
|
|
|
*/
|
|
|
|
|
//@RequiresPermissions("ttelectricmeter:tt_electric_meter:exportXls")
|
|
|
|
|
// @RequestMapping(value = "/exportXls")
|
|
|
|
|
// public ModelAndView exportXls(HttpServletRequest request, TtElectricMeter ttElectricMeter) {
|
|
|
|
|
// return super.exportXls(request, ttElectricMeter, TtElectricMeter.class, "tt_electric_meter");
|
|
|
|
|
// }
|
|
|
|
|
@RequestMapping(value = "/exportXls")
|
|
|
|
|
public ModelAndView exportXls(HttpServletRequest request, TtElectricMeter ttElectricMeter) {
|
|
|
|
|
return super.exportXls(request, ttElectricMeter, TtElectricMeter.class, "tt_electric_meter");
|
|
|
|
|
ModelAndView modelAndView = super.exportXls(request, ttElectricMeter, TtElectricMeter.class, "tt_electric_meter");
|
|
|
|
|
Object model = modelAndView.getModel().get("data");
|
|
|
|
|
List<TtElectricMeter> list = new ArrayList<>();
|
|
|
|
|
if (model instanceof ArrayList<?>) {
|
|
|
|
|
for (Object o : (List<?>) model) {
|
|
|
|
|
list.add((TtElectricMeter) o);
|
|
|
|
|
}
|
|
|
|
|
if (list.size() > 0) {
|
|
|
|
|
for (TtElectricMeter Electric : list) {
|
|
|
|
|
QueryWrapper<TtEqtBase> eqtBase = new QueryWrapper<>();
|
|
|
|
|
eqtBase.eq("eqt_no", Electric.getEqtNo());
|
|
|
|
|
eqtBase.eq("eqt_type", 6);
|
|
|
|
|
eqtBase.eq("location", "数字电表");
|
|
|
|
|
TtEqtBase ttEqtBase = ttEqtBaseService.getOne(eqtBase);
|
|
|
|
|
if (ttEqtBase != null) {
|
|
|
|
|
Electric.setLocation(ttEqtBase.getLocation());
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
return modelAndView;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
|