diff --git a/jeecg-boot-base-core/src/main/java/org/jeecg/config/shiro/ShiroConfig.java b/jeecg-boot-base-core/src/main/java/org/jeecg/config/shiro/ShiroConfig.java index 7352d8a6..9ece1c02 100644 --- a/jeecg-boot-base-core/src/main/java/org/jeecg/config/shiro/ShiroConfig.java +++ b/jeecg-boot-base-core/src/main/java/org/jeecg/config/shiro/ShiroConfig.java @@ -99,7 +99,7 @@ public class ShiroConfig { filterChainDefinitionMap.put("/sys/checkAuth", "anon"); //授权接口排除 - filterChainDefinitionMap.put("/**/*", "anon"); +// filterChainDefinitionMap.put("/**/*", "anon"); filterChainDefinitionMap.put("/", "anon"); filterChainDefinitionMap.put("/doc.html", "anon"); filterChainDefinitionMap.put("/**/*.js", "anon"); diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/project/baseConfig/bizAim/bizCityAim/controller/BizCityAimController.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/project/baseConfig/bizAim/bizCityAim/controller/BizCityAimController.java new file mode 100644 index 00000000..adafbc23 --- /dev/null +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/project/baseConfig/bizAim/bizCityAim/controller/BizCityAimController.java @@ -0,0 +1,163 @@ +package org.jeecg.modules.project.baseConfig.bizAim.bizCityAim.controller; + +import java.util.Arrays; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import org.jeecg.common.api.vo.Result; +import org.jeecg.common.system.query.QueryGenerator; +import org.jeecg.modules.project.baseConfig.bizAim.bizCityAim.entity.BizCityAim; +import org.jeecg.modules.project.baseConfig.bizAim.bizCityAim.service.IBizCityAimService; + +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.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; +import org.apache.shiro.authz.annotation.RequiresPermissions; + + /** + * @Description: 城市目标表 + * @Author: jeecg-boot + * @Date: 2023-09-19 + * @Version: V1.0 + */ +@Api(tags="城市目标表") +@RestController +@RequestMapping("/bizCityAim/bizCityAim") +@Slf4j +public class BizCityAimController extends JeecgController { + @Autowired + private IBizCityAimService bizCityAimService; + + /** + * 分页列表查询 + * + * @param bizCityAim + * @param pageNo + * @param pageSize + * @param req + * @return + */ + //@AutoLog(value = "城市目标表-分页列表查询") + @ApiOperation(value="城市目标表-分页列表查询", notes="城市目标表-分页列表查询") + @GetMapping(value = "/list") + public Result> queryPageList(BizCityAim bizCityAim, + @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, + @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, + HttpServletRequest req) { + QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(bizCityAim, req.getParameterMap()); + Page page = new Page(pageNo, pageSize); + IPage pageList = bizCityAimService.page(page, queryWrapper); + return Result.OK(pageList); + } + + /** + * 添加 + * + * @param bizCityAim + * @return + */ + @AutoLog(value = "城市目标表-添加") + @ApiOperation(value="城市目标表-添加", notes="城市目标表-添加") + @RequiresPermissions("bizCityAim:biz_city_aim:add") + @PostMapping(value = "/add") + public Result add(@RequestBody BizCityAim bizCityAim) { + bizCityAimService.save(bizCityAim); + return Result.OK("添加成功！"); + } + + /** + * 编辑 + * + * @param bizCityAim + * @return + */ + @AutoLog(value = "城市目标表-编辑") + @ApiOperation(value="城市目标表-编辑", notes="城市目标表-编辑") + @RequiresPermissions("bizCityAim:biz_city_aim:edit") + @RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST}) + public Result edit(@RequestBody BizCityAim bizCityAim) { + bizCityAimService.updateById(bizCityAim); + return Result.OK("编辑成功!"); + } + + /** + * 通过id删除 + * + * @param id + * @return + */ + @AutoLog(value = "城市目标表-通过id删除") + @ApiOperation(value="城市目标表-通过id删除", notes="城市目标表-通过id删除") + @RequiresPermissions("bizCityAim:biz_city_aim:delete") + @DeleteMapping(value = "/delete") + public Result delete(@RequestParam(name="id",required=true) String id) { + bizCityAimService.removeById(id); + return Result.OK("删除成功!"); + } + + /** + * 批量删除 + * + * @param ids + * @return + */ + @AutoLog(value = "城市目标表-批量删除") + @ApiOperation(value="城市目标表-批量删除", notes="城市目标表-批量删除") + @RequiresPermissions("bizCityAim:biz_city_aim:deleteBatch") + @DeleteMapping(value = "/deleteBatch") + public Result deleteBatch(@RequestParam(name="ids",required=true) String ids) { + this.bizCityAimService.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) { + BizCityAim bizCityAim = bizCityAimService.getById(id); + if(bizCityAim==null) { + return Result.error("未找到对应数据"); + } + return Result.OK(bizCityAim); + } + + /** + * 导出excel + * + * @param request + * @param bizCityAim + */ + @RequiresPermissions("bizCityAim:biz_city_aim:exportXls") + @RequestMapping(value = "/exportXls") + public ModelAndView exportXls(HttpServletRequest request, BizCityAim bizCityAim) { + return super.exportXls(request, bizCityAim, BizCityAim.class, "城市目标表"); + } + + /** + * 通过excel导入数据 + * + * @param request + * @param response + * @return + */ + @RequiresPermissions("bizCityAim:biz_city_aim:importExcel") + @RequestMapping(value = "/importExcel", method = RequestMethod.POST) + public Result importExcel(HttpServletRequest request, HttpServletResponse response) { + return super.importExcel(request, response, BizCityAim.class); + } + +} diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/project/baseConfig/bizAim/bizCityAim/entity/BizCityAim.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/project/baseConfig/bizAim/bizCityAim/entity/BizCityAim.java new file mode 100644 index 00000000..44eb691a --- /dev/null +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/project/baseConfig/bizAim/bizCityAim/entity/BizCityAim.java @@ -0,0 +1,72 @@ +package org.jeecg.modules.project.baseConfig.bizAim.bizCityAim.entity; + +import java.io.Serializable; +import java.util.Date; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; +import com.fasterxml.jackson.annotation.JsonFormat; +import org.springframework.format.annotation.DateTimeFormat; +import org.jeecgframework.poi.excel.annotation.Excel; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.EqualsAndHashCode; +import lombok.experimental.Accessors; + +/** + * @Description: 城市目标表 + * @Author: jeecg-boot + * @Date: 2023-09-19 + * @Version: V1.0 + */ +@Data +@TableName("biz_city_aim") +@Accessors(chain = true) +@EqualsAndHashCode(callSuper = false) +@ApiModel(value="biz_city_aim对象", description="城市目标表") +public class BizCityAim implements Serializable { + private static final long serialVersionUID = 1L; + + /**主键*/ + @TableId(type = IdType.ASSIGN_ID) + @ApiModelProperty(value = "主键") + private String id; + /**创建人*/ + @ApiModelProperty(value = "创建人") + private String createBy; + /**创建日期*/ + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") + @ApiModelProperty(value = "创建日期") + private Date createTime; + /**更新人*/ + @ApiModelProperty(value = "更新人") + private String updateBy; + /**更新日期*/ + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") + @ApiModelProperty(value = "更新日期") + private Date updateTime; + /**城市名称*/ + @Excel(name = "城市名称", width = 15) + @ApiModelProperty(value = "城市名称") + private String cityName; + /**行政区*/ + @Excel(name = "行政区", width = 15) + @ApiModelProperty(value = "行政区") + private String district; + /**经度*/ + @Excel(name = "经度", width = 15) + @ApiModelProperty(value = "经度") + private Double cityLon; + /**纬度*/ + @Excel(name = "纬度", width = 15) + @ApiModelProperty(value = "纬度") + private Double cityLat; + /**备注*/ + @Excel(name = "备注", width = 15) + @ApiModelProperty(value = "备注") + private String remark; +} diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/project/baseConfig/bizAim/bizCityAim/mapper/BizCityAimMapper.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/project/baseConfig/bizAim/bizCityAim/mapper/BizCityAimMapper.java new file mode 100644 index 00000000..9133ec3b --- /dev/null +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/project/baseConfig/bizAim/bizCityAim/mapper/BizCityAimMapper.java @@ -0,0 +1,14 @@ +package org.jeecg.modules.project.baseConfig.bizAim.bizCityAim.mapper; + +import org.jeecg.modules.project.baseConfig.bizAim.bizCityAim.entity.BizCityAim; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; + +/** + * @Description: 城市目标表 + * @Author: jeecg-boot + * @Date: 2023-09-19 + * @Version: V1.0 + */ +public interface BizCityAimMapper extends BaseMapper { + +} diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/project/baseConfig/bizAim/bizCityAim/mapper/xml/BizCityAimMapper.xml b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/project/baseConfig/bizAim/bizCityAim/mapper/xml/BizCityAimMapper.xml new file mode 100644 index 00000000..552b062d --- /dev/null +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/project/baseConfig/bizAim/bizCityAim/mapper/xml/BizCityAimMapper.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/project/baseConfig/bizAim/bizCityAim/service/IBizCityAimService.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/project/baseConfig/bizAim/bizCityAim/service/IBizCityAimService.java new file mode 100644 index 00000000..8d930bd8 --- /dev/null +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/project/baseConfig/bizAim/bizCityAim/service/IBizCityAimService.java @@ -0,0 +1,14 @@ +package org.jeecg.modules.project.baseConfig.bizAim.bizCityAim.service; + +import org.jeecg.modules.project.baseConfig.bizAim.bizCityAim.entity.BizCityAim; +import com.baomidou.mybatisplus.extension.service.IService; + +/** + * @Description: 城市目标表 + * @Author: jeecg-boot + * @Date: 2023-09-19 + * @Version: V1.0 + */ +public interface IBizCityAimService extends IService { + +} diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/project/baseConfig/bizAim/bizCityAim/service/impl/BizCityAimServiceImpl.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/project/baseConfig/bizAim/bizCityAim/service/impl/BizCityAimServiceImpl.java new file mode 100644 index 00000000..85c605a1 --- /dev/null +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/project/baseConfig/bizAim/bizCityAim/service/impl/BizCityAimServiceImpl.java @@ -0,0 +1,19 @@ +package org.jeecg.modules.project.baseConfig.bizAim.bizCityAim.service.impl; + +import org.jeecg.modules.project.baseConfig.bizAim.bizCityAim.entity.BizCityAim; +import org.jeecg.modules.project.baseConfig.bizAim.bizCityAim.mapper.BizCityAimMapper; +import org.jeecg.modules.project.baseConfig.bizAim.bizCityAim.service.IBizCityAimService; +import org.springframework.stereotype.Service; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; + +/** + * @Description: 城市目标表 + * @Author: jeecg-boot + * @Date: 2023-09-19 + * @Version: V1.0 + */ +@Service +public class BizCityAimServiceImpl extends ServiceImpl implements IBizCityAimService { + +} diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/project/baseConfig/bizAim/bizFacilityAim/controller/BizFacilityAimController.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/project/baseConfig/bizAim/bizFacilityAim/controller/BizFacilityAimController.java new file mode 100644 index 00000000..4de37fa1 --- /dev/null +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/project/baseConfig/bizAim/bizFacilityAim/controller/BizFacilityAimController.java @@ -0,0 +1,178 @@ +package org.jeecg.modules.project.baseConfig.bizAim.bizFacilityAim.controller; + +import java.util.Arrays; +import java.util.List; +import java.util.Map; +import java.util.stream.Collectors; +import java.io.IOException; +import java.io.UnsupportedEncodingException; +import java.net.URLDecoder; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import org.jeecg.common.api.vo.Result; +import org.jeecg.common.system.query.QueryGenerator; +import org.jeecg.common.util.oConvertUtils; +import org.jeecg.modules.project.baseConfig.bizAim.bizFacilityAim.entity.BizFacilityAim; +import org.jeecg.modules.project.baseConfig.bizAim.bizFacilityAim.service.IBizFacilityAimService; + +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.jeecgframework.poi.excel.ExcelImportUtil; +import org.jeecgframework.poi.excel.def.NormalExcelConstants; +import org.jeecgframework.poi.excel.entity.ExportParams; +import org.jeecgframework.poi.excel.entity.ImportParams; +import org.jeecgframework.poi.excel.view.JeecgEntityExcelView; +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.multipart.MultipartFile; +import org.springframework.web.multipart.MultipartHttpServletRequest; +import org.springframework.web.servlet.ModelAndView; +import com.alibaba.fastjson.JSON; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.jeecg.common.aspect.annotation.AutoLog; +import org.apache.shiro.authz.annotation.RequiresPermissions; + + /** + * @Description: 设施目标表 + * @Author: jeecg-boot + * @Date: 2023-09-20 + * @Version: V1.0 + */ +@Api(tags="设施目标表") +@RestController +@RequestMapping("/bizFacilityAim/bizFacilityAim") +@Slf4j +public class BizFacilityAimController extends JeecgController { + @Autowired + private IBizFacilityAimService bizFacilityAimService; + + /** + * 分页列表查询 + * + * @param bizFacilityAim + * @param pageNo + * @param pageSize + * @param req + * @return + */ + //@AutoLog(value = "设施目标表-分页列表查询") + @ApiOperation(value="设施目标表-分页列表查询", notes="设施目标表-分页列表查询") + @GetMapping(value = "/list") + public Result> queryPageList(BizFacilityAim bizFacilityAim, + @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, + @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, + HttpServletRequest req) { + QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(bizFacilityAim, req.getParameterMap()); + Page page = new Page(pageNo, pageSize); + IPage pageList = bizFacilityAimService.page(page, queryWrapper); + return Result.OK(pageList); + } + + /** + * 添加 + * + * @param bizFacilityAim + * @return + */ + @AutoLog(value = "设施目标表-添加") + @ApiOperation(value="设施目标表-添加", notes="设施目标表-添加") + @RequiresPermissions("bizFacilityAim:biz_facility_aim:add") + @PostMapping(value = "/add") + public Result add(@RequestBody BizFacilityAim bizFacilityAim) { + bizFacilityAimService.save(bizFacilityAim); + return Result.OK("添加成功！"); + } + + /** + * 编辑 + * + * @param bizFacilityAim + * @return + */ + @AutoLog(value = "设施目标表-编辑") + @ApiOperation(value="设施目标表-编辑", notes="设施目标表-编辑") + @RequiresPermissions("bizFacilityAim:biz_facility_aim:edit") + @RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST}) + public Result edit(@RequestBody BizFacilityAim bizFacilityAim) { + bizFacilityAimService.updateById(bizFacilityAim); + return Result.OK("编辑成功!"); + } + + /** + * 通过id删除 + * + * @param id + * @return + */ + @AutoLog(value = "设施目标表-通过id删除") + @ApiOperation(value="设施目标表-通过id删除", notes="设施目标表-通过id删除") + @RequiresPermissions("bizFacilityAim:biz_facility_aim:delete") + @DeleteMapping(value = "/delete") + public Result delete(@RequestParam(name="id",required=true) String id) { + bizFacilityAimService.removeById(id); + return Result.OK("删除成功!"); + } + + /** + * 批量删除 + * + * @param ids + * @return + */ + @AutoLog(value = "设施目标表-批量删除") + @ApiOperation(value="设施目标表-批量删除", notes="设施目标表-批量删除") + @RequiresPermissions("bizFacilityAim:biz_facility_aim:deleteBatch") + @DeleteMapping(value = "/deleteBatch") + public Result deleteBatch(@RequestParam(name="ids",required=true) String ids) { + this.bizFacilityAimService.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) { + BizFacilityAim bizFacilityAim = bizFacilityAimService.getById(id); + if(bizFacilityAim==null) { + return Result.error("未找到对应数据"); + } + return Result.OK(bizFacilityAim); + } + + /** + * 导出excel + * + * @param request + * @param bizFacilityAim + */ + @RequiresPermissions("bizFacilityAim:biz_facility_aim:exportXls") + @RequestMapping(value = "/exportXls") + public ModelAndView exportXls(HttpServletRequest request, BizFacilityAim bizFacilityAim) { + return super.exportXls(request, bizFacilityAim, BizFacilityAim.class, "设施目标表"); + } + + /** + * 通过excel导入数据 + * + * @param request + * @param response + * @return + */ + @RequiresPermissions("bizFacilityAim:biz_facility_aim:importExcel") + @RequestMapping(value = "/importExcel", method = RequestMethod.POST) + public Result importExcel(HttpServletRequest request, HttpServletResponse response) { + return super.importExcel(request, response, BizFacilityAim.class); + } + +} diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/project/baseConfig/bizAim/bizFacilityAim/entity/BizFacilityAim.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/project/baseConfig/bizAim/bizFacilityAim/entity/BizFacilityAim.java new file mode 100644 index 00000000..257f63d7 --- /dev/null +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/project/baseConfig/bizAim/bizFacilityAim/entity/BizFacilityAim.java @@ -0,0 +1,103 @@ +package org.jeecg.modules.project.baseConfig.bizAim.bizFacilityAim.entity; + +import java.io.Serializable; +import java.io.UnsupportedEncodingException; +import java.util.Date; +import java.math.BigDecimal; +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.annotation.TableLogic; +import lombok.Data; +import com.fasterxml.jackson.annotation.JsonFormat; +import org.springframework.format.annotation.DateTimeFormat; +import org.jeecgframework.poi.excel.annotation.Excel; +import org.jeecg.common.aspect.annotation.Dict; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.EqualsAndHashCode; +import lombok.experimental.Accessors; + +/** + * @Description: 设施目标表 + * @Author: jeecg-boot + * @Date: 2023-09-20 + * @Version: V1.0 + */ +@Data +@TableName("biz_facility_aim") +@Accessors(chain = true) +@EqualsAndHashCode(callSuper = false) +@ApiModel(value="biz_facility_aim对象", description="设施目标表") +public class BizFacilityAim implements Serializable { + private static final long serialVersionUID = 1L; + + /**主键*/ + @TableId(type = IdType.ASSIGN_ID) + @ApiModelProperty(value = "主键") + private String id; + /**创建人*/ + @ApiModelProperty(value = "创建人") + private String createBy; + /**创建日期*/ + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") + @ApiModelProperty(value = "创建日期") + private Date createTime; + /**更新人*/ + @ApiModelProperty(value = "更新人") + private String updateBy; + /**更新日期*/ + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") + @ApiModelProperty(value = "更新日期") + private Date updateTime; + /**设施名称*/ + @Excel(name = "设施名称", width = 15) + @ApiModelProperty(value = "设施名称") + private String facilityName; + /**设施类型*/ + @Excel(name = "设施类型", width = 15) + @ApiModelProperty(value = "设施类型") + private String facilityType; + /**设施地区*/ + @Excel(name = "设施地区", width = 15) + @ApiModelProperty(value = "设施地区") + private String facilityArea; + /**纬度*/ + @Excel(name = "纬度", width = 15) + @ApiModelProperty(value = "纬度") + private Double facilityLon; + /**纬度*/ + @Excel(name = "纬度", width = 15) + @ApiModelProperty(value = "纬度") + private Double facilityLat; + /**海拔*/ + @Excel(name = "海拔", width = 15) + @ApiModelProperty(value = "海拔") + private Double elevation; + /**功率*/ + @Excel(name = "功率", width = 15) + @ApiModelProperty(value = "功率") + private Double power; + /**运行状态*/ + @Excel(name = "运行状态", width = 15) + @ApiModelProperty(value = "运行状态") + private Integer runState; + /**建造时间*/ + @Excel(name = "建造时间", width = 15) + @ApiModelProperty(value = "建造时间") + private String constructTime; + /**建造机构*/ + @Excel(name = "建造机构", width = 15) + @ApiModelProperty(value = "建造机构") + private String constructUnit; + /**运管机构*/ + @Excel(name = "运管机构", width = 15) + @ApiModelProperty(value = "运管机构") + private String operatingUnit; + /**描述*/ + @Excel(name = "描述", width = 15) + @ApiModelProperty(value = "描述") + private String description; +} diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/project/baseConfig/bizAim/bizFacilityAim/mapper/BizFacilityAimMapper.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/project/baseConfig/bizAim/bizFacilityAim/mapper/BizFacilityAimMapper.java new file mode 100644 index 00000000..ef9d4982 --- /dev/null +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/project/baseConfig/bizAim/bizFacilityAim/mapper/BizFacilityAimMapper.java @@ -0,0 +1,17 @@ +package org.jeecg.modules.project.baseConfig.bizAim.bizFacilityAim.mapper; + +import java.util.List; + +import org.apache.ibatis.annotations.Param; +import org.jeecg.modules.project.baseConfig.bizAim.bizFacilityAim.entity.BizFacilityAim; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; + +/** + * @Description: 设施目标表 + * @Author: jeecg-boot + * @Date: 2023-09-20 + * @Version: V1.0 + */ +public interface BizFacilityAimMapper extends BaseMapper { + +} diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/project/baseConfig/bizAim/bizFacilityAim/mapper/xml/BizFacilityAimMapper.xml b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/project/baseConfig/bizAim/bizFacilityAim/mapper/xml/BizFacilityAimMapper.xml new file mode 100644 index 00000000..3c5e6e51 --- /dev/null +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/project/baseConfig/bizAim/bizFacilityAim/mapper/xml/BizFacilityAimMapper.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/project/baseConfig/bizAim/bizFacilityAim/service/IBizFacilityAimService.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/project/baseConfig/bizAim/bizFacilityAim/service/IBizFacilityAimService.java new file mode 100644 index 00000000..764eda7b --- /dev/null +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/project/baseConfig/bizAim/bizFacilityAim/service/IBizFacilityAimService.java @@ -0,0 +1,14 @@ +package org.jeecg.modules.project.baseConfig.bizAim.bizFacilityAim.service; + +import org.jeecg.modules.project.baseConfig.bizAim.bizFacilityAim.entity.BizFacilityAim; +import com.baomidou.mybatisplus.extension.service.IService; + +/** + * @Description: 设施目标表 + * @Author: jeecg-boot + * @Date: 2023-09-20 + * @Version: V1.0 + */ +public interface IBizFacilityAimService extends IService { + +} diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/project/baseConfig/bizAim/bizFacilityAim/service/impl/BizFacilityAimServiceImpl.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/project/baseConfig/bizAim/bizFacilityAim/service/impl/BizFacilityAimServiceImpl.java new file mode 100644 index 00000000..77fcdd70 --- /dev/null +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/project/baseConfig/bizAim/bizFacilityAim/service/impl/BizFacilityAimServiceImpl.java @@ -0,0 +1,19 @@ +package org.jeecg.modules.project.baseConfig.bizAim.bizFacilityAim.service.impl; + +import org.jeecg.modules.project.baseConfig.bizAim.bizFacilityAim.entity.BizFacilityAim; +import org.jeecg.modules.project.baseConfig.bizAim.bizFacilityAim.mapper.BizFacilityAimMapper; +import org.jeecg.modules.project.baseConfig.bizAim.bizFacilityAim.service.IBizFacilityAimService; +import org.springframework.stereotype.Service; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; + +/** + * @Description: 设施目标表 + * @Author: jeecg-boot + * @Date: 2023-09-20 + * @Version: V1.0 + */ +@Service +public class BizFacilityAimServiceImpl extends ServiceImpl implements IBizFacilityAimService { + +} diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/project/bizEngineering/controller/BizEngineeringController.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/project/baseConfig/bizEngineering/controller/BizEngineeringController.java similarity index 91% rename from jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/project/bizEngineering/controller/BizEngineeringController.java rename to jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/project/baseConfig/bizEngineering/controller/BizEngineeringController.java index 19440885..aece28eb 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/project/bizEngineering/controller/BizEngineeringController.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/project/baseConfig/bizEngineering/controller/BizEngineeringController.java @@ -1,4 +1,4 @@ -package org.jeecg.modules.project.bizEngineering.controller; +package org.jeecg.modules.project.baseConfig.bizEngineering.controller; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import io.swagger.annotations.Api; @@ -8,11 +8,8 @@ import org.apache.shiro.SecurityUtils; import org.jeecg.common.api.vo.Result; import org.jeecg.common.aspect.annotation.AutoLog; import org.jeecg.common.system.vo.LoginUser; -import org.jeecg.common.util.RemoteExecuteCommand; -import org.jeecg.modules.project.bizEngineering.entity.BizEngineering; -import org.jeecg.modules.project.bizEngineering.service.IBizEngineeringService; -import org.jeecg.modules.project.bizWrf.entity.BizWrf; -import org.jeecg.modules.project.bizWrf.service.IBizWrfService; +import org.jeecg.modules.project.baseConfig.bizEngineering.entity.BizEngineering; +import org.jeecg.modules.project.baseConfig.bizEngineering.service.IBizEngineeringService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; import org.springframework.web.bind.annotation.*; diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/project/bizEngineering/entity/BizEngineering.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/project/baseConfig/bizEngineering/entity/BizEngineering.java similarity index 96% rename from jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/project/bizEngineering/entity/BizEngineering.java rename to jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/project/baseConfig/bizEngineering/entity/BizEngineering.java index 4d5b6da9..4ee50df5 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/project/bizEngineering/entity/BizEngineering.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/project/baseConfig/bizEngineering/entity/BizEngineering.java @@ -1,4 +1,4 @@ -package org.jeecg.modules.project.bizEngineering.entity; +package org.jeecg.modules.project.baseConfig.bizEngineering.entity; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/project/bizEngineering/mapper/BizEngineeringMapper.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/project/baseConfig/bizEngineering/mapper/BizEngineeringMapper.java similarity index 65% rename from jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/project/bizEngineering/mapper/BizEngineeringMapper.java rename to jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/project/baseConfig/bizEngineering/mapper/BizEngineeringMapper.java index 040cab30..b64682fe 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/project/bizEngineering/mapper/BizEngineeringMapper.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/project/baseConfig/bizEngineering/mapper/BizEngineeringMapper.java @@ -1,8 +1,8 @@ -package org.jeecg.modules.project.bizEngineering.mapper; +package org.jeecg.modules.project.baseConfig.bizEngineering.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Mapper; -import org.jeecg.modules.project.bizEngineering.entity.BizEngineering; +import org.jeecg.modules.project.baseConfig.bizEngineering.entity.BizEngineering; /** * @Description: wrf diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/project/bizEngineering/service/IBizEngineeringService.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/project/baseConfig/bizEngineering/service/IBizEngineeringService.java similarity index 55% rename from jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/project/bizEngineering/service/IBizEngineeringService.java rename to jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/project/baseConfig/bizEngineering/service/IBizEngineeringService.java index 17ed898c..59bb9eb6 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/project/bizEngineering/service/IBizEngineeringService.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/project/baseConfig/bizEngineering/service/IBizEngineeringService.java @@ -1,7 +1,7 @@ -package org.jeecg.modules.project.bizEngineering.service; +package org.jeecg.modules.project.baseConfig.bizEngineering.service; import com.baomidou.mybatisplus.extension.service.IService; -import org.jeecg.modules.project.bizEngineering.entity.BizEngineering; +import org.jeecg.modules.project.baseConfig.bizEngineering.entity.BizEngineering; public interface IBizEngineeringService extends IService { BizEngineering getBizEngineeringByState(); diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/project/bizEngineering/service/impl/BizEngineeringServiceImpl.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/project/baseConfig/bizEngineering/service/impl/BizEngineeringServiceImpl.java similarity index 83% rename from jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/project/bizEngineering/service/impl/BizEngineeringServiceImpl.java rename to jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/project/baseConfig/bizEngineering/service/impl/BizEngineeringServiceImpl.java index cbad4342..03a19e2c 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/project/bizEngineering/service/impl/BizEngineeringServiceImpl.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/project/baseConfig/bizEngineering/service/impl/BizEngineeringServiceImpl.java @@ -1,13 +1,12 @@ -package org.jeecg.modules.project.bizEngineering.service.impl; +package org.jeecg.modules.project.baseConfig.bizEngineering.service.impl; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import org.apache.shiro.SecurityUtils; -import org.jeecg.common.api.vo.Result; import org.jeecg.common.system.vo.LoginUser; -import org.jeecg.modules.project.bizEngineering.entity.BizEngineering; -import org.jeecg.modules.project.bizEngineering.mapper.BizEngineeringMapper; -import org.jeecg.modules.project.bizEngineering.service.IBizEngineeringService; +import org.jeecg.modules.project.baseConfig.bizEngineering.entity.BizEngineering; +import org.jeecg.modules.project.baseConfig.bizEngineering.mapper.BizEngineeringMapper; +import org.jeecg.modules.project.baseConfig.bizEngineering.service.IBizEngineeringService; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Service; diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/project/baseConfig/bizNuclide/controller/BizNuclideController.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/project/baseConfig/bizNuclide/controller/BizNuclideController.java new file mode 100644 index 00000000..c723e226 --- /dev/null +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/project/baseConfig/bizNuclide/controller/BizNuclideController.java @@ -0,0 +1,163 @@ +package org.jeecg.modules.project.baseConfig.bizNuclide.controller; + +import java.util.Arrays; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import org.jeecg.common.api.vo.Result; +import org.jeecg.common.system.query.QueryGenerator; +import org.jeecg.modules.project.baseConfig.bizNuclide.entity.BizNuclide; +import org.jeecg.modules.project.baseConfig.bizNuclide.service.IBizNuclideService; + +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.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; +import org.apache.shiro.authz.annotation.RequiresPermissions; + + /** + * @Description: 核素模块 + * @Author: jeecg-boot + * @Date: 2023-09-20 + * @Version: V1.0 + */ +@Api(tags="核素模块") +@RestController +@RequestMapping("/bizNuclide/bizNuclide") +@Slf4j +public class BizNuclideController extends JeecgController { + @Autowired + private IBizNuclideService bizNuclideService; + + /** + * 分页列表查询 + * + * @param bizNuclide + * @param pageNo + * @param pageSize + * @param req + * @return + */ + //@AutoLog(value = "核素模块-分页列表查询") + @ApiOperation(value="核素模块-分页列表查询", notes="核素模块-分页列表查询") + @GetMapping(value = "/list") + public Result> queryPageList(BizNuclide bizNuclide, + @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, + @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, + HttpServletRequest req) { + QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(bizNuclide, req.getParameterMap()); + Page page = new Page(pageNo, pageSize); + IPage pageList = bizNuclideService.page(page, queryWrapper); + return Result.OK(pageList); + } + + /** + * 添加 + * + * @param bizNuclide + * @return + */ + @AutoLog(value = "核素模块-添加") + @ApiOperation(value="核素模块-添加", notes="核素模块-添加") + @RequiresPermissions("bizNuclide:biz_nuclide:add") + @PostMapping(value = "/add") + public Result add(@RequestBody BizNuclide bizNuclide) { + bizNuclideService.save(bizNuclide); + return Result.OK("添加成功！"); + } + + /** + * 编辑 + * + * @param bizNuclide + * @return + */ + @AutoLog(value = "核素模块-编辑") + @ApiOperation(value="核素模块-编辑", notes="核素模块-编辑") + @RequiresPermissions("bizNuclide:biz_nuclide:edit") + @RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST}) + public Result edit(@RequestBody BizNuclide bizNuclide) { + bizNuclideService.updateById(bizNuclide); + return Result.OK("编辑成功!"); + } + + /** + * 通过id删除 + * + * @param id + * @return + */ + @AutoLog(value = "核素模块-通过id删除") + @ApiOperation(value="核素模块-通过id删除", notes="核素模块-通过id删除") + @RequiresPermissions("bizNuclide:biz_nuclide:delete") + @DeleteMapping(value = "/delete") + public Result delete(@RequestParam(name="id",required=true) String id) { + bizNuclideService.removeById(id); + return Result.OK("删除成功!"); + } + + /** + * 批量删除 + * + * @param ids + * @return + */ + @AutoLog(value = "核素模块-批量删除") + @ApiOperation(value="核素模块-批量删除", notes="核素模块-批量删除") + @RequiresPermissions("bizNuclide:biz_nuclide:deleteBatch") + @DeleteMapping(value = "/deleteBatch") + public Result deleteBatch(@RequestParam(name="ids",required=true) String ids) { + this.bizNuclideService.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) { + BizNuclide bizNuclide = bizNuclideService.getById(id); + if(bizNuclide==null) { + return Result.error("未找到对应数据"); + } + return Result.OK(bizNuclide); + } + + /** + * 导出excel + * + * @param request + * @param bizNuclide + */ + @RequiresPermissions("bizNuclide:biz_nuclide:exportXls") + @RequestMapping(value = "/exportXls") + public ModelAndView exportXls(HttpServletRequest request, BizNuclide bizNuclide) { + return super.exportXls(request, bizNuclide, BizNuclide.class, "核素模块"); + } + + /** + * 通过excel导入数据 + * + * @param request + * @param response + * @return + */ + @RequiresPermissions("bizNuclide:biz_nuclide:importExcel") + @RequestMapping(value = "/importExcel", method = RequestMethod.POST) + public Result importExcel(HttpServletRequest request, HttpServletResponse response) { + return super.importExcel(request, response, BizNuclide.class); + } + +} diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/project/baseConfig/bizNuclide/entity/BizNuclide.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/project/baseConfig/bizNuclide/entity/BizNuclide.java new file mode 100644 index 00000000..a3688bf3 --- /dev/null +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/project/baseConfig/bizNuclide/entity/BizNuclide.java @@ -0,0 +1,71 @@ +package org.jeecg.modules.project.baseConfig.bizNuclide.entity; + +import java.io.Serializable; +import java.io.UnsupportedEncodingException; +import java.util.Date; +import java.math.BigDecimal; +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.annotation.TableLogic; +import lombok.Data; +import com.fasterxml.jackson.annotation.JsonFormat; +import org.springframework.format.annotation.DateTimeFormat; +import org.jeecgframework.poi.excel.annotation.Excel; +import org.jeecg.common.aspect.annotation.Dict; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.EqualsAndHashCode; +import lombok.experimental.Accessors; + +/** + * @Description: 核素模块 + * @Author: jeecg-boot + * @Date: 2023-09-20 + * @Version: V1.0 + */ +@Data +@TableName("biz_nuclide") +@Accessors(chain = true) +@EqualsAndHashCode(callSuper = false) +@ApiModel(value="biz_nuclide对象", description="核素模块") +public class BizNuclide implements Serializable { + private static final long serialVersionUID = 1L; + + /**主键*/ + @TableId(type = IdType.ASSIGN_ID) + @ApiModelProperty(value = "主键") + private String id; + /**创建人*/ + @ApiModelProperty(value = "创建人") + private String createBy; + /**创建日期*/ + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") + @ApiModelProperty(value = "创建日期") + private Date createTime; + /**更新人*/ + @ApiModelProperty(value = "更新人") + private String updateBy; + /**更新日期*/ + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") + @ApiModelProperty(value = "更新日期") + private Date updateTime; + /**核素名称*/ + @Excel(name = "核素名称", width = 15) + @ApiModelProperty(value = "核素名称") + private String nuclideName; + /**Conc.[mBq/m^3]*/ + @Excel(name = "Conc.[mBq/m^3]", width = 15) + @ApiModelProperty(value = "Conc.[mBq/m^3]") + private Double conc; + /**Uncertainty*/ + @Excel(name = "Uncertainty", width = 15) + @ApiModelProperty(value = "Uncertainty") + private Double uncertainty; + /**MDC[mBq/m^3]*/ + @Excel(name = "MDC[mBq/m^3]", width = 15) + @ApiModelProperty(value = "MDC[mBq/m^3]") + private Double mdc; +} diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/project/baseConfig/bizNuclide/mapper/BizNuclideMapper.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/project/baseConfig/bizNuclide/mapper/BizNuclideMapper.java new file mode 100644 index 00000000..0933fb42 --- /dev/null +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/project/baseConfig/bizNuclide/mapper/BizNuclideMapper.java @@ -0,0 +1,17 @@ +package org.jeecg.modules.project.baseConfig.bizNuclide.mapper; + +import java.util.List; + +import org.apache.ibatis.annotations.Param; +import org.jeecg.modules.project.baseConfig.bizNuclide.entity.BizNuclide; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; + +/** + * @Description: 核素模块 + * @Author: jeecg-boot + * @Date: 2023-09-20 + * @Version: V1.0 + */ +public interface BizNuclideMapper extends BaseMapper { + +} diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/project/bizOpenfoam/mapper/xml/BizOpenfoamMapper.xml b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/project/baseConfig/bizNuclide/mapper/xml/BizNuclideMapper.xml similarity index 62% rename from jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/project/bizOpenfoam/mapper/xml/BizOpenfoamMapper.xml rename to jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/project/baseConfig/bizNuclide/mapper/xml/BizNuclideMapper.xml index b2a285ec..b0d5f714 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/project/bizOpenfoam/mapper/xml/BizOpenfoamMapper.xml +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/project/baseConfig/bizNuclide/mapper/xml/BizNuclideMapper.xml @@ -1,5 +1,5 @@ - + \ No newline at end of file diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/project/baseConfig/bizNuclide/service/IBizNuclideService.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/project/baseConfig/bizNuclide/service/IBizNuclideService.java new file mode 100644 index 00000000..c5fb34e2 --- /dev/null +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/project/baseConfig/bizNuclide/service/IBizNuclideService.java @@ -0,0 +1,14 @@ +package org.jeecg.modules.project.baseConfig.bizNuclide.service; + +import org.jeecg.modules.project.baseConfig.bizNuclide.entity.BizNuclide; +import com.baomidou.mybatisplus.extension.service.IService; + +/** + * @Description: 核素模块 + * @Author: jeecg-boot + * @Date: 2023-09-20 + * @Version: V1.0 + */ +public interface IBizNuclideService extends IService { + +} diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/project/baseConfig/bizNuclide/service/impl/BizNuclideServiceImpl.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/project/baseConfig/bizNuclide/service/impl/BizNuclideServiceImpl.java new file mode 100644 index 00000000..7916d1a7 --- /dev/null +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/project/baseConfig/bizNuclide/service/impl/BizNuclideServiceImpl.java @@ -0,0 +1,19 @@ +package org.jeecg.modules.project.baseConfig.bizNuclide.service.impl; + +import org.jeecg.modules.project.baseConfig.bizNuclide.entity.BizNuclide; +import org.jeecg.modules.project.baseConfig.bizNuclide.mapper.BizNuclideMapper; +import org.jeecg.modules.project.baseConfig.bizNuclide.service.IBizNuclideService; +import org.springframework.stereotype.Service; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; + +/** + * @Description: 核素模块 + * @Author: jeecg-boot + * @Date: 2023-09-20 + * @Version: V1.0 + */ +@Service +public class BizNuclideServiceImpl extends ServiceImpl implements IBizNuclideService { + +} diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/project/baseConfig/bizTopography/bizTopographyInfo/controller/BizTopographyInfoController.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/project/baseConfig/bizTopography/bizTopographyInfo/controller/BizTopographyInfoController.java new file mode 100644 index 00000000..a722e706 --- /dev/null +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/project/baseConfig/bizTopography/bizTopographyInfo/controller/BizTopographyInfoController.java @@ -0,0 +1,163 @@ +package org.jeecg.modules.project.baseConfig.bizTopography.bizTopographyInfo.controller; + +import java.util.Arrays; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import org.jeecg.common.api.vo.Result; +import org.jeecg.common.system.query.QueryGenerator; +import org.jeecg.modules.project.baseConfig.bizTopography.bizTopographyInfo.entity.BizTopographyInfo; +import org.jeecg.modules.project.baseConfig.bizTopography.bizTopographyInfo.service.IBizTopographyInfoService; + +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.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; +import org.apache.shiro.authz.annotation.RequiresPermissions; + + /** + * @Description: 地形信息管理表 + * @Author: jeecg-boot + * @Date: 2023-09-19 + * @Version: V1.0 + */ +@Api(tags="地形信息管理表") +@RestController +@RequestMapping("/bizTopographyInfo/bizTopographyInfo") +@Slf4j +public class BizTopographyInfoController extends JeecgController { + @Autowired + private IBizTopographyInfoService bizTopographyInfoService; + + /** + * 分页列表查询 + * + * @param bizTopographyInfo + * @param pageNo + * @param pageSize + * @param req + * @return + */ + //@AutoLog(value = "地形信息管理表-分页列表查询") + @ApiOperation(value="地形信息管理表-分页列表查询", notes="地形信息管理表-分页列表查询") + @GetMapping(value = "/list") + public Result> queryPageList(BizTopographyInfo bizTopographyInfo, + @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, + @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, + HttpServletRequest req) { + QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(bizTopographyInfo, req.getParameterMap()); + Page page = new Page(pageNo, pageSize); + IPage pageList = bizTopographyInfoService.page(page, queryWrapper); + return Result.OK(pageList); + } + + /** + * 添加 + * + * @param bizTopographyInfo + * @return + */ + @AutoLog(value = "地形信息管理表-添加") + @ApiOperation(value="地形信息管理表-添加", notes="地形信息管理表-添加") + @RequiresPermissions("bizTopographyInfo:biz_topography_info:add") + @PostMapping(value = "/add") + public Result add(@RequestBody BizTopographyInfo bizTopographyInfo) { + bizTopographyInfoService.save(bizTopographyInfo); + return Result.OK("添加成功！"); + } + + /** + * 编辑 + * + * @param bizTopographyInfo + * @return + */ + @AutoLog(value = "地形信息管理表-编辑") + @ApiOperation(value="地形信息管理表-编辑", notes="地形信息管理表-编辑") + @RequiresPermissions("bizTopographyInfo:biz_topography_info:edit") + @RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST}) + public Result edit(@RequestBody BizTopographyInfo bizTopographyInfo) { + bizTopographyInfoService.updateById(bizTopographyInfo); + return Result.OK("编辑成功!"); + } + + /** + * 通过id删除 + * + * @param id + * @return + */ + @AutoLog(value = "地形信息管理表-通过id删除") + @ApiOperation(value="地形信息管理表-通过id删除", notes="地形信息管理表-通过id删除") + @RequiresPermissions("bizTopographyInfo:biz_topography_info:delete") + @DeleteMapping(value = "/delete") + public Result delete(@RequestParam(name="id",required=true) String id) { + bizTopographyInfoService.removeById(id); + return Result.OK("删除成功!"); + } + + /** + * 批量删除 + * + * @param ids + * @return + */ + @AutoLog(value = "地形信息管理表-批量删除") + @ApiOperation(value="地形信息管理表-批量删除", notes="地形信息管理表-批量删除") + @RequiresPermissions("bizTopographyInfo:biz_topography_info:deleteBatch") + @DeleteMapping(value = "/deleteBatch") + public Result deleteBatch(@RequestParam(name="ids",required=true) String ids) { + this.bizTopographyInfoService.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) { + BizTopographyInfo bizTopographyInfo = bizTopographyInfoService.getById(id); + if(bizTopographyInfo==null) { + return Result.error("未找到对应数据"); + } + return Result.OK(bizTopographyInfo); + } + + /** + * 导出excel + * + * @param request + * @param bizTopographyInfo + */ + @RequiresPermissions("bizTopographyInfo:biz_topography_info:exportXls") + @RequestMapping(value = "/exportXls") + public ModelAndView exportXls(HttpServletRequest request, BizTopographyInfo bizTopographyInfo) { + return super.exportXls(request, bizTopographyInfo, BizTopographyInfo.class, "地形信息管理表"); + } + + /** + * 通过excel导入数据 + * + * @param request + * @param response + * @return + */ + @RequiresPermissions("bizTopographyInfo:biz_topography_info:importExcel") + @RequestMapping(value = "/importExcel", method = RequestMethod.POST) + public Result importExcel(HttpServletRequest request, HttpServletResponse response) { + return super.importExcel(request, response, BizTopographyInfo.class); + } + +} diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/project/baseConfig/bizTopography/bizTopographyInfo/entity/BizTopographyInfo.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/project/baseConfig/bizTopography/bizTopographyInfo/entity/BizTopographyInfo.java new file mode 100644 index 00000000..bc812218 --- /dev/null +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/project/baseConfig/bizTopography/bizTopographyInfo/entity/BizTopographyInfo.java @@ -0,0 +1,64 @@ +package org.jeecg.modules.project.baseConfig.bizTopography.bizTopographyInfo.entity; + +import java.io.Serializable; +import java.util.Date; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; +import com.fasterxml.jackson.annotation.JsonFormat; +import org.springframework.format.annotation.DateTimeFormat; +import org.jeecgframework.poi.excel.annotation.Excel; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.EqualsAndHashCode; +import lombok.experimental.Accessors; + +/** + * @Description: 地形信息管理表 + * @Author: jeecg-boot + * @Date: 2023-09-19 + * @Version: V1.0 + */ +@Data +@TableName("biz_topography_info") +@Accessors(chain = true) +@EqualsAndHashCode(callSuper = false) +@ApiModel(value="biz_topography_info对象", description="地形信息管理表") +public class BizTopographyInfo implements Serializable { + private static final long serialVersionUID = 1L; + + /**主键*/ + @TableId(type = IdType.ASSIGN_ID) + @ApiModelProperty(value = "主键") + private String id; + /**创建人*/ + @ApiModelProperty(value = "创建人") + private String createBy; + /**创建日期*/ + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") + @ApiModelProperty(value = "创建日期") + private Date createTime; + /**更新人*/ + @ApiModelProperty(value = "更新人") + private String updateBy; + /**更新日期*/ + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") + @ApiModelProperty(value = "更新日期") + private Date updateTime; + /**地形名称*/ + @Excel(name = "地形名称", width = 15) + @ApiModelProperty(value = "地形名称") + private String topographyName; + /**地形文件路径*/ + @Excel(name = "地形文件路径", width = 15) + @ApiModelProperty(value = "地形文件路径") + private String topographyPath; + /**备注*/ + @Excel(name = "备注", width = 15) + @ApiModelProperty(value = "备注") + private String remark; +} diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/project/baseConfig/bizTopography/bizTopographyInfo/mapper/BizTopographyInfoMapper.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/project/baseConfig/bizTopography/bizTopographyInfo/mapper/BizTopographyInfoMapper.java new file mode 100644 index 00000000..bcf55b36 --- /dev/null +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/project/baseConfig/bizTopography/bizTopographyInfo/mapper/BizTopographyInfoMapper.java @@ -0,0 +1,14 @@ +package org.jeecg.modules.project.baseConfig.bizTopography.bizTopographyInfo.mapper; + +import org.jeecg.modules.project.baseConfig.bizTopography.bizTopographyInfo.entity.BizTopographyInfo; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; + +/** + * @Description: 地形信息管理表 + * @Author: jeecg-boot + * @Date: 2023-09-19 + * @Version: V1.0 + */ +public interface BizTopographyInfoMapper extends BaseMapper { + +} diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/project/baseConfig/bizTopography/bizTopographyInfo/mapper/xml/BizTopographyInfoMapper.xml b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/project/baseConfig/bizTopography/bizTopographyInfo/mapper/xml/BizTopographyInfoMapper.xml new file mode 100644 index 00000000..7e653490 --- /dev/null +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/project/baseConfig/bizTopography/bizTopographyInfo/mapper/xml/BizTopographyInfoMapper.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/project/baseConfig/bizTopography/bizTopographyInfo/service/IBizTopographyInfoService.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/project/baseConfig/bizTopography/bizTopographyInfo/service/IBizTopographyInfoService.java new file mode 100644 index 00000000..7f01a393 --- /dev/null +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/project/baseConfig/bizTopography/bizTopographyInfo/service/IBizTopographyInfoService.java @@ -0,0 +1,14 @@ +package org.jeecg.modules.project.baseConfig.bizTopography.bizTopographyInfo.service; + +import org.jeecg.modules.project.baseConfig.bizTopography.bizTopographyInfo.entity.BizTopographyInfo; +import com.baomidou.mybatisplus.extension.service.IService; + +/** + * @Description: 地形信息管理表 + * @Author: jeecg-boot + * @Date: 2023-09-19 + * @Version: V1.0 + */ +public interface IBizTopographyInfoService extends IService { + +} diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/project/baseConfig/bizTopography/bizTopographyInfo/service/impl/BizTopographyInfoServiceImpl.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/project/baseConfig/bizTopography/bizTopographyInfo/service/impl/BizTopographyInfoServiceImpl.java new file mode 100644 index 00000000..aba4fe2e --- /dev/null +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/project/baseConfig/bizTopography/bizTopographyInfo/service/impl/BizTopographyInfoServiceImpl.java @@ -0,0 +1,19 @@ +package org.jeecg.modules.project.baseConfig.bizTopography.bizTopographyInfo.service.impl; + +import org.jeecg.modules.project.baseConfig.bizTopography.bizTopographyInfo.entity.BizTopographyInfo; +import org.jeecg.modules.project.baseConfig.bizTopography.bizTopographyInfo.mapper.BizTopographyInfoMapper; +import org.jeecg.modules.project.baseConfig.bizTopography.bizTopographyInfo.service.IBizTopographyInfoService; +import org.springframework.stereotype.Service; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; + +/** + * @Description: 地形信息管理表 + * @Author: jeecg-boot + * @Date: 2023-09-19 + * @Version: V1.0 + */ +@Service +public class BizTopographyInfoServiceImpl extends ServiceImpl implements IBizTopographyInfoService { + +} diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/project/bizUploadFile/controller/BizUpdateFileController.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/project/baseConfig/bizUploadFile/controller/BizUpdateFileController.java similarity index 90% rename from jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/project/bizUploadFile/controller/BizUpdateFileController.java rename to jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/project/baseConfig/bizUploadFile/controller/BizUpdateFileController.java index 107c307a..bb544abc 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/project/bizUploadFile/controller/BizUpdateFileController.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/project/baseConfig/bizUploadFile/controller/BizUpdateFileController.java @@ -1,4 +1,4 @@ -package org.jeecg.modules.project.bizUploadFile.controller; +package org.jeecg.modules.project.baseConfig.bizUploadFile.controller; import cn.hutool.core.io.FileUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; @@ -7,23 +7,13 @@ import lombok.extern.slf4j.Slf4j; import org.apache.shiro.SecurityUtils; import org.jeecg.common.system.base.controller.JeecgController; import org.jeecg.common.system.vo.LoginUser; -import org.jeecg.modules.project.bizUploadFile.entity.BizUploadFile; -import org.jeecg.modules.project.bizUploadFile.service.BizUploadFileService; +import org.jeecg.modules.project.baseConfig.bizUploadFile.entity.BizUploadFile; +import org.jeecg.modules.project.baseConfig.bizUploadFile.service.BizUploadFileService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; import org.springframework.beans.factory.annotation.Value; import org.springframework.web.multipart.MultipartFile; -import java.io.BufferedOutputStream; -import java.io.FileOutputStream; -import java.io.IOException; -import java.io.InputStream; -import java.net.HttpURLConnection; -import java.net.MalformedURLException; -import java.net.ProtocolException; -import java.net.URL; -import java.text.SimpleDateFormat; -import java.util.Date; import java.util.List; /** diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/project/bizUploadFile/entity/BizUploadFile.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/project/baseConfig/bizUploadFile/entity/BizUploadFile.java similarity index 93% rename from jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/project/bizUploadFile/entity/BizUploadFile.java rename to jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/project/baseConfig/bizUploadFile/entity/BizUploadFile.java index f7846f22..f429acc9 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/project/bizUploadFile/entity/BizUploadFile.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/project/baseConfig/bizUploadFile/entity/BizUploadFile.java @@ -1,10 +1,9 @@ -package org.jeecg.modules.project.bizUploadFile.entity; +package org.jeecg.modules.project.baseConfig.bizUploadFile.entity; import com.alibaba.fastjson.annotation.JSONField; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; import com.fasterxml.jackson.annotation.JsonFormat; import lombok.Data; import lombok.EqualsAndHashCode; diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/project/baseConfig/bizUploadFile/mapper/BizUploadFileMapper.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/project/baseConfig/bizUploadFile/mapper/BizUploadFileMapper.java new file mode 100644 index 00000000..1cbb5496 --- /dev/null +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/project/baseConfig/bizUploadFile/mapper/BizUploadFileMapper.java @@ -0,0 +1,7 @@ +package org.jeecg.modules.project.baseConfig.bizUploadFile.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.jeecg.modules.project.baseConfig.bizUploadFile.entity.BizUploadFile; + +public interface BizUploadFileMapper extends BaseMapper { +} diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/project/bizUploadFile/service/BizUploadFileService.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/project/baseConfig/bizUploadFile/service/BizUploadFileService.java similarity index 67% rename from jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/project/bizUploadFile/service/BizUploadFileService.java rename to jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/project/baseConfig/bizUploadFile/service/BizUploadFileService.java index e77ccbc4..3086c448 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/project/bizUploadFile/service/BizUploadFileService.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/project/baseConfig/bizUploadFile/service/BizUploadFileService.java @@ -1,7 +1,7 @@ -package org.jeecg.modules.project.bizUploadFile.service; +package org.jeecg.modules.project.baseConfig.bizUploadFile.service; import com.baomidou.mybatisplus.extension.service.IService; -import org.jeecg.modules.project.bizUploadFile.entity.BizUploadFile; +import org.jeecg.modules.project.baseConfig.bizUploadFile.entity.BizUploadFile; import org.springframework.web.multipart.MultipartFile; import java.util.List; diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/project/bizUploadFile/service/impl/BizUploadFileServiceImpl.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/project/baseConfig/bizUploadFile/service/impl/BizUploadFileServiceImpl.java similarity index 90% rename from jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/project/bizUploadFile/service/impl/BizUploadFileServiceImpl.java rename to jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/project/baseConfig/bizUploadFile/service/impl/BizUploadFileServiceImpl.java index 56819cb6..b6bf4033 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/project/bizUploadFile/service/impl/BizUploadFileServiceImpl.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/project/baseConfig/bizUploadFile/service/impl/BizUploadFileServiceImpl.java @@ -1,11 +1,11 @@ -package org.jeecg.modules.project.bizUploadFile.service.impl; +package org.jeecg.modules.project.baseConfig.bizUploadFile.service.impl; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import org.apache.commons.io.IOUtils; -import org.jeecg.modules.project.bizUploadFile.entity.BizUploadFile; -import org.jeecg.modules.project.bizUploadFile.mapper.BizUploadFileMapper; -import org.jeecg.modules.project.bizUploadFile.service.BizUploadFileService; +import org.jeecg.modules.project.baseConfig.bizUploadFile.entity.BizUploadFile; +import org.jeecg.modules.project.baseConfig.bizUploadFile.mapper.BizUploadFileMapper; +import org.jeecg.modules.project.baseConfig.bizUploadFile.service.BizUploadFileService; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/project/baseConfig/bizWeapon/controller/BizWeaponController.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/project/baseConfig/bizWeapon/controller/BizWeaponController.java new file mode 100644 index 00000000..c7248d90 --- /dev/null +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/project/baseConfig/bizWeapon/controller/BizWeaponController.java @@ -0,0 +1,163 @@ +package org.jeecg.modules.project.baseConfig.bizWeapon.controller; + +import java.util.Arrays; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import org.jeecg.common.api.vo.Result; +import org.jeecg.common.system.query.QueryGenerator; +import org.jeecg.modules.project.baseConfig.bizWeapon.entity.BizWeapon; +import org.jeecg.modules.project.baseConfig.bizWeapon.service.IBizWeaponService; + +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.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; +import org.apache.shiro.authz.annotation.RequiresPermissions; + + /** + * @Description: WQ类型数据管理表 + * @Author: jeecg-boot + * @Date: 2023-09-19 + * @Version: V1.0 + */ +@Api(tags="WQ类型数据管理表") +@RestController +@RequestMapping("/bizWeapon/bizWeapon") +@Slf4j +public class BizWeaponController extends JeecgController { + @Autowired + private IBizWeaponService bizWeaponService; + + /** + * 分页列表查询 + * + * @param bizWeapon + * @param pageNo + * @param pageSize + * @param req + * @return + */ + //@AutoLog(value = "WQ类型数据管理表-分页列表查询") + @ApiOperation(value="WQ类型数据管理表-分页列表查询", notes="WQ类型数据管理表-分页列表查询") + @GetMapping(value = "/list") + public Result> queryPageList(BizWeapon bizWeapon, + @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, + @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, + HttpServletRequest req) { + QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(bizWeapon, req.getParameterMap()); + Page page = new Page(pageNo, pageSize); + IPage pageList = bizWeaponService.page(page, queryWrapper); + return Result.OK(pageList); + } + + /** + * 添加 + * + * @param bizWeapon + * @return + */ + @AutoLog(value = "WQ类型数据管理表-添加") + @ApiOperation(value="WQ类型数据管理表-添加", notes="WQ类型数据管理表-添加") + @RequiresPermissions("bizWeapon:biz_weapon:add") + @PostMapping(value = "/add") + public Result add(@RequestBody BizWeapon bizWeapon) { + bizWeaponService.save(bizWeapon); + return Result.OK("添加成功！"); + } + + /** + * 编辑 + * + * @param bizWeapon + * @return + */ + @AutoLog(value = "WQ类型数据管理表-编辑") + @ApiOperation(value="WQ类型数据管理表-编辑", notes="WQ类型数据管理表-编辑") + @RequiresPermissions("bizWeapon:biz_weapon:edit") + @RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST}) + public Result edit(@RequestBody BizWeapon bizWeapon) { + bizWeaponService.updateById(bizWeapon); + return Result.OK("编辑成功!"); + } + + /** + * 通过id删除 + * + * @param id + * @return + */ + @AutoLog(value = "WQ类型数据管理表-通过id删除") + @ApiOperation(value="WQ类型数据管理表-通过id删除", notes="WQ类型数据管理表-通过id删除") + @RequiresPermissions("bizWeapon:biz_weapon:delete") + @DeleteMapping(value = "/delete") + public Result delete(@RequestParam(name="id",required=true) String id) { + bizWeaponService.removeById(id); + return Result.OK("删除成功!"); + } + + /** + * 批量删除 + * + * @param ids + * @return + */ + @AutoLog(value = "WQ类型数据管理表-批量删除") + @ApiOperation(value="WQ类型数据管理表-批量删除", notes="WQ类型数据管理表-批量删除") + @RequiresPermissions("bizWeapon:biz_weapon:deleteBatch") + @DeleteMapping(value = "/deleteBatch") + public Result deleteBatch(@RequestParam(name="ids",required=true) String ids) { + this.bizWeaponService.removeByIds(Arrays.asList(ids.split(","))); + return Result.OK("批量删除成功!"); + } + + /** + * 通过id查询 + * + * @param id + * @return + */ + //@AutoLog(value = "WQ类型数据管理表-通过id查询") + @ApiOperation(value="WQ类型数据管理表-通过id查询", notes="WQ类型数据管理表-通过id查询") + @GetMapping(value = "/queryById") + public Result queryById(@RequestParam(name="id",required=true) String id) { + BizWeapon bizWeapon = bizWeaponService.getById(id); + if(bizWeapon==null) { + return Result.error("未找到对应数据"); + } + return Result.OK(bizWeapon); + } + + /** + * 导出excel + * + * @param request + * @param bizWeapon + */ + @RequiresPermissions("bizWeapon:biz_weapon:exportXls") + @RequestMapping(value = "/exportXls") + public ModelAndView exportXls(HttpServletRequest request, BizWeapon bizWeapon) { + return super.exportXls(request, bizWeapon, BizWeapon.class, "WQ类型数据管理表"); + } + + /** + * 通过excel导入数据 + * + * @param request + * @param response + * @return + */ + @RequiresPermissions("bizWeapon:biz_weapon:importExcel") + @RequestMapping(value = "/importExcel", method = RequestMethod.POST) + public Result importExcel(HttpServletRequest request, HttpServletResponse response) { + return super.importExcel(request, response, BizWeapon.class); + } + +} diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/project/baseConfig/bizWeapon/entity/BizWeapon.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/project/baseConfig/bizWeapon/entity/BizWeapon.java new file mode 100644 index 00000000..75020b4c --- /dev/null +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/project/baseConfig/bizWeapon/entity/BizWeapon.java @@ -0,0 +1,68 @@ +package org.jeecg.modules.project.baseConfig.bizWeapon.entity; + +import java.io.Serializable; +import java.util.Date; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; +import com.fasterxml.jackson.annotation.JsonFormat; +import org.springframework.format.annotation.DateTimeFormat; +import org.jeecgframework.poi.excel.annotation.Excel; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.EqualsAndHashCode; +import lombok.experimental.Accessors; + +/** + * @Description: WQ类型数据管理表 + * @Author: jeecg-boot + * @Date: 2023-09-19 + * @Version: V1.0 + */ +@Data +@TableName("biz_weapon") +@Accessors(chain = true) +@EqualsAndHashCode(callSuper = false) +@ApiModel(value="biz_weapon对象", description="WQ类型数据管理表") +public class BizWeapon implements Serializable { + private static final long serialVersionUID = 1L; + + /**主键*/ + @TableId(type = IdType.ASSIGN_ID) + @ApiModelProperty(value = "主键") + private String id; + /**创建人*/ + @ApiModelProperty(value = "创建人") + private String createBy; + /**创建日期*/ + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") + @ApiModelProperty(value = "创建日期") + private Date createTime; + /**更新人*/ + @ApiModelProperty(value = "更新人") + private String updateBy; + /**更新日期*/ + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") + @ApiModelProperty(value = "更新日期") + private Date updateTime; + /**WQ名称*/ + @Excel(name = "WQ名称", width = 15) + @ApiModelProperty(value = "WQ名称") + private String weaponName; + /**裂变材料*/ + @Excel(name = "裂变材料", width = 15) + @ApiModelProperty(value = "裂变材料") + private String fission; + /**分凝温度*/ + @Excel(name = "分凝温度", width = 15) + @ApiModelProperty(value = "分凝温度") + private Integer condensationT; + /**分凝时间*/ + @Excel(name = "分凝时间", width = 15) + @ApiModelProperty(value = "分凝时间") + private Integer condensationTime; +} diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/project/baseConfig/bizWeapon/mapper/BizWeaponMapper.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/project/baseConfig/bizWeapon/mapper/BizWeaponMapper.java new file mode 100644 index 00000000..a6f88f5f --- /dev/null +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/project/baseConfig/bizWeapon/mapper/BizWeaponMapper.java @@ -0,0 +1,14 @@ +package org.jeecg.modules.project.baseConfig.bizWeapon.mapper; + +import org.jeecg.modules.project.baseConfig.bizWeapon.entity.BizWeapon; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; + +/** + * @Description: WQ类型数据管理表 + * @Author: jeecg-boot + * @Date: 2023-09-19 + * @Version: V1.0 + */ +public interface BizWeaponMapper extends BaseMapper { + +} diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/project/baseConfig/bizWeapon/mapper/xml/BizWeaponMapper.xml b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/project/baseConfig/bizWeapon/mapper/xml/BizWeaponMapper.xml new file mode 100644 index 00000000..fe62e3c3 --- /dev/null +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/project/baseConfig/bizWeapon/mapper/xml/BizWeaponMapper.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/project/baseConfig/bizWeapon/service/IBizWeaponService.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/project/baseConfig/bizWeapon/service/IBizWeaponService.java new file mode 100644 index 00000000..840b0add --- /dev/null +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/project/baseConfig/bizWeapon/service/IBizWeaponService.java @@ -0,0 +1,14 @@ +package org.jeecg.modules.project.baseConfig.bizWeapon.service; + +import org.jeecg.modules.project.baseConfig.bizWeapon.entity.BizWeapon; +import com.baomidou.mybatisplus.extension.service.IService; + +/** + * @Description: WQ类型数据管理表 + * @Author: jeecg-boot + * @Date: 2023-09-19 + * @Version: V1.0 + */ +public interface IBizWeaponService extends IService { + +} diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/project/baseConfig/bizWeapon/service/impl/BizWeaponServiceImpl.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/project/baseConfig/bizWeapon/service/impl/BizWeaponServiceImpl.java new file mode 100644 index 00000000..14f59b0c --- /dev/null +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/project/baseConfig/bizWeapon/service/impl/BizWeaponServiceImpl.java @@ -0,0 +1,19 @@ +package org.jeecg.modules.project.baseConfig.bizWeapon.service.impl; + +import org.jeecg.modules.project.baseConfig.bizWeapon.entity.BizWeapon; +import org.jeecg.modules.project.baseConfig.bizWeapon.mapper.BizWeaponMapper; +import org.jeecg.modules.project.baseConfig.bizWeapon.service.IBizWeaponService; +import org.springframework.stereotype.Service; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; + +/** + * @Description: WQ类型数据管理表 + * @Author: jeecg-boot + * @Date: 2023-09-19 + * @Version: V1.0 + */ +@Service +public class BizWeaponServiceImpl extends ServiceImpl implements IBizWeaponService { + +} diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/project/baseConfig/equipment/bizEquipmentMotor/controller/BizEquipmentMotorController.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/project/baseConfig/equipment/bizEquipmentMotor/controller/BizEquipmentMotorController.java new file mode 100644 index 00000000..8409ee68 --- /dev/null +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/project/baseConfig/equipment/bizEquipmentMotor/controller/BizEquipmentMotorController.java @@ -0,0 +1,163 @@ +package org.jeecg.modules.project.baseConfig.equipment.bizEquipmentMotor.controller; + +import java.util.Arrays; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import org.jeecg.common.api.vo.Result; +import org.jeecg.common.system.query.QueryGenerator; +import org.jeecg.modules.project.baseConfig.equipment.bizEquipmentMotor.entity.BizEquipmentMotor; +import org.jeecg.modules.project.baseConfig.equipment.bizEquipmentMotor.service.IBizEquipmentMotorService; + +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.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; +import org.apache.shiro.authz.annotation.RequiresPermissions; + + /** + * @Description: 机动装备表 + * @Author: jeecg-boot + * @Date: 2023-09-20 + * @Version: V1.0 + */ +@Api(tags="机动装备表") +@RestController +@RequestMapping("/bizEquipmentMotor/bizEquipmentMotor") +@Slf4j +public class BizEquipmentMotorController extends JeecgController { + @Autowired + private IBizEquipmentMotorService bizEquipmentMotorService; + + /** + * 分页列表查询 + * + * @param bizEquipmentMotor + * @param pageNo + * @param pageSize + * @param req + * @return + */ + //@AutoLog(value = "机动装备表-分页列表查询") + @ApiOperation(value="机动装备表-分页列表查询", notes="机动装备表-分页列表查询") + @GetMapping(value = "/list") + public Result> queryPageList(BizEquipmentMotor bizEquipmentMotor, + @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, + @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, + HttpServletRequest req) { + QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(bizEquipmentMotor, req.getParameterMap()); + Page page = new Page(pageNo, pageSize); + IPage pageList = bizEquipmentMotorService.page(page, queryWrapper); + return Result.OK(pageList); + } + + /** + * 添加 + * + * @param bizEquipmentMotor + * @return + */ + @AutoLog(value = "机动装备表-添加") + @ApiOperation(value="机动装备表-添加", notes="机动装备表-添加") + @RequiresPermissions("bizEquipmentMotor:biz_equipment_motor:add") + @PostMapping(value = "/add") + public Result add(@RequestBody BizEquipmentMotor bizEquipmentMotor) { + bizEquipmentMotorService.save(bizEquipmentMotor); + return Result.OK("添加成功！"); + } + + /** + * 编辑 + * + * @param bizEquipmentMotor + * @return + */ + @AutoLog(value = "机动装备表-编辑") + @ApiOperation(value="机动装备表-编辑", notes="机动装备表-编辑") + @RequiresPermissions("bizEquipmentMotor:biz_equipment_motor:edit") + @RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST}) + public Result edit(@RequestBody BizEquipmentMotor bizEquipmentMotor) { + bizEquipmentMotorService.updateById(bizEquipmentMotor); + return Result.OK("编辑成功!"); + } + + /** + * 通过id删除 + * + * @param id + * @return + */ + @AutoLog(value = "机动装备表-通过id删除") + @ApiOperation(value="机动装备表-通过id删除", notes="机动装备表-通过id删除") + @RequiresPermissions("bizEquipmentMotor:biz_equipment_motor:delete") + @DeleteMapping(value = "/delete") + public Result delete(@RequestParam(name="id",required=true) String id) { + bizEquipmentMotorService.removeById(id); + return Result.OK("删除成功!"); + } + + /** + * 批量删除 + * + * @param ids + * @return + */ + @AutoLog(value = "机动装备表-批量删除") + @ApiOperation(value="机动装备表-批量删除", notes="机动装备表-批量删除") + @RequiresPermissions("bizEquipmentMotor:biz_equipment_motor:deleteBatch") + @DeleteMapping(value = "/deleteBatch") + public Result deleteBatch(@RequestParam(name="ids",required=true) String ids) { + this.bizEquipmentMotorService.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) { + BizEquipmentMotor bizEquipmentMotor = bizEquipmentMotorService.getById(id); + if(bizEquipmentMotor==null) { + return Result.error("未找到对应数据"); + } + return Result.OK(bizEquipmentMotor); + } + + /** + * 导出excel + * + * @param request + * @param bizEquipmentMotor + */ + @RequiresPermissions("bizEquipmentMotor:biz_equipment_motor:exportXls") + @RequestMapping(value = "/exportXls") + public ModelAndView exportXls(HttpServletRequest request, BizEquipmentMotor bizEquipmentMotor) { + return super.exportXls(request, bizEquipmentMotor, BizEquipmentMotor.class, "机动装备表"); + } + + /** + * 通过excel导入数据 + * + * @param request + * @param response + * @return + */ + @RequiresPermissions("bizEquipmentMotor:biz_equipment_motor:importExcel") + @RequestMapping(value = "/importExcel", method = RequestMethod.POST) + public Result importExcel(HttpServletRequest request, HttpServletResponse response) { + return super.importExcel(request, response, BizEquipmentMotor.class); + } + +} diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/project/baseConfig/equipment/bizEquipmentMotor/entity/BizEquipmentMotor.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/project/baseConfig/equipment/bizEquipmentMotor/entity/BizEquipmentMotor.java new file mode 100644 index 00000000..df82c8cc --- /dev/null +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/project/baseConfig/equipment/bizEquipmentMotor/entity/BizEquipmentMotor.java @@ -0,0 +1,68 @@ +package org.jeecg.modules.project.baseConfig.equipment.bizEquipmentMotor.entity; + +import java.io.Serializable; +import java.util.Date; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; +import com.fasterxml.jackson.annotation.JsonFormat; +import org.springframework.format.annotation.DateTimeFormat; +import org.jeecgframework.poi.excel.annotation.Excel; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.EqualsAndHashCode; +import lombok.experimental.Accessors; + +/** + * @Description: 机动装备表 + * @Author: jeecg-boot + * @Date: 2023-09-20 + * @Version: V1.0 + */ +@Data +@TableName("biz_equipment_motor") +@Accessors(chain = true) +@EqualsAndHashCode(callSuper = false) +@ApiModel(value="biz_equipment_motor对象", description="机动装备表") +public class BizEquipmentMotor implements Serializable { + private static final long serialVersionUID = 1L; + + /**主键*/ + @TableId(type = IdType.ASSIGN_ID) + @ApiModelProperty(value = "主键") + private String id; + /**创建人*/ + @ApiModelProperty(value = "创建人") + private String createBy; + /**创建日期*/ + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") + @ApiModelProperty(value = "创建日期") + private Date createTime; + /**更新人*/ + @ApiModelProperty(value = "更新人") + private String updateBy; + /**更新日期*/ + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") + @ApiModelProperty(value = "更新日期") + private Date updateTime; + /**机动装备名称*/ + @Excel(name = "机动装备名称", width = 15) + @ApiModelProperty(value = "机动装备名称") + private String motorName; + /**机动装备类型*/ + @Excel(name = "机动装备类型", width = 15) + @ApiModelProperty(value = "机动装备类型") + private Integer motorType; + /**速度*/ + @Excel(name = "速度", width = 15) + @ApiModelProperty(value = "速度") + private Double speed; + /**备注*/ + @Excel(name = "备注", width = 15) + @ApiModelProperty(value = "备注") + private String remark; +} diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/project/baseConfig/equipment/bizEquipmentMotor/mapper/BizEquipmentMotorMapper.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/project/baseConfig/equipment/bizEquipmentMotor/mapper/BizEquipmentMotorMapper.java new file mode 100644 index 00000000..4b169384 --- /dev/null +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/project/baseConfig/equipment/bizEquipmentMotor/mapper/BizEquipmentMotorMapper.java @@ -0,0 +1,14 @@ +package org.jeecg.modules.project.baseConfig.equipment.bizEquipmentMotor.mapper; + +import org.jeecg.modules.project.baseConfig.equipment.bizEquipmentMotor.entity.BizEquipmentMotor; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; + +/** + * @Description: 机动装备表 + * @Author: jeecg-boot + * @Date: 2023-09-20 + * @Version: V1.0 + */ +public interface BizEquipmentMotorMapper extends BaseMapper { + +} diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/project/baseConfig/equipment/bizEquipmentMotor/mapper/xml/BizEquipmentMotorMapper.xml b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/project/baseConfig/equipment/bizEquipmentMotor/mapper/xml/BizEquipmentMotorMapper.xml new file mode 100644 index 00000000..18f02a1a --- /dev/null +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/project/baseConfig/equipment/bizEquipmentMotor/mapper/xml/BizEquipmentMotorMapper.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/project/baseConfig/equipment/bizEquipmentMotor/service/IBizEquipmentMotorService.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/project/baseConfig/equipment/bizEquipmentMotor/service/IBizEquipmentMotorService.java new file mode 100644 index 00000000..c015259a --- /dev/null +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/project/baseConfig/equipment/bizEquipmentMotor/service/IBizEquipmentMotorService.java @@ -0,0 +1,14 @@ +package org.jeecg.modules.project.baseConfig.equipment.bizEquipmentMotor.service; + +import org.jeecg.modules.project.baseConfig.equipment.bizEquipmentMotor.entity.BizEquipmentMotor; +import com.baomidou.mybatisplus.extension.service.IService; + +/** + * @Description: 机动装备表 + * @Author: jeecg-boot + * @Date: 2023-09-20 + * @Version: V1.0 + */ +public interface IBizEquipmentMotorService extends IService { + +} diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/project/baseConfig/equipment/bizEquipmentMotor/service/impl/BizEquipmentMotorServiceImpl.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/project/baseConfig/equipment/bizEquipmentMotor/service/impl/BizEquipmentMotorServiceImpl.java new file mode 100644 index 00000000..1d5089c1 --- /dev/null +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/project/baseConfig/equipment/bizEquipmentMotor/service/impl/BizEquipmentMotorServiceImpl.java @@ -0,0 +1,19 @@ +package org.jeecg.modules.project.baseConfig.equipment.bizEquipmentMotor.service.impl; + +import org.jeecg.modules.project.baseConfig.equipment.bizEquipmentMotor.entity.BizEquipmentMotor; +import org.jeecg.modules.project.baseConfig.equipment.bizEquipmentMotor.mapper.BizEquipmentMotorMapper; +import org.jeecg.modules.project.baseConfig.equipment.bizEquipmentMotor.service.IBizEquipmentMotorService; +import org.springframework.stereotype.Service; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; + +/** + * @Description: 机动装备表 + * @Author: jeecg-boot + * @Date: 2023-09-20 + * @Version: V1.0 + */ +@Service +public class BizEquipmentMotorServiceImpl extends ServiceImpl implements IBizEquipmentMotorService { + +} diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/project/baseConfig/equipment/bizEquipmentProtection/controller/BizEquipmentProtectionController.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/project/baseConfig/equipment/bizEquipmentProtection/controller/BizEquipmentProtectionController.java new file mode 100644 index 00000000..052d7fc0 --- /dev/null +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/project/baseConfig/equipment/bizEquipmentProtection/controller/BizEquipmentProtectionController.java @@ -0,0 +1,163 @@ +package org.jeecg.modules.project.baseConfig.equipment.bizEquipmentProtection.controller; + +import java.util.Arrays; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import org.jeecg.common.api.vo.Result; +import org.jeecg.common.system.query.QueryGenerator; +import org.jeecg.modules.project.baseConfig.equipment.bizEquipmentProtection.entity.BizEquipmentProtection; +import org.jeecg.modules.project.baseConfig.equipment.bizEquipmentProtection.service.IBizEquipmentProtectionService; + +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.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; +import org.apache.shiro.authz.annotation.RequiresPermissions; + + /** + * @Description: 防护装备表 + * @Author: jeecg-boot + * @Date: 2023-09-20 + * @Version: V1.0 + */ +@Api(tags="防护装备表") +@RestController +@RequestMapping("/bizEquipmentProtection/bizEquipmentProtection") +@Slf4j +public class BizEquipmentProtectionController extends JeecgController { + @Autowired + private IBizEquipmentProtectionService bizEquipmentProtectionService; + + /** + * 分页列表查询 + * + * @param bizEquipmentProtection + * @param pageNo + * @param pageSize + * @param req + * @return + */ + //@AutoLog(value = "防护装备表-分页列表查询") + @ApiOperation(value="防护装备表-分页列表查询", notes="防护装备表-分页列表查询") + @GetMapping(value = "/list") + public Result> queryPageList(BizEquipmentProtection bizEquipmentProtection, + @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, + @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, + HttpServletRequest req) { + QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(bizEquipmentProtection, req.getParameterMap()); + Page page = new Page(pageNo, pageSize); + IPage pageList = bizEquipmentProtectionService.page(page, queryWrapper); + return Result.OK(pageList); + } + + /** + * 添加 + * + * @param bizEquipmentProtection + * @return + */ + @AutoLog(value = "防护装备表-添加") + @ApiOperation(value="防护装备表-添加", notes="防护装备表-添加") + @RequiresPermissions("bizEquipmentProtection:biz_equipment_protection:add") + @PostMapping(value = "/add") + public Result add(@RequestBody BizEquipmentProtection bizEquipmentProtection) { + bizEquipmentProtectionService.save(bizEquipmentProtection); + return Result.OK("添加成功！"); + } + + /** + * 编辑 + * + * @param bizEquipmentProtection + * @return + */ + @AutoLog(value = "防护装备表-编辑") + @ApiOperation(value="防护装备表-编辑", notes="防护装备表-编辑") + @RequiresPermissions("bizEquipmentProtection:biz_equipment_protection:edit") + @RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST}) + public Result edit(@RequestBody BizEquipmentProtection bizEquipmentProtection) { + bizEquipmentProtectionService.updateById(bizEquipmentProtection); + return Result.OK("编辑成功!"); + } + + /** + * 通过id删除 + * + * @param id + * @return + */ + @AutoLog(value = "防护装备表-通过id删除") + @ApiOperation(value="防护装备表-通过id删除", notes="防护装备表-通过id删除") + @RequiresPermissions("bizEquipmentProtection:biz_equipment_protection:delete") + @DeleteMapping(value = "/delete") + public Result delete(@RequestParam(name="id",required=true) String id) { + bizEquipmentProtectionService.removeById(id); + return Result.OK("删除成功!"); + } + + /** + * 批量删除 + * + * @param ids + * @return + */ + @AutoLog(value = "防护装备表-批量删除") + @ApiOperation(value="防护装备表-批量删除", notes="防护装备表-批量删除") + @RequiresPermissions("bizEquipmentProtection:biz_equipment_protection:deleteBatch") + @DeleteMapping(value = "/deleteBatch") + public Result deleteBatch(@RequestParam(name="ids",required=true) String ids) { + this.bizEquipmentProtectionService.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) { + BizEquipmentProtection bizEquipmentProtection = bizEquipmentProtectionService.getById(id); + if(bizEquipmentProtection==null) { + return Result.error("未找到对应数据"); + } + return Result.OK(bizEquipmentProtection); + } + + /** + * 导出excel + * + * @param request + * @param bizEquipmentProtection + */ + @RequiresPermissions("bizEquipmentProtection:biz_equipment_protection:exportXls") + @RequestMapping(value = "/exportXls") + public ModelAndView exportXls(HttpServletRequest request, BizEquipmentProtection bizEquipmentProtection) { + return super.exportXls(request, bizEquipmentProtection, BizEquipmentProtection.class, "防护装备表"); + } + + /** + * 通过excel导入数据 + * + * @param request + * @param response + * @return + */ + @RequiresPermissions("bizEquipmentProtection:biz_equipment_protection:importExcel") + @RequestMapping(value = "/importExcel", method = RequestMethod.POST) + public Result importExcel(HttpServletRequest request, HttpServletResponse response) { + return super.importExcel(request, response, BizEquipmentProtection.class); + } + +} diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/project/baseConfig/equipment/bizEquipmentProtection/entity/BizEquipmentProtection.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/project/baseConfig/equipment/bizEquipmentProtection/entity/BizEquipmentProtection.java new file mode 100644 index 00000000..df2cadcc --- /dev/null +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/project/baseConfig/equipment/bizEquipmentProtection/entity/BizEquipmentProtection.java @@ -0,0 +1,64 @@ +package org.jeecg.modules.project.baseConfig.equipment.bizEquipmentProtection.entity; + +import java.io.Serializable; +import java.util.Date; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; +import com.fasterxml.jackson.annotation.JsonFormat; +import org.springframework.format.annotation.DateTimeFormat; +import org.jeecgframework.poi.excel.annotation.Excel; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.EqualsAndHashCode; +import lombok.experimental.Accessors; + +/** + * @Description: 防护装备表 + * @Author: jeecg-boot + * @Date: 2023-09-20 + * @Version: V1.0 + */ +@Data +@TableName("biz_equipment_protection") +@Accessors(chain = true) +@EqualsAndHashCode(callSuper = false) +@ApiModel(value="biz_equipment_protection对象", description="防护装备表") +public class BizEquipmentProtection implements Serializable { + private static final long serialVersionUID = 1L; + + /**主键*/ + @TableId(type = IdType.ASSIGN_ID) + @ApiModelProperty(value = "主键") + private String id; + /**创建人*/ + @ApiModelProperty(value = "创建人") + private String createBy; + /**创建日期*/ + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") + @ApiModelProperty(value = "创建日期") + private Date createTime; + /**更新人*/ + @ApiModelProperty(value = "更新人") + private String updateBy; + /**更新日期*/ + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") + @ApiModelProperty(value = "更新日期") + private Date updateTime; + /**防护装备名称*/ + @Excel(name = "防护装备名称", width = 15) + @ApiModelProperty(value = "防护装备名称") + private String protectionName; + /**防护等级*/ + @Excel(name = "防护等级", width = 15) + @ApiModelProperty(value = "防护等级") + private Integer protectionLevel; + /**辐射屏蔽率*/ + @Excel(name = "辐射屏蔽率", width = 15) + @ApiModelProperty(value = "辐射屏蔽率") + private Double protectionRate; +} diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/project/baseConfig/equipment/bizEquipmentProtection/mapper/BizEquipmentProtectionMapper.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/project/baseConfig/equipment/bizEquipmentProtection/mapper/BizEquipmentProtectionMapper.java new file mode 100644 index 00000000..26fc5d2b --- /dev/null +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/project/baseConfig/equipment/bizEquipmentProtection/mapper/BizEquipmentProtectionMapper.java @@ -0,0 +1,14 @@ +package org.jeecg.modules.project.baseConfig.equipment.bizEquipmentProtection.mapper; + +import org.jeecg.modules.project.baseConfig.equipment.bizEquipmentProtection.entity.BizEquipmentProtection; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; + +/** + * @Description: 防护装备表 + * @Author: jeecg-boot + * @Date: 2023-09-20 + * @Version: V1.0 + */ +public interface BizEquipmentProtectionMapper extends BaseMapper { + +} diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/project/baseConfig/equipment/bizEquipmentProtection/mapper/xml/BizEquipmentProtectionMapper.xml b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/project/baseConfig/equipment/bizEquipmentProtection/mapper/xml/BizEquipmentProtectionMapper.xml new file mode 100644 index 00000000..9f926e5f --- /dev/null +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/project/baseConfig/equipment/bizEquipmentProtection/mapper/xml/BizEquipmentProtectionMapper.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/project/baseConfig/equipment/bizEquipmentProtection/service/IBizEquipmentProtectionService.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/project/baseConfig/equipment/bizEquipmentProtection/service/IBizEquipmentProtectionService.java new file mode 100644 index 00000000..3391f028 --- /dev/null +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/project/baseConfig/equipment/bizEquipmentProtection/service/IBizEquipmentProtectionService.java @@ -0,0 +1,14 @@ +package org.jeecg.modules.project.baseConfig.equipment.bizEquipmentProtection.service; + +import org.jeecg.modules.project.baseConfig.equipment.bizEquipmentProtection.entity.BizEquipmentProtection; +import com.baomidou.mybatisplus.extension.service.IService; + +/** + * @Description: 防护装备表 + * @Author: jeecg-boot + * @Date: 2023-09-20 + * @Version: V1.0 + */ +public interface IBizEquipmentProtectionService extends IService { + +} diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/project/baseConfig/equipment/bizEquipmentProtection/service/impl/BizEquipmentProtectionServiceImpl.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/project/baseConfig/equipment/bizEquipmentProtection/service/impl/BizEquipmentProtectionServiceImpl.java new file mode 100644 index 00000000..afe41042 --- /dev/null +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/project/baseConfig/equipment/bizEquipmentProtection/service/impl/BizEquipmentProtectionServiceImpl.java @@ -0,0 +1,19 @@ +package org.jeecg.modules.project.baseConfig.equipment.bizEquipmentProtection.service.impl; + +import org.jeecg.modules.project.baseConfig.equipment.bizEquipmentProtection.entity.BizEquipmentProtection; +import org.jeecg.modules.project.baseConfig.equipment.bizEquipmentProtection.mapper.BizEquipmentProtectionMapper; +import org.jeecg.modules.project.baseConfig.equipment.bizEquipmentProtection.service.IBizEquipmentProtectionService; +import org.springframework.stereotype.Service; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; + +/** + * @Description: 防护装备表 + * @Author: jeecg-boot + * @Date: 2023-09-20 + * @Version: V1.0 + */ +@Service +public class BizEquipmentProtectionServiceImpl extends ServiceImpl implements IBizEquipmentProtectionService { + +} diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/project/baseConfig/weather/bizWeatherForecast/controller/BizWeatherForecastController.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/project/baseConfig/weather/bizWeatherForecast/controller/BizWeatherForecastController.java new file mode 100644 index 00000000..d2de9123 --- /dev/null +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/project/baseConfig/weather/bizWeatherForecast/controller/BizWeatherForecastController.java @@ -0,0 +1,163 @@ +package org.jeecg.modules.project.baseConfig.weather.bizWeatherForecast.controller; + +import java.util.Arrays; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import org.jeecg.common.api.vo.Result; +import org.jeecg.common.system.query.QueryGenerator; +import org.jeecg.modules.project.baseConfig.weather.bizWeatherForecast.entity.BizWeatherForecast; +import org.jeecg.modules.project.baseConfig.weather.bizWeatherForecast.service.IBizWeatherForecastService; + +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.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; +import org.apache.shiro.authz.annotation.RequiresPermissions; + + /** + * @Description: 气象预报表 + * @Author: jeecg-boot + * @Date: 2023-09-19 + * @Version: V1.0 + */ +@Api(tags="气象预报表") +@RestController +@RequestMapping("/bizWeatherForecast/bizWeatherForecast") +@Slf4j +public class BizWeatherForecastController extends JeecgController { + @Autowired + private IBizWeatherForecastService bizWeatherForecastService; + + /** + * 分页列表查询 + * + * @param bizWeatherForecast + * @param pageNo + * @param pageSize + * @param req + * @return + */ + //@AutoLog(value = "气象预报表-分页列表查询") + @ApiOperation(value="气象预报表-分页列表查询", notes="气象预报表-分页列表查询") + @GetMapping(value = "/list") + public Result> queryPageList(BizWeatherForecast bizWeatherForecast, + @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, + @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, + HttpServletRequest req) { + QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(bizWeatherForecast, req.getParameterMap()); + Page page = new Page(pageNo, pageSize); + IPage pageList = bizWeatherForecastService.page(page, queryWrapper); + return Result.OK(pageList); + } + + /** + * 添加 + * + * @param bizWeatherForecast + * @return + */ + @AutoLog(value = "气象预报表-添加") + @ApiOperation(value="气象预报表-添加", notes="气象预报表-添加") + @RequiresPermissions("bizWeatherForecast:biz_weather_forecast:add") + @PostMapping(value = "/add") + public Result add(@RequestBody BizWeatherForecast bizWeatherForecast) { + bizWeatherForecastService.save(bizWeatherForecast); + return Result.OK("添加成功！"); + } + + /** + * 编辑 + * + * @param bizWeatherForecast + * @return + */ + @AutoLog(value = "气象预报表-编辑") + @ApiOperation(value="气象预报表-编辑", notes="气象预报表-编辑") + @RequiresPermissions("bizWeatherForecast:biz_weather_forecast:edit") + @RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST}) + public Result edit(@RequestBody BizWeatherForecast bizWeatherForecast) { + bizWeatherForecastService.updateById(bizWeatherForecast); + return Result.OK("编辑成功!"); + } + + /** + * 通过id删除 + * + * @param id + * @return + */ + @AutoLog(value = "气象预报表-通过id删除") + @ApiOperation(value="气象预报表-通过id删除", notes="气象预报表-通过id删除") + @RequiresPermissions("bizWeatherForecast:biz_weather_forecast:delete") + @DeleteMapping(value = "/delete") + public Result delete(@RequestParam(name="id",required=true) String id) { + bizWeatherForecastService.removeById(id); + return Result.OK("删除成功!"); + } + + /** + * 批量删除 + * + * @param ids + * @return + */ + @AutoLog(value = "气象预报表-批量删除") + @ApiOperation(value="气象预报表-批量删除", notes="气象预报表-批量删除") + @RequiresPermissions("bizWeatherForecast:biz_weather_forecast:deleteBatch") + @DeleteMapping(value = "/deleteBatch") + public Result deleteBatch(@RequestParam(name="ids",required=true) String ids) { + this.bizWeatherForecastService.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) { + BizWeatherForecast bizWeatherForecast = bizWeatherForecastService.getById(id); + if(bizWeatherForecast==null) { + return Result.error("未找到对应数据"); + } + return Result.OK(bizWeatherForecast); + } + + /** + * 导出excel + * + * @param request + * @param bizWeatherForecast + */ + @RequiresPermissions("bizWeatherForecast:biz_weather_forecast:exportXls") + @RequestMapping(value = "/exportXls") + public ModelAndView exportXls(HttpServletRequest request, BizWeatherForecast bizWeatherForecast) { + return super.exportXls(request, bizWeatherForecast, BizWeatherForecast.class, "气象预报表"); + } + + /** + * 通过excel导入数据 + * + * @param request + * @param response + * @return + */ + @RequiresPermissions("bizWeatherForecast:biz_weather_forecast:importExcel") + @RequestMapping(value = "/importExcel", method = RequestMethod.POST) + public Result importExcel(HttpServletRequest request, HttpServletResponse response) { + return super.importExcel(request, response, BizWeatherForecast.class); + } + +} diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/project/baseConfig/weather/bizWeatherForecast/entity/BizWeatherForecast.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/project/baseConfig/weather/bizWeatherForecast/entity/BizWeatherForecast.java new file mode 100644 index 00000000..c8f8ed8d --- /dev/null +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/project/baseConfig/weather/bizWeatherForecast/entity/BizWeatherForecast.java @@ -0,0 +1,70 @@ +package org.jeecg.modules.project.baseConfig.weather.bizWeatherForecast.entity; + +import java.io.Serializable; +import java.util.Date; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; +import com.fasterxml.jackson.annotation.JsonFormat; +import org.springframework.format.annotation.DateTimeFormat; +import org.jeecgframework.poi.excel.annotation.Excel; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.EqualsAndHashCode; +import lombok.experimental.Accessors; + +/** + * @Description: 气象预报表 + * @Author: jeecg-boot + * @Date: 2023-09-19 + * @Version: V1.0 + */ +@Data +@TableName("biz_weather_forecast") +@Accessors(chain = true) +@EqualsAndHashCode(callSuper = false) +@ApiModel(value="biz_weather_forecast对象", description="气象预报表") +public class BizWeatherForecast implements Serializable { + private static final long serialVersionUID = 1L; + + /**主键*/ + @TableId(type = IdType.ASSIGN_ID) + @ApiModelProperty(value = "主键") + private String id; + /**创建人*/ + @ApiModelProperty(value = "创建人") + private String createBy; + /**创建日期*/ + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") + @ApiModelProperty(value = "创建日期") + private Date createTime; + /**更新人*/ + @ApiModelProperty(value = "更新人") + private String updateBy; + /**更新日期*/ + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") + @ApiModelProperty(value = "更新日期") + private Date updateTime; + /**预报名称*/ + @Excel(name = "预报名称", width = 15) + @ApiModelProperty(value = "预报名称") + private String forecastName; + /**采集时间*/ + @Excel(name = "采集时间", width = 20, format = "yyyy-MM-dd HH:mm:ss") + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") + @ApiModelProperty(value = "采集时间") + private Date gatherTime; + /**预报文件路径*/ + @Excel(name = "预报文件路径", width = 15) + @ApiModelProperty(value = "预报文件路径") + private String forecastPath; + /**预报类别*/ + @Excel(name = "预报类别", width = 15) + @ApiModelProperty(value = "预报类别") + private Integer forecastType; +} diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/project/baseConfig/weather/bizWeatherForecast/mapper/BizWeatherForecastMapper.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/project/baseConfig/weather/bizWeatherForecast/mapper/BizWeatherForecastMapper.java new file mode 100644 index 00000000..24552f85 --- /dev/null +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/project/baseConfig/weather/bizWeatherForecast/mapper/BizWeatherForecastMapper.java @@ -0,0 +1,14 @@ +package org.jeecg.modules.project.baseConfig.weather.bizWeatherForecast.mapper; + +import org.jeecg.modules.project.baseConfig.weather.bizWeatherForecast.entity.BizWeatherForecast; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; + +/** + * @Description: 气象预报表 + * @Author: jeecg-boot + * @Date: 2023-09-19 + * @Version: V1.0 + */ +public interface BizWeatherForecastMapper extends BaseMapper { + +} diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/project/baseConfig/weather/bizWeatherForecast/mapper/xml/BizWeatherForecastMapper.xml b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/project/baseConfig/weather/bizWeatherForecast/mapper/xml/BizWeatherForecastMapper.xml new file mode 100644 index 00000000..4a4d1b2e --- /dev/null +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/project/baseConfig/weather/bizWeatherForecast/mapper/xml/BizWeatherForecastMapper.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/project/baseConfig/weather/bizWeatherForecast/service/IBizWeatherForecastService.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/project/baseConfig/weather/bizWeatherForecast/service/IBizWeatherForecastService.java new file mode 100644 index 00000000..4253ec6e --- /dev/null +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/project/baseConfig/weather/bizWeatherForecast/service/IBizWeatherForecastService.java @@ -0,0 +1,14 @@ +package org.jeecg.modules.project.baseConfig.weather.bizWeatherForecast.service; + +import org.jeecg.modules.project.baseConfig.weather.bizWeatherForecast.entity.BizWeatherForecast; +import com.baomidou.mybatisplus.extension.service.IService; + +/** + * @Description: 气象预报表 + * @Author: jeecg-boot + * @Date: 2023-09-19 + * @Version: V1.0 + */ +public interface IBizWeatherForecastService extends IService { + +} diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/project/baseConfig/weather/bizWeatherForecast/service/impl/BizWeatherForecastServiceImpl.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/project/baseConfig/weather/bizWeatherForecast/service/impl/BizWeatherForecastServiceImpl.java new file mode 100644 index 00000000..6fabc513 --- /dev/null +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/project/baseConfig/weather/bizWeatherForecast/service/impl/BizWeatherForecastServiceImpl.java @@ -0,0 +1,19 @@ +package org.jeecg.modules.project.baseConfig.weather.bizWeatherForecast.service.impl; + +import org.jeecg.modules.project.baseConfig.weather.bizWeatherForecast.entity.BizWeatherForecast; +import org.jeecg.modules.project.baseConfig.weather.bizWeatherForecast.mapper.BizWeatherForecastMapper; +import org.jeecg.modules.project.baseConfig.weather.bizWeatherForecast.service.IBizWeatherForecastService; +import org.springframework.stereotype.Service; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; + +/** + * @Description: 气象预报表 + * @Author: jeecg-boot + * @Date: 2023-09-19 + * @Version: V1.0 + */ +@Service +public class BizWeatherForecastServiceImpl extends ServiceImpl implements IBizWeatherForecastService { + +} diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/project/baseConfig/weather/bizWeatherHistory/controller/BizWeatherHistoryController.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/project/baseConfig/weather/bizWeatherHistory/controller/BizWeatherHistoryController.java new file mode 100644 index 00000000..5924694d --- /dev/null +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/project/baseConfig/weather/bizWeatherHistory/controller/BizWeatherHistoryController.java @@ -0,0 +1,163 @@ +package org.jeecg.modules.project.baseConfig.weather.bizWeatherHistory.controller; + +import java.util.Arrays; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import org.jeecg.common.api.vo.Result; +import org.jeecg.common.system.query.QueryGenerator; +import org.jeecg.modules.project.baseConfig.weather.bizWeatherHistory.entity.BizWeatherHistory; +import org.jeecg.modules.project.baseConfig.weather.bizWeatherHistory.service.IBizWeatherHistoryService; + +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.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; +import org.apache.shiro.authz.annotation.RequiresPermissions; + + /** + * @Description: 历史气象表 + * @Author: jeecg-boot + * @Date: 2023-09-18 + * @Version: V1.0 + */ +@Api(tags="历史气象表") +@RestController +@RequestMapping("/bizWeatherHistory/bizWeatherHistory") +@Slf4j +public class BizWeatherHistoryController extends JeecgController { + @Autowired + private IBizWeatherHistoryService bizWeatherHistoryService; + + /** + * 分页列表查询 + * + * @param bizWeatherHistory + * @param pageNo + * @param pageSize + * @param req + * @return + */ + //@AutoLog(value = "历史气象表-分页列表查询") + @ApiOperation(value="历史气象表-分页列表查询", notes="历史气象表-分页列表查询") + @GetMapping(value = "/list") + public Result> queryPageList(BizWeatherHistory bizWeatherHistory, + @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, + @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, + HttpServletRequest req) { + QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(bizWeatherHistory, req.getParameterMap()); + Page page = new Page(pageNo, pageSize); + IPage pageList = bizWeatherHistoryService.page(page, queryWrapper); + return Result.OK(pageList); + } + + /** + * 添加 + * + * @param bizWeatherHistory + * @return + */ + @AutoLog(value = "历史气象表-添加") + @ApiOperation(value="历史气象表-添加", notes="历史气象表-添加") + @RequiresPermissions("bizWeatherHistory:biz_weather_history:add") + @PostMapping(value = "/add") + public Result add(@RequestBody BizWeatherHistory bizWeatherHistory) { + bizWeatherHistoryService.save(bizWeatherHistory); + return Result.OK("添加成功！"); + } + + /** + * 编辑 + * + * @param bizWeatherHistory + * @return + */ + @AutoLog(value = "历史气象表-编辑") + @ApiOperation(value="历史气象表-编辑", notes="历史气象表-编辑") + @RequiresPermissions("bizWeatherHistory:biz_weather_history:edit") + @RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST}) + public Result edit(@RequestBody BizWeatherHistory bizWeatherHistory) { + bizWeatherHistoryService.updateById(bizWeatherHistory); + return Result.OK("编辑成功!"); + } + + /** + * 通过id删除 + * + * @param id + * @return + */ + @AutoLog(value = "历史气象表-通过id删除") + @ApiOperation(value="历史气象表-通过id删除", notes="历史气象表-通过id删除") + @RequiresPermissions("bizWeatherHistory:biz_weather_history:delete") + @DeleteMapping(value = "/delete") + public Result delete(@RequestParam(name="id",required=true) String id) { + bizWeatherHistoryService.removeById(id); + return Result.OK("删除成功!"); + } + + /** + * 批量删除 + * + * @param ids + * @return + */ + @AutoLog(value = "历史气象表-批量删除") + @ApiOperation(value="历史气象表-批量删除", notes="历史气象表-批量删除") + @RequiresPermissions("bizWeatherHistory:biz_weather_history:deleteBatch") + @DeleteMapping(value = "/deleteBatch") + public Result deleteBatch(@RequestParam(name="ids",required=true) String ids) { + this.bizWeatherHistoryService.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) { + BizWeatherHistory bizWeatherHistory = bizWeatherHistoryService.getById(id); + if(bizWeatherHistory==null) { + return Result.error("未找到对应数据"); + } + return Result.OK(bizWeatherHistory); + } + + /** + * 导出excel + * + * @param request + * @param bizWeatherHistory + */ + @RequiresPermissions("bizWeatherHistory:biz_weather_history:exportXls") + @RequestMapping(value = "/exportXls") + public ModelAndView exportXls(HttpServletRequest request, BizWeatherHistory bizWeatherHistory) { + return super.exportXls(request, bizWeatherHistory, BizWeatherHistory.class, "历史气象表"); + } + + /** + * 通过excel导入数据 + * + * @param request + * @param response + * @return + */ + @RequiresPermissions("bizWeatherHistory:biz_weather_history:importExcel") + @RequestMapping(value = "/importExcel", method = RequestMethod.POST) + public Result importExcel(HttpServletRequest request, HttpServletResponse response) { + return super.importExcel(request, response, BizWeatherHistory.class); + } + +} diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/project/baseConfig/weather/bizWeatherHistory/entity/BizWeatherHistory.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/project/baseConfig/weather/bizWeatherHistory/entity/BizWeatherHistory.java new file mode 100644 index 00000000..b748ddc7 --- /dev/null +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/project/baseConfig/weather/bizWeatherHistory/entity/BizWeatherHistory.java @@ -0,0 +1,70 @@ +package org.jeecg.modules.project.baseConfig.weather.bizWeatherHistory.entity; + +import java.io.Serializable; +import java.util.Date; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; +import com.fasterxml.jackson.annotation.JsonFormat; +import org.springframework.format.annotation.DateTimeFormat; +import org.jeecgframework.poi.excel.annotation.Excel; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.EqualsAndHashCode; +import lombok.experimental.Accessors; + +/** + * @Description: 历史气象表 + * @Author: jeecg-boot + * @Date: 2023-09-18 + * @Version: V1.0 + */ +@Data +@TableName("biz_weather_history") +@Accessors(chain = true) +@EqualsAndHashCode(callSuper = false) +@ApiModel(value="biz_weather_history对象", description="历史气象表") +public class BizWeatherHistory implements Serializable { + private static final long serialVersionUID = 1L; + + /**主键*/ + @TableId(type = IdType.ASSIGN_ID) + @ApiModelProperty(value = "主键") + private String id; + /**创建人*/ + @ApiModelProperty(value = "创建人") + private String createBy; + /**创建日期*/ + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") + @ApiModelProperty(value = "创建日期") + private Date createTime; + /**更新人*/ + @ApiModelProperty(value = "更新人") + private String updateBy; + /**更新日期*/ + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") + @ApiModelProperty(value = "更新日期") + private Date updateTime; + /**气象名称*/ + @Excel(name = "气象名称", width = 15) + @ApiModelProperty(value = "气象名称") + private String weatherName; + /**气象类别*/ + @Excel(name = "气象类别", width = 15) + @ApiModelProperty(value = "气象类别") + private Integer weatherType; + /**气象时间*/ + @Excel(name = "气象时间", width = 15, format = "yyyy-MM-dd") + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd") + @DateTimeFormat(pattern="yyyy-MM-dd") + @ApiModelProperty(value = "气象时间") + private Date weatherTime; + /**文件路径*/ + @Excel(name = "文件路径", width = 15) + @ApiModelProperty(value = "文件路径") + private String filePath; +} diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/project/baseConfig/weather/bizWeatherHistory/mapper/BizWeatherHistoryMapper.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/project/baseConfig/weather/bizWeatherHistory/mapper/BizWeatherHistoryMapper.java new file mode 100644 index 00000000..e93cd88b --- /dev/null +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/project/baseConfig/weather/bizWeatherHistory/mapper/BizWeatherHistoryMapper.java @@ -0,0 +1,14 @@ +package org.jeecg.modules.project.baseConfig.weather.bizWeatherHistory.mapper; + +import org.jeecg.modules.project.baseConfig.weather.bizWeatherHistory.entity.BizWeatherHistory; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; + +/** + * @Description: 历史气象表 + * @Author: jeecg-boot + * @Date: 2023-09-18 + * @Version: V1.0 + */ +public interface BizWeatherHistoryMapper extends BaseMapper { + +} diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/project/baseConfig/weather/bizWeatherHistory/mapper/xml/BizWeatherHistoryMapper.xml b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/project/baseConfig/weather/bizWeatherHistory/mapper/xml/BizWeatherHistoryMapper.xml new file mode 100644 index 00000000..807e6284 --- /dev/null +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/project/baseConfig/weather/bizWeatherHistory/mapper/xml/BizWeatherHistoryMapper.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/project/baseConfig/weather/bizWeatherHistory/service/IBizWeatherHistoryService.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/project/baseConfig/weather/bizWeatherHistory/service/IBizWeatherHistoryService.java new file mode 100644 index 00000000..eb53ac21 --- /dev/null +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/project/baseConfig/weather/bizWeatherHistory/service/IBizWeatherHistoryService.java @@ -0,0 +1,14 @@ +package org.jeecg.modules.project.baseConfig.weather.bizWeatherHistory.service; + +import org.jeecg.modules.project.baseConfig.weather.bizWeatherHistory.entity.BizWeatherHistory; +import com.baomidou.mybatisplus.extension.service.IService; + +/** + * @Description: 历史气象表 + * @Author: jeecg-boot + * @Date: 2023-09-18 + * @Version: V1.0 + */ +public interface IBizWeatherHistoryService extends IService { + +} diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/project/baseConfig/weather/bizWeatherHistory/service/impl/BizWeatherHistoryServiceImpl.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/project/baseConfig/weather/bizWeatherHistory/service/impl/BizWeatherHistoryServiceImpl.java new file mode 100644 index 00000000..e4a1685c --- /dev/null +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/project/baseConfig/weather/bizWeatherHistory/service/impl/BizWeatherHistoryServiceImpl.java @@ -0,0 +1,19 @@ +package org.jeecg.modules.project.baseConfig.weather.bizWeatherHistory.service.impl; + +import org.jeecg.modules.project.baseConfig.weather.bizWeatherHistory.entity.BizWeatherHistory; +import org.jeecg.modules.project.baseConfig.weather.bizWeatherHistory.mapper.BizWeatherHistoryMapper; +import org.jeecg.modules.project.baseConfig.weather.bizWeatherHistory.service.IBizWeatherHistoryService; +import org.springframework.stereotype.Service; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; + +/** + * @Description: 历史气象表 + * @Author: jeecg-boot + * @Date: 2023-09-18 + * @Version: V1.0 + */ +@Service +public class BizWeatherHistoryServiceImpl extends ServiceImpl implements IBizWeatherHistoryService { + +} diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/project/bizUploadFile/mapper/BizUploadFileMapper.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/project/bizUploadFile/mapper/BizUploadFileMapper.java deleted file mode 100644 index 427d2e05..00000000 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/project/bizUploadFile/mapper/BizUploadFileMapper.java +++ /dev/null @@ -1,7 +0,0 @@ -package org.jeecg.modules.project.bizUploadFile.mapper; - -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import org.jeecg.modules.project.bizUploadFile.entity.BizUploadFile; - -public interface BizUploadFileMapper extends BaseMapper { -} diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/project/bizCmaq/controller/BizCmaqController.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/project/calculateConfig/bizCmaq/controller/BizCmaqController.java similarity index 80% rename from jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/project/bizCmaq/controller/BizCmaqController.java rename to jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/project/calculateConfig/bizCmaq/controller/BizCmaqController.java index 77c14f69..924606ff 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/project/bizCmaq/controller/BizCmaqController.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/project/calculateConfig/bizCmaq/controller/BizCmaqController.java @@ -1,27 +1,15 @@ -package org.jeecg.modules.project.bizCmaq.controller; +package org.jeecg.modules.project.calculateConfig.bizCmaq.controller; -import java.io.*; -import java.nio.file.Files; -import java.nio.file.Path; -import java.nio.file.Paths; -import java.text.ParseException; -import java.text.SimpleDateFormat; import java.util.*; -import java.util.stream.Collectors; -import java.net.URLDecoder; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.jcraft.jsch.SftpException; -import org.apache.commons.lang3.StringUtils; import org.jeecg.common.api.vo.Result; import org.jeecg.common.system.query.QueryGenerator; -import org.jeecg.common.util.RemoteExecuteCommand; -import org.jeecg.common.util.oConvertUtils; -import org.jeecg.modules.project.bizCmaq.entity.BizCmaq; -import org.jeecg.modules.project.bizCmaq.service.IBizCmaqService; -import static java.nio.file.Files.readAllBytes; +import org.jeecg.modules.project.calculateConfig.bizCmaq.entity.BizCmaq; +import org.jeecg.modules.project.calculateConfig.bizCmaq.service.IBizCmaqService; + import static java.nio.file.Paths.get; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; @@ -29,35 +17,15 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import lombok.extern.slf4j.Slf4j; -import org.jeecg.modules.project.bizEngineering.entity.BizEngineering; -import org.jeecg.modules.project.bizEngineering.service.IBizEngineeringService; -import org.jeecg.modules.project.bizOpenfoam.entity.BizOpenfoam; -import org.jeecg.modules.project.bizWrf.entity.BizWrf; -import org.jeecg.modules.project.bizWrf.service.IBizWrfService; -import org.jeecg.modules.project.util.CmdUtil; -import org.jeecg.modules.project.util.SFTPUtil; -import org.jeecgframework.poi.excel.ExcelImportUtil; -import org.jeecgframework.poi.excel.def.NormalExcelConstants; -import org.jeecgframework.poi.excel.entity.ExportParams; -import org.jeecgframework.poi.excel.entity.ImportParams; -import org.jeecgframework.poi.excel.view.JeecgEntityExcelView; +import org.jeecg.modules.project.calculateConfig.bizWrf.entity.BizWrf; +import org.jeecg.modules.project.calculateConfig.bizWrf.service.IBizWrfService; import org.jeecg.common.system.base.controller.JeecgController; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.beans.factory.annotation.Value; import org.springframework.web.bind.annotation.*; -import org.springframework.web.multipart.MultipartFile; -import org.springframework.web.multipart.MultipartHttpServletRequest; import org.springframework.web.servlet.ModelAndView; -import com.alibaba.fastjson.JSON; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.jeecg.common.aspect.annotation.AutoLog; -import org.apache.shiro.authz.annotation.RequiresPermissions; -import ucar.ma2.Array; -import ucar.ma2.Index; -import ucar.nc2.NetcdfFile; -import ucar.nc2.Variable; -import ucar.nc2.dataset.NetcdfDataset; /** * @Description: CMAQ @@ -243,6 +211,22 @@ public class BizCmaqController extends JeecgController return Result.OK(result); } + /** + * 通过temType查询模板 + * + * @return + */ + //@AutoLog(value = "cmaq-通过temType查询模板") + @ApiOperation(value="cmaq-通过temType查询模板", notes="cmaq-通过temType查询模板") + @GetMapping(value = "/getCmaqTem") + public Result getCmaqTem() { + BizCmaq bizCmaq = bizCmaqService.getOne(new LambdaQueryWrapper().eq(BizCmaq::getTemType,0)); + if(bizCmaq==null) { + return Result.error("未找到对应数据"); + } + return Result.OK(bizCmaq); + } + /** * 导出excel * diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/project/bizCmaq/entity/BizCmaq.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/project/calculateConfig/bizCmaq/entity/BizCmaq.java similarity index 96% rename from jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/project/bizCmaq/entity/BizCmaq.java rename to jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/project/calculateConfig/bizCmaq/entity/BizCmaq.java index 8c18ce40..b4c6a661 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/project/bizCmaq/entity/BizCmaq.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/project/calculateConfig/bizCmaq/entity/BizCmaq.java @@ -1,18 +1,15 @@ -package org.jeecg.modules.project.bizCmaq.entity; +package org.jeecg.modules.project.calculateConfig.bizCmaq.entity; import java.io.Serializable; -import java.io.UnsupportedEncodingException; import java.util.Date; -import java.math.BigDecimal; + import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; -import com.baomidou.mybatisplus.annotation.TableLogic; import lombok.Data; import com.fasterxml.jackson.annotation.JsonFormat; import org.springframework.format.annotation.DateTimeFormat; import org.jeecgframework.poi.excel.annotation.Excel; -import org.jeecg.common.aspect.annotation.Dict; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.EqualsAndHashCode; @@ -206,4 +203,7 @@ public class BizCmaq implements Serializable { @Excel(name = "engineeringId", width = 15) @ApiModelProperty(value = "engineeringId") private String engineeringId; + @Excel(name = "temType", width = 15) + @ApiModelProperty(value = "temType") + private int temType; } diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/project/bizCmaq/mapper/BizCmaqMapper.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/project/calculateConfig/bizCmaq/mapper/BizCmaqMapper.java similarity index 55% rename from jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/project/bizCmaq/mapper/BizCmaqMapper.java rename to jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/project/calculateConfig/bizCmaq/mapper/BizCmaqMapper.java index f29ca65c..dd68832b 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/project/bizCmaq/mapper/BizCmaqMapper.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/project/calculateConfig/bizCmaq/mapper/BizCmaqMapper.java @@ -1,9 +1,6 @@ -package org.jeecg.modules.project.bizCmaq.mapper; +package org.jeecg.modules.project.calculateConfig.bizCmaq.mapper; -import java.util.List; - -import org.apache.ibatis.annotations.Param; -import org.jeecg.modules.project.bizCmaq.entity.BizCmaq; +import org.jeecg.modules.project.calculateConfig.bizCmaq.entity.BizCmaq; import com.baomidou.mybatisplus.core.mapper.BaseMapper; /** diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/project/bizCmaq/mapper/xml/BizCmaqMapper.xml b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/project/calculateConfig/bizCmaq/mapper/xml/BizCmaqMapper.xml similarity index 63% rename from jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/project/bizCmaq/mapper/xml/BizCmaqMapper.xml rename to jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/project/calculateConfig/bizCmaq/mapper/xml/BizCmaqMapper.xml index fa8a819c..9493c42a 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/project/bizCmaq/mapper/xml/BizCmaqMapper.xml +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/project/calculateConfig/bizCmaq/mapper/xml/BizCmaqMapper.xml @@ -1,5 +1,5 @@ - + \ No newline at end of file diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/project/bizCmaq/service/IBizCmaqService.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/project/calculateConfig/bizCmaq/service/IBizCmaqService.java similarity index 73% rename from jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/project/bizCmaq/service/IBizCmaqService.java rename to jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/project/calculateConfig/bizCmaq/service/IBizCmaqService.java index 4679ee06..f7ca2e74 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/project/bizCmaq/service/IBizCmaqService.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/project/calculateConfig/bizCmaq/service/IBizCmaqService.java @@ -1,11 +1,8 @@ -package org.jeecg.modules.project.bizCmaq.service; +package org.jeecg.modules.project.calculateConfig.bizCmaq.service; -import com.jcraft.jsch.SftpException; -import org.jeecg.modules.project.bizCmaq.entity.BizCmaq; +import org.jeecg.modules.project.calculateConfig.bizCmaq.entity.BizCmaq; import com.baomidou.mybatisplus.extension.service.IService; -import java.io.IOException; -import java.text.ParseException; import java.util.List; /** diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/project/bizCmaq/service/impl/BizCmaqServiceImpl.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/project/calculateConfig/bizCmaq/service/impl/BizCmaqServiceImpl.java similarity index 92% rename from jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/project/bizCmaq/service/impl/BizCmaqServiceImpl.java rename to jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/project/calculateConfig/bizCmaq/service/impl/BizCmaqServiceImpl.java index 37d3e2cd..c94bea01 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/project/bizCmaq/service/impl/BizCmaqServiceImpl.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/project/calculateConfig/bizCmaq/service/impl/BizCmaqServiceImpl.java @@ -1,4 +1,4 @@ -package org.jeecg.modules.project.bizCmaq.service.impl; +package org.jeecg.modules.project.calculateConfig.bizCmaq.service.impl; import cn.hutool.core.date.DateTime; import cn.hutool.core.date.DateUtil; @@ -6,19 +6,18 @@ import cn.hutool.core.io.FileUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.jcraft.jsch.SftpException; import org.jeecg.common.util.RemoteExecuteCommand; -import org.jeecg.modules.project.bizCmaq.entity.BizCmaq; -import org.jeecg.modules.project.bizCmaq.mapper.BizCmaqMapper; -import org.jeecg.modules.project.bizCmaq.service.IBizCmaqService; -import org.jeecg.modules.project.bizEngineering.entity.BizEngineering; -import org.jeecg.modules.project.bizEngineering.service.IBizEngineeringService; -import org.jeecg.modules.project.bizOpenfoam.entity.BizOpenfoam; -import org.jeecg.modules.project.bizOpenfoam.service.IBizOpenfoamService; -import org.jeecg.modules.project.bizWrf.service.IBizWrfService; -import org.jeecg.modules.project.util.CmdUtil; -import org.jeecg.modules.project.util.SFTPUtil; +import org.jeecg.modules.project.calculateConfig.bizCmaq.entity.BizCmaq; +import org.jeecg.modules.project.calculateConfig.bizCmaq.mapper.BizCmaqMapper; +import org.jeecg.modules.project.calculateConfig.bizCmaq.service.IBizCmaqService; +import org.jeecg.modules.project.baseConfig.bizEngineering.entity.BizEngineering; +import org.jeecg.modules.project.baseConfig.bizEngineering.service.IBizEngineeringService; +import org.jeecg.modules.project.calculateConfig.bizOpenfoam.entity.BizOpenfoam; +import org.jeecg.modules.project.calculateConfig.bizOpenfoam.service.IBizOpenfoamService; +import org.jeecg.modules.project.calculateConfig.bizWrf.service.IBizWrfService; +import org.jeecg.modules.util.SFTPUtil; import org.springframework.beans.factory.annotation.Value; -import org.jeecg.modules.project.bizWrf.entity.BizWrf; -import org.jeecg.modules.project.bizWrf.mapper.BizWrfMapper; +import org.jeecg.modules.project.calculateConfig.bizWrf.entity.BizWrf; +import org.jeecg.modules.project.calculateConfig.bizWrf.mapper.BizWrfMapper; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -276,13 +275,13 @@ public class BizCmaqServiceImpl extends ServiceImpl impl BizCmaq bizCmaq = this.baseMapper.selectOne(new LambdaQueryWrapper().eq(BizCmaq::getEngineeringId,bizEngineering.getId())); if(bizCmaq != null) { - NetcdfFile griddot2d = NetcdfDataset.open("C:\\Users\\13673\\Desktop\\某源\\Nuclear\\file\\wrfout_d01_2016-07-01_00_00_00"); - NetcdfFile ncfile = NetcdfDataset.open("C:\\Users\\13673\\Desktop\\某源\\Nuclear\\file\\CCTM_ACONC_v532_2016_12SE1_20160701.nc"); -// String ncName = "CCTM_ACONC_v532_2016_12SE1_" + sdf.format(sdf.parse(bizCmaq.getStartDate())).replace("-", "") + ".nc"; -// NetcdfFile ncfile = NetcdfDataset.open(localFilePrefix + ncName); -// BizWrf bizWrf = bizWrfService.getOne(new LambdaQueryWrapper().eq(BizWrf::getEngineeringId, bizEngineering.getId())); -// String ncNameWrf = "wrfout_d01_" + bizWrf.getStartTime(); -// NetcdfFile griddot2d = NetcdfDataset.open(localFilePrefix + ncNameWrf); +// NetcdfFile griddot2d = NetcdfDataset.open("C:\\Users\\13673\\Desktop\\某源\\Nuclear\\file\\wrfout_d01_2016-07-01_00_00_00"); +// NetcdfFile ncfile = NetcdfDataset.open("C:\\Users\\13673\\Desktop\\某源\\Nuclear\\file\\CCTM_ACONC_v532_2016_12SE1_20160701.nc"); + String ncName = "CCTM_ACONC_v532_2016_12SE1_" + sdf.format(sdf.parse(bizCmaq.getStartDate())).replace("-", "") + ".nc"; + NetcdfFile ncfile = NetcdfDataset.open(localFilePrefix + ncName); + BizWrf bizWrf = bizWrfService.getOne(new LambdaQueryWrapper().eq(BizWrf::getEngineeringId, bizEngineering.getId())); + String ncNameWrf = "wrfout_d01_" + bizWrf.getStartTime(); + NetcdfFile griddot2d = NetcdfDataset.open(localFilePrefix + ncNameWrf); List>> coAllList = getNCByName(ncfile, "CO", layer); List>> no2AllList = getNCByName(ncfile, "NO2", layer); List>> no3AllList = getNCByName(ncfile, "NO3", layer); diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/project/bizCmaq/vue/BizCmaqList.vue b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/project/calculateConfig/bizCmaq/vue/BizCmaqList.vue similarity index 100% rename from jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/project/bizCmaq/vue/BizCmaqList.vue rename to jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/project/calculateConfig/bizCmaq/vue/BizCmaqList.vue diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/project/bizCmaq/vue/BizCmaq_menu_insert.sql b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/project/calculateConfig/bizCmaq/vue/BizCmaq_menu_insert.sql similarity index 100% rename from jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/project/bizCmaq/vue/BizCmaq_menu_insert.sql rename to jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/project/calculateConfig/bizCmaq/vue/BizCmaq_menu_insert.sql diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/project/bizCmaq/vue/modules/BizCmaqForm.vue b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/project/calculateConfig/bizCmaq/vue/modules/BizCmaqForm.vue similarity index 100% rename from jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/project/bizCmaq/vue/modules/BizCmaqForm.vue rename to jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/project/calculateConfig/bizCmaq/vue/modules/BizCmaqForm.vue diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/project/bizCmaq/vue/modules/BizCmaqModal.Style#Drawer.vue b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/project/calculateConfig/bizCmaq/vue/modules/BizCmaqModal.Style#Drawer.vue similarity index 100% rename from jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/project/bizCmaq/vue/modules/BizCmaqModal.Style#Drawer.vue rename to jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/project/calculateConfig/bizCmaq/vue/modules/BizCmaqModal.Style#Drawer.vue diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/project/bizCmaq/vue/modules/BizCmaqModal.vue b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/project/calculateConfig/bizCmaq/vue/modules/BizCmaqModal.vue similarity index 100% rename from jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/project/bizCmaq/vue/modules/BizCmaqModal.vue rename to jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/project/calculateConfig/bizCmaq/vue/modules/BizCmaqModal.vue diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/project/calculateConfig/bizConfigChemistry/controller/BizConfigChemistryController.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/project/calculateConfig/bizConfigChemistry/controller/BizConfigChemistryController.java new file mode 100644 index 00000000..0fa1dccc --- /dev/null +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/project/calculateConfig/bizConfigChemistry/controller/BizConfigChemistryController.java @@ -0,0 +1,178 @@ +package org.jeecg.modules.project.calculateConfig.bizConfigChemistry.controller; + +import java.util.Arrays; +import java.util.List; +import java.util.Map; +import java.util.stream.Collectors; +import java.io.IOException; +import java.io.UnsupportedEncodingException; +import java.net.URLDecoder; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import org.jeecg.common.api.vo.Result; +import org.jeecg.common.system.query.QueryGenerator; +import org.jeecg.common.util.oConvertUtils; +import org.jeecg.modules.project.calculateConfig.bizConfigChemistry.entity.BizConfigChemistry; +import org.jeecg.modules.project.calculateConfig.bizConfigChemistry.service.IBizConfigChemistryService; + +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.jeecgframework.poi.excel.ExcelImportUtil; +import org.jeecgframework.poi.excel.def.NormalExcelConstants; +import org.jeecgframework.poi.excel.entity.ExportParams; +import org.jeecgframework.poi.excel.entity.ImportParams; +import org.jeecgframework.poi.excel.view.JeecgEntityExcelView; +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.multipart.MultipartFile; +import org.springframework.web.multipart.MultipartHttpServletRequest; +import org.springframework.web.servlet.ModelAndView; +import com.alibaba.fastjson.JSON; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.jeecg.common.aspect.annotation.AutoLog; +import org.apache.shiro.authz.annotation.RequiresPermissions; + + /** + * @Description: 化爆配置表 + * @Author: jeecg-boot + * @Date: 2023-09-20 + * @Version: V1.0 + */ +@Api(tags="化爆配置表") +@RestController +@RequestMapping("/bizConfigChemistry/bizConfigChemistry") +@Slf4j +public class BizConfigChemistryController extends JeecgController { + @Autowired + private IBizConfigChemistryService bizConfigChemistryService; + + /** + * 分页列表查询 + * + * @param bizConfigChemistry + * @param pageNo + * @param pageSize + * @param req + * @return + */ + //@AutoLog(value = "化爆配置表-分页列表查询") + @ApiOperation(value="化爆配置表-分页列表查询", notes="化爆配置表-分页列表查询") + @GetMapping(value = "/list") + public Result> queryPageList(BizConfigChemistry bizConfigChemistry, + @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, + @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, + HttpServletRequest req) { + QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(bizConfigChemistry, req.getParameterMap()); + Page page = new Page(pageNo, pageSize); + IPage pageList = bizConfigChemistryService.page(page, queryWrapper); + return Result.OK(pageList); + } + + /** + * 添加 + * + * @param bizConfigChemistry + * @return + */ + @AutoLog(value = "化爆配置表-添加") + @ApiOperation(value="化爆配置表-添加", notes="化爆配置表-添加") + @RequiresPermissions("bizConfigChemistry:biz_config_chemistry:add") + @PostMapping(value = "/add") + public Result add(@RequestBody BizConfigChemistry bizConfigChemistry) { + bizConfigChemistryService.save(bizConfigChemistry); + return Result.OK("添加成功！"); + } + + /** + * 编辑 + * + * @param bizConfigChemistry + * @return + */ + @AutoLog(value = "化爆配置表-编辑") + @ApiOperation(value="化爆配置表-编辑", notes="化爆配置表-编辑") + @RequiresPermissions("bizConfigChemistry:biz_config_chemistry:edit") + @RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST}) + public Result edit(@RequestBody BizConfigChemistry bizConfigChemistry) { + bizConfigChemistryService.updateById(bizConfigChemistry); + return Result.OK("编辑成功!"); + } + + /** + * 通过id删除 + * + * @param id + * @return + */ + @AutoLog(value = "化爆配置表-通过id删除") + @ApiOperation(value="化爆配置表-通过id删除", notes="化爆配置表-通过id删除") + @RequiresPermissions("bizConfigChemistry:biz_config_chemistry:delete") + @DeleteMapping(value = "/delete") + public Result delete(@RequestParam(name="id",required=true) String id) { + bizConfigChemistryService.removeById(id); + return Result.OK("删除成功!"); + } + + /** + * 批量删除 + * + * @param ids + * @return + */ + @AutoLog(value = "化爆配置表-批量删除") + @ApiOperation(value="化爆配置表-批量删除", notes="化爆配置表-批量删除") + @RequiresPermissions("bizConfigChemistry:biz_config_chemistry:deleteBatch") + @DeleteMapping(value = "/deleteBatch") + public Result deleteBatch(@RequestParam(name="ids",required=true) String ids) { + this.bizConfigChemistryService.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) { + BizConfigChemistry bizConfigChemistry = bizConfigChemistryService.getById(id); + if(bizConfigChemistry==null) { + return Result.error("未找到对应数据"); + } + return Result.OK(bizConfigChemistry); + } + + /** + * 导出excel + * + * @param request + * @param bizConfigChemistry + */ + @RequiresPermissions("bizConfigChemistry:biz_config_chemistry:exportXls") + @RequestMapping(value = "/exportXls") + public ModelAndView exportXls(HttpServletRequest request, BizConfigChemistry bizConfigChemistry) { + return super.exportXls(request, bizConfigChemistry, BizConfigChemistry.class, "化爆配置表"); + } + + /** + * 通过excel导入数据 + * + * @param request + * @param response + * @return + */ + @RequiresPermissions("bizConfigChemistry:biz_config_chemistry:importExcel") + @RequestMapping(value = "/importExcel", method = RequestMethod.POST) + public Result importExcel(HttpServletRequest request, HttpServletResponse response) { + return super.importExcel(request, response, BizConfigChemistry.class); + } + +} diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/project/calculateConfig/bizConfigChemistry/entity/BizConfigChemistry.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/project/calculateConfig/bizConfigChemistry/entity/BizConfigChemistry.java new file mode 100644 index 00000000..2534f5f5 --- /dev/null +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/project/calculateConfig/bizConfigChemistry/entity/BizConfigChemistry.java @@ -0,0 +1,85 @@ +package org.jeecg.modules.project.calculateConfig.bizConfigChemistry.entity; + +import java.io.Serializable; +import java.io.UnsupportedEncodingException; +import java.util.Date; +import java.math.BigDecimal; +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.annotation.TableLogic; +import lombok.Data; +import com.fasterxml.jackson.annotation.JsonFormat; +import org.springframework.format.annotation.DateTimeFormat; +import org.jeecgframework.poi.excel.annotation.Excel; +import org.jeecg.common.aspect.annotation.Dict; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.EqualsAndHashCode; +import lombok.experimental.Accessors; + +/** + * @Description: 化爆配置表 + * @Author: jeecg-boot + * @Date: 2023-09-20 + * @Version: V1.0 + */ +@Data +@TableName("biz_config_chemistry") +@Accessors(chain = true) +@EqualsAndHashCode(callSuper = false) +@ApiModel(value="biz_config_chemistry对象", description="化爆配置表") +public class BizConfigChemistry implements Serializable { + private static final long serialVersionUID = 1L; + + /**主键*/ + @TableId(type = IdType.ASSIGN_ID) + @ApiModelProperty(value = "主键") + private String id; + /**创建人*/ + @ApiModelProperty(value = "创建人") + private String createBy; + /**创建日期*/ + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") + @ApiModelProperty(value = "创建日期") + private Date createTime; + /**更新人*/ + @ApiModelProperty(value = "更新人") + private String updateBy; + /**更新日期*/ + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") + @ApiModelProperty(value = "更新日期") + private Date updateTime; + /**工程ID*/ + @Excel(name = "工程ID", width = 15) + @ApiModelProperty(value = "工程ID") + private String engineeringId; + /**经度*/ + @Excel(name = "经度", width = 15) + @ApiModelProperty(value = "经度") + private Double lon; + /**纬度*/ + @Excel(name = "纬度", width = 15) + @ApiModelProperty(value = "纬度") + private Double lat; + /**事件时间*/ + @Excel(name = "事件时间", width = 20, format = "yyyy-MM-dd HH:mm:ss") + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") + @ApiModelProperty(value = "事件时间") + private Date eventTime; + /**武器ID*/ + @Excel(name = "武器ID", width = 15) + @ApiModelProperty(value = "武器ID") + private String weaponId; + /**高度*/ + @Excel(name = "高度", width = 15) + @ApiModelProperty(value = "高度") + private Double height; + /**DL*/ + @Excel(name = "DL", width = 15) + @ApiModelProperty(value = "DL") + private Double dl; +} diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/project/calculateConfig/bizConfigChemistry/mapper/BizConfigChemistryMapper.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/project/calculateConfig/bizConfigChemistry/mapper/BizConfigChemistryMapper.java new file mode 100644 index 00000000..f055a05c --- /dev/null +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/project/calculateConfig/bizConfigChemistry/mapper/BizConfigChemistryMapper.java @@ -0,0 +1,17 @@ +package org.jeecg.modules.project.calculateConfig.bizConfigChemistry.mapper; + +import java.util.List; + +import org.apache.ibatis.annotations.Param; +import org.jeecg.modules.project.calculateConfig.bizConfigChemistry.entity.BizConfigChemistry; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; + +/** + * @Description: 化爆配置表 + * @Author: jeecg-boot + * @Date: 2023-09-20 + * @Version: V1.0 + */ +public interface BizConfigChemistryMapper extends BaseMapper { + +} diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/project/calculateConfig/bizConfigChemistry/mapper/xml/BizConfigChemistryMapper.xml b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/project/calculateConfig/bizConfigChemistry/mapper/xml/BizConfigChemistryMapper.xml new file mode 100644 index 00000000..3442b6ed --- /dev/null +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/project/calculateConfig/bizConfigChemistry/mapper/xml/BizConfigChemistryMapper.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/project/calculateConfig/bizConfigChemistry/service/IBizConfigChemistryService.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/project/calculateConfig/bizConfigChemistry/service/IBizConfigChemistryService.java new file mode 100644 index 00000000..3ae40124 --- /dev/null +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/project/calculateConfig/bizConfigChemistry/service/IBizConfigChemistryService.java @@ -0,0 +1,14 @@ +package org.jeecg.modules.project.calculateConfig.bizConfigChemistry.service; + +import org.jeecg.modules.project.calculateConfig.bizConfigChemistry.entity.BizConfigChemistry; +import com.baomidou.mybatisplus.extension.service.IService; + +/** + * @Description: 化爆配置表 + * @Author: jeecg-boot + * @Date: 2023-09-20 + * @Version: V1.0 + */ +public interface IBizConfigChemistryService extends IService { + +} diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/project/calculateConfig/bizConfigChemistry/service/impl/BizConfigChemistryServiceImpl.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/project/calculateConfig/bizConfigChemistry/service/impl/BizConfigChemistryServiceImpl.java new file mode 100644 index 00000000..7e039dd2 --- /dev/null +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/project/calculateConfig/bizConfigChemistry/service/impl/BizConfigChemistryServiceImpl.java @@ -0,0 +1,19 @@ +package org.jeecg.modules.project.calculateConfig.bizConfigChemistry.service.impl; + +import org.jeecg.modules.project.calculateConfig.bizConfigChemistry.entity.BizConfigChemistry; +import org.jeecg.modules.project.calculateConfig.bizConfigChemistry.mapper.BizConfigChemistryMapper; +import org.jeecg.modules.project.calculateConfig.bizConfigChemistry.service.IBizConfigChemistryService; +import org.springframework.stereotype.Service; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; + +/** + * @Description: 化爆配置表 + * @Author: jeecg-boot + * @Date: 2023-09-20 + * @Version: V1.0 + */ +@Service +public class BizConfigChemistryServiceImpl extends ServiceImpl implements IBizConfigChemistryService { + +} diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/project/calculateConfig/bizConfigFacility/controller/BizConfigFacilityController.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/project/calculateConfig/bizConfigFacility/controller/BizConfigFacilityController.java new file mode 100644 index 00000000..ad46ef53 --- /dev/null +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/project/calculateConfig/bizConfigFacility/controller/BizConfigFacilityController.java @@ -0,0 +1,178 @@ +package org.jeecg.modules.project.calculateConfig.bizConfigFacility.controller; + +import java.util.Arrays; +import java.util.List; +import java.util.Map; +import java.util.stream.Collectors; +import java.io.IOException; +import java.io.UnsupportedEncodingException; +import java.net.URLDecoder; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import org.jeecg.common.api.vo.Result; +import org.jeecg.common.system.query.QueryGenerator; +import org.jeecg.common.util.oConvertUtils; +import org.jeecg.modules.project.calculateConfig.bizConfigFacility.entity.BizConfigFacility; +import org.jeecg.modules.project.calculateConfig.bizConfigFacility.service.IBizConfigFacilityService; + +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.jeecgframework.poi.excel.ExcelImportUtil; +import org.jeecgframework.poi.excel.def.NormalExcelConstants; +import org.jeecgframework.poi.excel.entity.ExportParams; +import org.jeecgframework.poi.excel.entity.ImportParams; +import org.jeecgframework.poi.excel.view.JeecgEntityExcelView; +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.multipart.MultipartFile; +import org.springframework.web.multipart.MultipartHttpServletRequest; +import org.springframework.web.servlet.ModelAndView; +import com.alibaba.fastjson.JSON; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.jeecg.common.aspect.annotation.AutoLog; +import org.apache.shiro.authz.annotation.RequiresPermissions; + + /** + * @Description: 核设施配置表 + * @Author: jeecg-boot + * @Date: 2023-09-20 + * @Version: V1.0 + */ +@Api(tags="核设施配置表") +@RestController +@RequestMapping("/bizConfigFacility/bizConfigFacility") +@Slf4j +public class BizConfigFacilityController extends JeecgController { + @Autowired + private IBizConfigFacilityService bizConfigFacilityService; + + /** + * 分页列表查询 + * + * @param bizConfigFacility + * @param pageNo + * @param pageSize + * @param req + * @return + */ + //@AutoLog(value = "核设施配置表-分页列表查询") + @ApiOperation(value="核设施配置表-分页列表查询", notes="核设施配置表-分页列表查询") + @GetMapping(value = "/list") + public Result> queryPageList(BizConfigFacility bizConfigFacility, + @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, + @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, + HttpServletRequest req) { + QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(bizConfigFacility, req.getParameterMap()); + Page page = new Page(pageNo, pageSize); + IPage pageList = bizConfigFacilityService.page(page, queryWrapper); + return Result.OK(pageList); + } + + /** + * 添加 + * + * @param bizConfigFacility + * @return + */ + @AutoLog(value = "核设施配置表-添加") + @ApiOperation(value="核设施配置表-添加", notes="核设施配置表-添加") + @RequiresPermissions("bizConfigFacility:biz_config_facility:add") + @PostMapping(value = "/add") + public Result add(@RequestBody BizConfigFacility bizConfigFacility) { + bizConfigFacilityService.save(bizConfigFacility); + return Result.OK("添加成功！"); + } + + /** + * 编辑 + * + * @param bizConfigFacility + * @return + */ + @AutoLog(value = "核设施配置表-编辑") + @ApiOperation(value="核设施配置表-编辑", notes="核设施配置表-编辑") + @RequiresPermissions("bizConfigFacility:biz_config_facility:edit") + @RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST}) + public Result edit(@RequestBody BizConfigFacility bizConfigFacility) { + bizConfigFacilityService.updateById(bizConfigFacility); + return Result.OK("编辑成功!"); + } + + /** + * 通过id删除 + * + * @param id + * @return + */ + @AutoLog(value = "核设施配置表-通过id删除") + @ApiOperation(value="核设施配置表-通过id删除", notes="核设施配置表-通过id删除") + @RequiresPermissions("bizConfigFacility:biz_config_facility:delete") + @DeleteMapping(value = "/delete") + public Result delete(@RequestParam(name="id",required=true) String id) { + bizConfigFacilityService.removeById(id); + return Result.OK("删除成功!"); + } + + /** + * 批量删除 + * + * @param ids + * @return + */ + @AutoLog(value = "核设施配置表-批量删除") + @ApiOperation(value="核设施配置表-批量删除", notes="核设施配置表-批量删除") + @RequiresPermissions("bizConfigFacility:biz_config_facility:deleteBatch") + @DeleteMapping(value = "/deleteBatch") + public Result deleteBatch(@RequestParam(name="ids",required=true) String ids) { + this.bizConfigFacilityService.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) { + BizConfigFacility bizConfigFacility = bizConfigFacilityService.getById(id); + if(bizConfigFacility==null) { + return Result.error("未找到对应数据"); + } + return Result.OK(bizConfigFacility); + } + + /** + * 导出excel + * + * @param request + * @param bizConfigFacility + */ + @RequiresPermissions("bizConfigFacility:biz_config_facility:exportXls") + @RequestMapping(value = "/exportXls") + public ModelAndView exportXls(HttpServletRequest request, BizConfigFacility bizConfigFacility) { + return super.exportXls(request, bizConfigFacility, BizConfigFacility.class, "核设施配置表"); + } + + /** + * 通过excel导入数据 + * + * @param request + * @param response + * @return + */ + @RequiresPermissions("bizConfigFacility:biz_config_facility:importExcel") + @RequestMapping(value = "/importExcel", method = RequestMethod.POST) + public Result importExcel(HttpServletRequest request, HttpServletResponse response) { + return super.importExcel(request, response, BizConfigFacility.class); + } + +} diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/project/calculateConfig/bizConfigFacility/entity/BizConfigFacility.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/project/calculateConfig/bizConfigFacility/entity/BizConfigFacility.java new file mode 100644 index 00000000..6970f71a --- /dev/null +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/project/calculateConfig/bizConfigFacility/entity/BizConfigFacility.java @@ -0,0 +1,73 @@ +package org.jeecg.modules.project.calculateConfig.bizConfigFacility.entity; + +import java.io.Serializable; +import java.io.UnsupportedEncodingException; +import java.util.Date; +import java.math.BigDecimal; +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.annotation.TableLogic; +import lombok.Data; +import com.fasterxml.jackson.annotation.JsonFormat; +import org.springframework.format.annotation.DateTimeFormat; +import org.jeecgframework.poi.excel.annotation.Excel; +import org.jeecg.common.aspect.annotation.Dict; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.EqualsAndHashCode; +import lombok.experimental.Accessors; + +/** + * @Description: 核设施配置表 + * @Author: jeecg-boot + * @Date: 2023-09-20 + * @Version: V1.0 + */ +@Data +@TableName("biz_config_facility") +@Accessors(chain = true) +@EqualsAndHashCode(callSuper = false) +@ApiModel(value="biz_config_facility对象", description="核设施配置表") +public class BizConfigFacility implements Serializable { + private static final long serialVersionUID = 1L; + + /**主键*/ + @TableId(type = IdType.ASSIGN_ID) + @ApiModelProperty(value = "主键") + private String id; + /**创建人*/ + @ApiModelProperty(value = "创建人") + private String createBy; + /**创建日期*/ + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") + @ApiModelProperty(value = "创建日期") + private Date createTime; + /**更新人*/ + @ApiModelProperty(value = "更新人") + private String updateBy; + /**更新日期*/ + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") + @ApiModelProperty(value = "更新日期") + private Date updateTime; + /**工程ID*/ + @Excel(name = "工程ID", width = 15) + @ApiModelProperty(value = "工程ID") + private String engineeringId; + /**经度*/ + @Excel(name = "经度", width = 15) + @ApiModelProperty(value = "经度") + private Double lon; + /**纬度*/ + @Excel(name = "纬度", width = 15) + @ApiModelProperty(value = "纬度") + private Double lat; + /**事件时间*/ + @Excel(name = "事件时间", width = 20, format = "yyyy-MM-dd HH:mm:ss") + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") + @ApiModelProperty(value = "事件时间") + private Date eventTime; +} diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/project/calculateConfig/bizConfigFacility/mapper/BizConfigFacilityMapper.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/project/calculateConfig/bizConfigFacility/mapper/BizConfigFacilityMapper.java new file mode 100644 index 00000000..d3f1fc7b --- /dev/null +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/project/calculateConfig/bizConfigFacility/mapper/BizConfigFacilityMapper.java @@ -0,0 +1,17 @@ +package org.jeecg.modules.project.calculateConfig.bizConfigFacility.mapper; + +import java.util.List; + +import org.apache.ibatis.annotations.Param; +import org.jeecg.modules.project.calculateConfig.bizConfigFacility.entity.BizConfigFacility; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; + +/** + * @Description: 核设施配置表 + * @Author: jeecg-boot + * @Date: 2023-09-20 + * @Version: V1.0 + */ +public interface BizConfigFacilityMapper extends BaseMapper { + +} diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/project/calculateConfig/bizConfigFacility/mapper/xml/BizConfigFacilityMapper.xml b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/project/calculateConfig/bizConfigFacility/mapper/xml/BizConfigFacilityMapper.xml new file mode 100644 index 00000000..ef682312 --- /dev/null +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/project/calculateConfig/bizConfigFacility/mapper/xml/BizConfigFacilityMapper.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/project/calculateConfig/bizConfigFacility/service/IBizConfigFacilityService.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/project/calculateConfig/bizConfigFacility/service/IBizConfigFacilityService.java new file mode 100644 index 00000000..088afd8f --- /dev/null +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/project/calculateConfig/bizConfigFacility/service/IBizConfigFacilityService.java @@ -0,0 +1,14 @@ +package org.jeecg.modules.project.calculateConfig.bizConfigFacility.service; + +import org.jeecg.modules.project.calculateConfig.bizConfigFacility.entity.BizConfigFacility; +import com.baomidou.mybatisplus.extension.service.IService; + +/** + * @Description: 核设施配置表 + * @Author: jeecg-boot + * @Date: 2023-09-20 + * @Version: V1.0 + */ +public interface IBizConfigFacilityService extends IService { + +} diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/project/calculateConfig/bizConfigFacility/service/impl/BizConfigFacilityServiceImpl.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/project/calculateConfig/bizConfigFacility/service/impl/BizConfigFacilityServiceImpl.java new file mode 100644 index 00000000..e203a83e --- /dev/null +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/project/calculateConfig/bizConfigFacility/service/impl/BizConfigFacilityServiceImpl.java @@ -0,0 +1,19 @@ +package org.jeecg.modules.project.calculateConfig.bizConfigFacility.service.impl; + +import org.jeecg.modules.project.calculateConfig.bizConfigFacility.entity.BizConfigFacility; +import org.jeecg.modules.project.calculateConfig.bizConfigFacility.mapper.BizConfigFacilityMapper; +import org.jeecg.modules.project.calculateConfig.bizConfigFacility.service.IBizConfigFacilityService; +import org.springframework.stereotype.Service; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; + +/** + * @Description: 核设施配置表 + * @Author: jeecg-boot + * @Date: 2023-09-20 + * @Version: V1.0 + */ +@Service +public class BizConfigFacilityServiceImpl extends ServiceImpl implements IBizConfigFacilityService { + +} diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/project/calculateConfig/bizConfigLeak/controller/BizConfigLeakController.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/project/calculateConfig/bizConfigLeak/controller/BizConfigLeakController.java new file mode 100644 index 00000000..2854c0d1 --- /dev/null +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/project/calculateConfig/bizConfigLeak/controller/BizConfigLeakController.java @@ -0,0 +1,178 @@ +package org.jeecg.modules.project.calculateConfig.bizConfigLeak.controller; + +import java.util.Arrays; +import java.util.List; +import java.util.Map; +import java.util.stream.Collectors; +import java.io.IOException; +import java.io.UnsupportedEncodingException; +import java.net.URLDecoder; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import org.jeecg.common.api.vo.Result; +import org.jeecg.common.system.query.QueryGenerator; +import org.jeecg.common.util.oConvertUtils; +import org.jeecg.modules.project.calculateConfig.bizConfigLeak.entity.BizConfigLeak; +import org.jeecg.modules.project.calculateConfig.bizConfigLeak.service.IBizConfigLeakService; + +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.jeecgframework.poi.excel.ExcelImportUtil; +import org.jeecgframework.poi.excel.def.NormalExcelConstants; +import org.jeecgframework.poi.excel.entity.ExportParams; +import org.jeecgframework.poi.excel.entity.ImportParams; +import org.jeecgframework.poi.excel.view.JeecgEntityExcelView; +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.multipart.MultipartFile; +import org.springframework.web.multipart.MultipartHttpServletRequest; +import org.springframework.web.servlet.ModelAndView; +import com.alibaba.fastjson.JSON; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.jeecg.common.aspect.annotation.AutoLog; +import org.apache.shiro.authz.annotation.RequiresPermissions; + + /** + * @Description: 泄露配置表 + * @Author: jeecg-boot + * @Date: 2023-09-20 + * @Version: V1.0 + */ +@Api(tags="泄露配置表") +@RestController +@RequestMapping("/bizConfigLeak/bizConfigLeak") +@Slf4j +public class BizConfigLeakController extends JeecgController { + @Autowired + private IBizConfigLeakService bizConfigLeakService; + + /** + * 分页列表查询 + * + * @param bizConfigLeak + * @param pageNo + * @param pageSize + * @param req + * @return + */ + //@AutoLog(value = "泄露配置表-分页列表查询") + @ApiOperation(value="泄露配置表-分页列表查询", notes="泄露配置表-分页列表查询") + @GetMapping(value = "/list") + public Result> queryPageList(BizConfigLeak bizConfigLeak, + @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, + @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, + HttpServletRequest req) { + QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(bizConfigLeak, req.getParameterMap()); + Page page = new Page(pageNo, pageSize); + IPage pageList = bizConfigLeakService.page(page, queryWrapper); + return Result.OK(pageList); + } + + /** + * 添加 + * + * @param bizConfigLeak + * @return + */ + @AutoLog(value = "泄露配置表-添加") + @ApiOperation(value="泄露配置表-添加", notes="泄露配置表-添加") + @RequiresPermissions("bizConfigLeak:biz_config_leak:add") + @PostMapping(value = "/add") + public Result add(@RequestBody BizConfigLeak bizConfigLeak) { + bizConfigLeakService.save(bizConfigLeak); + return Result.OK("添加成功！"); + } + + /** + * 编辑 + * + * @param bizConfigLeak + * @return + */ + @AutoLog(value = "泄露配置表-编辑") + @ApiOperation(value="泄露配置表-编辑", notes="泄露配置表-编辑") + @RequiresPermissions("bizConfigLeak:biz_config_leak:edit") + @RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST}) + public Result edit(@RequestBody BizConfigLeak bizConfigLeak) { + bizConfigLeakService.updateById(bizConfigLeak); + return Result.OK("编辑成功!"); + } + + /** + * 通过id删除 + * + * @param id + * @return + */ + @AutoLog(value = "泄露配置表-通过id删除") + @ApiOperation(value="泄露配置表-通过id删除", notes="泄露配置表-通过id删除") + @RequiresPermissions("bizConfigLeak:biz_config_leak:delete") + @DeleteMapping(value = "/delete") + public Result delete(@RequestParam(name="id",required=true) String id) { + bizConfigLeakService.removeById(id); + return Result.OK("删除成功!"); + } + + /** + * 批量删除 + * + * @param ids + * @return + */ + @AutoLog(value = "泄露配置表-批量删除") + @ApiOperation(value="泄露配置表-批量删除", notes="泄露配置表-批量删除") + @RequiresPermissions("bizConfigLeak:biz_config_leak:deleteBatch") + @DeleteMapping(value = "/deleteBatch") + public Result deleteBatch(@RequestParam(name="ids",required=true) String ids) { + this.bizConfigLeakService.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) { + BizConfigLeak bizConfigLeak = bizConfigLeakService.getById(id); + if(bizConfigLeak==null) { + return Result.error("未找到对应数据"); + } + return Result.OK(bizConfigLeak); + } + + /** + * 导出excel + * + * @param request + * @param bizConfigLeak + */ + @RequiresPermissions("bizConfigLeak:biz_config_leak:exportXls") + @RequestMapping(value = "/exportXls") + public ModelAndView exportXls(HttpServletRequest request, BizConfigLeak bizConfigLeak) { + return super.exportXls(request, bizConfigLeak, BizConfigLeak.class, "泄露配置表"); + } + + /** + * 通过excel导入数据 + * + * @param request + * @param response + * @return + */ + @RequiresPermissions("bizConfigLeak:biz_config_leak:importExcel") + @RequestMapping(value = "/importExcel", method = RequestMethod.POST) + public Result importExcel(HttpServletRequest request, HttpServletResponse response) { + return super.importExcel(request, response, BizConfigLeak.class); + } + +} diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/project/calculateConfig/bizConfigLeak/entity/BizConfigLeak.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/project/calculateConfig/bizConfigLeak/entity/BizConfigLeak.java new file mode 100644 index 00000000..730cc9ba --- /dev/null +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/project/calculateConfig/bizConfigLeak/entity/BizConfigLeak.java @@ -0,0 +1,73 @@ +package org.jeecg.modules.project.calculateConfig.bizConfigLeak.entity; + +import java.io.Serializable; +import java.io.UnsupportedEncodingException; +import java.util.Date; +import java.math.BigDecimal; +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.annotation.TableLogic; +import lombok.Data; +import com.fasterxml.jackson.annotation.JsonFormat; +import org.springframework.format.annotation.DateTimeFormat; +import org.jeecgframework.poi.excel.annotation.Excel; +import org.jeecg.common.aspect.annotation.Dict; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.EqualsAndHashCode; +import lombok.experimental.Accessors; + +/** + * @Description: 泄露配置表 + * @Author: jeecg-boot + * @Date: 2023-09-20 + * @Version: V1.0 + */ +@Data +@TableName("biz_config_leak") +@Accessors(chain = true) +@EqualsAndHashCode(callSuper = false) +@ApiModel(value="biz_config_leak对象", description="泄露配置表") +public class BizConfigLeak implements Serializable { + private static final long serialVersionUID = 1L; + + /**主键*/ + @TableId(type = IdType.ASSIGN_ID) + @ApiModelProperty(value = "主键") + private String id; + /**创建人*/ + @ApiModelProperty(value = "创建人") + private String createBy; + /**创建日期*/ + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") + @ApiModelProperty(value = "创建日期") + private Date createTime; + /**更新人*/ + @ApiModelProperty(value = "更新人") + private String updateBy; + /**更新日期*/ + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") + @ApiModelProperty(value = "更新日期") + private Date updateTime; + /**工程ID*/ + @Excel(name = "工程ID", width = 15) + @ApiModelProperty(value = "工程ID") + private String engineeringId; + /**经度*/ + @Excel(name = "经度", width = 15) + @ApiModelProperty(value = "经度") + private Double lon; + /**纬度*/ + @Excel(name = "纬度", width = 15) + @ApiModelProperty(value = "纬度") + private Double lat; + /**事件时间*/ + @Excel(name = "事件时间", width = 20, format = "yyyy-MM-dd HH:mm:ss") + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") + @ApiModelProperty(value = "事件时间") + private Date eventTime; +} diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/project/calculateConfig/bizConfigLeak/mapper/BizConfigLeakMapper.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/project/calculateConfig/bizConfigLeak/mapper/BizConfigLeakMapper.java new file mode 100644 index 00000000..a0ec1518 --- /dev/null +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/project/calculateConfig/bizConfigLeak/mapper/BizConfigLeakMapper.java @@ -0,0 +1,17 @@ +package org.jeecg.modules.project.calculateConfig.bizConfigLeak.mapper; + +import java.util.List; + +import org.apache.ibatis.annotations.Param; +import org.jeecg.modules.project.calculateConfig.bizConfigLeak.entity.BizConfigLeak; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; + +/** + * @Description: 泄露配置表 + * @Author: jeecg-boot + * @Date: 2023-09-20 + * @Version: V1.0 + */ +public interface BizConfigLeakMapper extends BaseMapper { + +} diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/project/calculateConfig/bizConfigLeak/mapper/xml/BizConfigLeakMapper.xml b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/project/calculateConfig/bizConfigLeak/mapper/xml/BizConfigLeakMapper.xml new file mode 100644 index 00000000..d6d4dc94 --- /dev/null +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/project/calculateConfig/bizConfigLeak/mapper/xml/BizConfigLeakMapper.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/project/calculateConfig/bizConfigLeak/service/IBizConfigLeakService.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/project/calculateConfig/bizConfigLeak/service/IBizConfigLeakService.java new file mode 100644 index 00000000..3c999b22 --- /dev/null +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/project/calculateConfig/bizConfigLeak/service/IBizConfigLeakService.java @@ -0,0 +1,14 @@ +package org.jeecg.modules.project.calculateConfig.bizConfigLeak.service; + +import org.jeecg.modules.project.calculateConfig.bizConfigLeak.entity.BizConfigLeak; +import com.baomidou.mybatisplus.extension.service.IService; + +/** + * @Description: 泄露配置表 + * @Author: jeecg-boot + * @Date: 2023-09-20 + * @Version: V1.0 + */ +public interface IBizConfigLeakService extends IService { + +} diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/project/calculateConfig/bizConfigLeak/service/impl/BizConfigLeakServiceImpl.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/project/calculateConfig/bizConfigLeak/service/impl/BizConfigLeakServiceImpl.java new file mode 100644 index 00000000..6fad3c47 --- /dev/null +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/project/calculateConfig/bizConfigLeak/service/impl/BizConfigLeakServiceImpl.java @@ -0,0 +1,19 @@ +package org.jeecg.modules.project.calculateConfig.bizConfigLeak.service.impl; + +import org.jeecg.modules.project.calculateConfig.bizConfigLeak.entity.BizConfigLeak; +import org.jeecg.modules.project.calculateConfig.bizConfigLeak.mapper.BizConfigLeakMapper; +import org.jeecg.modules.project.calculateConfig.bizConfigLeak.service.IBizConfigLeakService; +import org.springframework.stereotype.Service; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; + +/** + * @Description: 泄露配置表 + * @Author: jeecg-boot + * @Date: 2023-09-20 + * @Version: V1.0 + */ +@Service +public class BizConfigLeakServiceImpl extends ServiceImpl implements IBizConfigLeakService { + +} diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/project/calculateConfig/bizConfigNucleus/controller/BizConfigNucleusController.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/project/calculateConfig/bizConfigNucleus/controller/BizConfigNucleusController.java new file mode 100644 index 00000000..3ef6f9b4 --- /dev/null +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/project/calculateConfig/bizConfigNucleus/controller/BizConfigNucleusController.java @@ -0,0 +1,178 @@ +package org.jeecg.modules.project.calculateConfig.bizConfigNucleus.controller; + +import java.util.Arrays; +import java.util.List; +import java.util.Map; +import java.util.stream.Collectors; +import java.io.IOException; +import java.io.UnsupportedEncodingException; +import java.net.URLDecoder; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import org.jeecg.common.api.vo.Result; +import org.jeecg.common.system.query.QueryGenerator; +import org.jeecg.common.util.oConvertUtils; +import org.jeecg.modules.project.calculateConfig.bizConfigNucleus.entity.BizConfigNucleus; +import org.jeecg.modules.project.calculateConfig.bizConfigNucleus.service.IBizConfigNucleusService; + +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.jeecgframework.poi.excel.ExcelImportUtil; +import org.jeecgframework.poi.excel.def.NormalExcelConstants; +import org.jeecgframework.poi.excel.entity.ExportParams; +import org.jeecgframework.poi.excel.entity.ImportParams; +import org.jeecgframework.poi.excel.view.JeecgEntityExcelView; +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.multipart.MultipartFile; +import org.springframework.web.multipart.MultipartHttpServletRequest; +import org.springframework.web.servlet.ModelAndView; +import com.alibaba.fastjson.JSON; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.jeecg.common.aspect.annotation.AutoLog; +import org.apache.shiro.authz.annotation.RequiresPermissions; + + /** + * @Description: 核爆配置表 + * @Author: jeecg-boot + * @Date: 2023-09-20 + * @Version: V1.0 + */ +@Api(tags="核爆配置表") +@RestController +@RequestMapping("/bizConfigNucleus/bizConfigNucleus") +@Slf4j +public class BizConfigNucleusController extends JeecgController { + @Autowired + private IBizConfigNucleusService bizConfigNucleusService; + + /** + * 分页列表查询 + * + * @param bizConfigNucleus + * @param pageNo + * @param pageSize + * @param req + * @return + */ + //@AutoLog(value = "核爆配置表-分页列表查询") + @ApiOperation(value="核爆配置表-分页列表查询", notes="核爆配置表-分页列表查询") + @GetMapping(value = "/list") + public Result> queryPageList(BizConfigNucleus bizConfigNucleus, + @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, + @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, + HttpServletRequest req) { + QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(bizConfigNucleus, req.getParameterMap()); + Page page = new Page(pageNo, pageSize); + IPage pageList = bizConfigNucleusService.page(page, queryWrapper); + return Result.OK(pageList); + } + + /** + * 添加 + * + * @param bizConfigNucleus + * @return + */ + @AutoLog(value = "核爆配置表-添加") + @ApiOperation(value="核爆配置表-添加", notes="核爆配置表-添加") + @RequiresPermissions("bizConfigNucleus:biz_config_nucleus:add") + @PostMapping(value = "/add") + public Result add(@RequestBody BizConfigNucleus bizConfigNucleus) { + bizConfigNucleusService.save(bizConfigNucleus); + return Result.OK("添加成功！"); + } + + /** + * 编辑 + * + * @param bizConfigNucleus + * @return + */ + @AutoLog(value = "核爆配置表-编辑") + @ApiOperation(value="核爆配置表-编辑", notes="核爆配置表-编辑") + @RequiresPermissions("bizConfigNucleus:biz_config_nucleus:edit") + @RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST}) + public Result edit(@RequestBody BizConfigNucleus bizConfigNucleus) { + bizConfigNucleusService.updateById(bizConfigNucleus); + return Result.OK("编辑成功!"); + } + + /** + * 通过id删除 + * + * @param id + * @return + */ + @AutoLog(value = "核爆配置表-通过id删除") + @ApiOperation(value="核爆配置表-通过id删除", notes="核爆配置表-通过id删除") + @RequiresPermissions("bizConfigNucleus:biz_config_nucleus:delete") + @DeleteMapping(value = "/delete") + public Result delete(@RequestParam(name="id",required=true) String id) { + bizConfigNucleusService.removeById(id); + return Result.OK("删除成功!"); + } + + /** + * 批量删除 + * + * @param ids + * @return + */ + @AutoLog(value = "核爆配置表-批量删除") + @ApiOperation(value="核爆配置表-批量删除", notes="核爆配置表-批量删除") + @RequiresPermissions("bizConfigNucleus:biz_config_nucleus:deleteBatch") + @DeleteMapping(value = "/deleteBatch") + public Result deleteBatch(@RequestParam(name="ids",required=true) String ids) { + this.bizConfigNucleusService.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) { + BizConfigNucleus bizConfigNucleus = bizConfigNucleusService.getById(id); + if(bizConfigNucleus==null) { + return Result.error("未找到对应数据"); + } + return Result.OK(bizConfigNucleus); + } + + /** + * 导出excel + * + * @param request + * @param bizConfigNucleus + */ + @RequiresPermissions("bizConfigNucleus:biz_config_nucleus:exportXls") + @RequestMapping(value = "/exportXls") + public ModelAndView exportXls(HttpServletRequest request, BizConfigNucleus bizConfigNucleus) { + return super.exportXls(request, bizConfigNucleus, BizConfigNucleus.class, "核爆配置表"); + } + + /** + * 通过excel导入数据 + * + * @param request + * @param response + * @return + */ + @RequiresPermissions("bizConfigNucleus:biz_config_nucleus:importExcel") + @RequestMapping(value = "/importExcel", method = RequestMethod.POST) + public Result importExcel(HttpServletRequest request, HttpServletResponse response) { + return super.importExcel(request, response, BizConfigNucleus.class); + } + +} diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/project/calculateConfig/bizConfigNucleus/entity/BizConfigNucleus.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/project/calculateConfig/bizConfigNucleus/entity/BizConfigNucleus.java new file mode 100644 index 00000000..24f7baf0 --- /dev/null +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/project/calculateConfig/bizConfigNucleus/entity/BizConfigNucleus.java @@ -0,0 +1,85 @@ +package org.jeecg.modules.project.calculateConfig.bizConfigNucleus.entity; + +import java.io.Serializable; +import java.io.UnsupportedEncodingException; +import java.util.Date; +import java.math.BigDecimal; +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.annotation.TableLogic; +import lombok.Data; +import com.fasterxml.jackson.annotation.JsonFormat; +import org.springframework.format.annotation.DateTimeFormat; +import org.jeecgframework.poi.excel.annotation.Excel; +import org.jeecg.common.aspect.annotation.Dict; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.EqualsAndHashCode; +import lombok.experimental.Accessors; + +/** + * @Description: 核爆配置表 + * @Author: jeecg-boot + * @Date: 2023-09-20 + * @Version: V1.0 + */ +@Data +@TableName("biz_config_nucleus") +@Accessors(chain = true) +@EqualsAndHashCode(callSuper = false) +@ApiModel(value="biz_config_nucleus对象", description="核爆配置表") +public class BizConfigNucleus implements Serializable { + private static final long serialVersionUID = 1L; + + /**主键*/ + @TableId(type = IdType.ASSIGN_ID) + @ApiModelProperty(value = "主键") + private String id; + /**创建人*/ + @ApiModelProperty(value = "创建人") + private String createBy; + /**创建日期*/ + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") + @ApiModelProperty(value = "创建日期") + private Date createTime; + /**更新人*/ + @ApiModelProperty(value = "更新人") + private String updateBy; + /**更新日期*/ + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") + @ApiModelProperty(value = "更新日期") + private Date updateTime; + /**工程ID*/ + @Excel(name = "工程ID", width = 15) + @ApiModelProperty(value = "工程ID") + private String engineeringId; + /**经度*/ + @Excel(name = "经度", width = 15) + @ApiModelProperty(value = "经度") + private Double lon; + /**纬度*/ + @Excel(name = "纬度", width = 15) + @ApiModelProperty(value = "纬度") + private Double lat; + /**事件时间*/ + @Excel(name = "事件时间", width = 20, format = "yyyy-MM-dd HH:mm:ss") + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") + @ApiModelProperty(value = "事件时间") + private Date eventTime; + /**武器ID*/ + @Excel(name = "武器ID", width = 15) + @ApiModelProperty(value = "武器ID") + private String weaponId; + /**高度*/ + @Excel(name = "高度", width = 15) + @ApiModelProperty(value = "高度") + private Double height; + /**DL*/ + @Excel(name = "DL", width = 15) + @ApiModelProperty(value = "DL") + private Double dl; +} diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/project/calculateConfig/bizConfigNucleus/mapper/BizConfigNucleusMapper.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/project/calculateConfig/bizConfigNucleus/mapper/BizConfigNucleusMapper.java new file mode 100644 index 00000000..9cd2eb4f --- /dev/null +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/project/calculateConfig/bizConfigNucleus/mapper/BizConfigNucleusMapper.java @@ -0,0 +1,17 @@ +package org.jeecg.modules.project.calculateConfig.bizConfigNucleus.mapper; + +import java.util.List; + +import org.apache.ibatis.annotations.Param; +import org.jeecg.modules.project.calculateConfig.bizConfigNucleus.entity.BizConfigNucleus; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; + +/** + * @Description: 核爆配置表 + * @Author: jeecg-boot + * @Date: 2023-09-20 + * @Version: V1.0 + */ +public interface BizConfigNucleusMapper extends BaseMapper { + +} diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/project/calculateConfig/bizConfigNucleus/mapper/xml/BizConfigNucleusMapper.xml b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/project/calculateConfig/bizConfigNucleus/mapper/xml/BizConfigNucleusMapper.xml new file mode 100644 index 00000000..92dd368e --- /dev/null +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/project/calculateConfig/bizConfigNucleus/mapper/xml/BizConfigNucleusMapper.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/project/calculateConfig/bizConfigNucleus/service/IBizConfigNucleusService.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/project/calculateConfig/bizConfigNucleus/service/IBizConfigNucleusService.java new file mode 100644 index 00000000..7c28c245 --- /dev/null +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/project/calculateConfig/bizConfigNucleus/service/IBizConfigNucleusService.java @@ -0,0 +1,14 @@ +package org.jeecg.modules.project.calculateConfig.bizConfigNucleus.service; + +import org.jeecg.modules.project.calculateConfig.bizConfigNucleus.entity.BizConfigNucleus; +import com.baomidou.mybatisplus.extension.service.IService; + +/** + * @Description: 核爆配置表 + * @Author: jeecg-boot + * @Date: 2023-09-20 + * @Version: V1.0 + */ +public interface IBizConfigNucleusService extends IService { + +} diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/project/calculateConfig/bizConfigNucleus/service/impl/BizConfigNucleusServiceImpl.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/project/calculateConfig/bizConfigNucleus/service/impl/BizConfigNucleusServiceImpl.java new file mode 100644 index 00000000..6f5b289f --- /dev/null +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/project/calculateConfig/bizConfigNucleus/service/impl/BizConfigNucleusServiceImpl.java @@ -0,0 +1,19 @@ +package org.jeecg.modules.project.calculateConfig.bizConfigNucleus.service.impl; + +import org.jeecg.modules.project.calculateConfig.bizConfigNucleus.entity.BizConfigNucleus; +import org.jeecg.modules.project.calculateConfig.bizConfigNucleus.mapper.BizConfigNucleusMapper; +import org.jeecg.modules.project.calculateConfig.bizConfigNucleus.service.IBizConfigNucleusService; +import org.springframework.stereotype.Service; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; + +/** + * @Description: 核爆配置表 + * @Author: jeecg-boot + * @Date: 2023-09-20 + * @Version: V1.0 + */ +@Service +public class BizConfigNucleusServiceImpl extends ServiceImpl implements IBizConfigNucleusService { + +} diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/project/bizOpenfoam/controller/BizOpenfoamController.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/project/calculateConfig/bizOpenfoam/controller/BizOpenfoamController.java similarity index 88% rename from jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/project/bizOpenfoam/controller/BizOpenfoamController.java rename to jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/project/calculateConfig/bizOpenfoam/controller/BizOpenfoamController.java index 5bfbd8a8..fa6723bf 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/project/bizOpenfoam/controller/BizOpenfoamController.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/project/calculateConfig/bizOpenfoam/controller/BizOpenfoamController.java @@ -1,63 +1,39 @@ -package org.jeecg.modules.project.bizOpenfoam.controller; +package org.jeecg.modules.project.calculateConfig.bizOpenfoam.controller; import java.io.*; import java.nio.file.Files; import java.nio.file.Path; import java.nio.file.Paths; import java.util.ArrayList; -import java.util.Arrays; import java.util.List; -import java.util.Map; -import java.util.stream.Collectors; -import java.net.URLDecoder; import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; import cn.hutool.core.io.FileUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.opencsv.CSVWriter; import org.apache.commons.lang3.StringUtils; import org.jeecg.common.api.vo.Result; import org.jeecg.common.system.query.QueryGenerator; import org.jeecg.common.util.RemoteExecuteCommand; -import org.jeecg.common.util.oConvertUtils; -import org.jeecg.modules.project.bizEngineering.entity.BizEngineering; -import org.jeecg.modules.project.bizEngineering.service.IBizEngineeringService; -import org.jeecg.modules.project.bizOpenfoam.entity.BizOpenfoam; -import org.jeecg.modules.project.bizOpenfoam.service.IBizOpenfoamService; +import org.jeecg.modules.project.baseConfig.bizEngineering.entity.BizEngineering; +import org.jeecg.modules.project.baseConfig.bizEngineering.service.IBizEngineeringService; +import org.jeecg.modules.project.calculateConfig.bizOpenfoam.entity.BizOpenfoam; +import org.jeecg.modules.project.calculateConfig.bizOpenfoam.service.IBizOpenfoamService; 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.jeecg.modules.project.bizWrf.entity.BizWrf; -import org.jeecg.modules.project.bizWrf.mapper.BizWrfMapper; -import org.jeecgframework.poi.excel.ExcelImportUtil; -import org.jeecgframework.poi.excel.def.NormalExcelConstants; -import org.jeecgframework.poi.excel.entity.ExportParams; -import org.jeecgframework.poi.excel.entity.ImportParams; -import org.jeecgframework.poi.excel.view.JeecgEntityExcelView; +import org.jeecg.modules.project.calculateConfig.bizWrf.entity.BizWrf; +import org.jeecg.modules.project.calculateConfig.bizWrf.mapper.BizWrfMapper; import org.jeecg.common.system.base.controller.JeecgController; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; import org.springframework.web.bind.annotation.*; -import org.springframework.web.multipart.MultipartFile; -import org.springframework.web.multipart.MultipartHttpServletRequest; -import org.springframework.web.servlet.ModelAndView; -import com.alibaba.fastjson.JSON; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.jeecg.common.aspect.annotation.AutoLog; -import org.apache.shiro.authz.annotation.RequiresPermissions; -import ucar.ma2.Array; -import ucar.ma2.Index; -import ucar.nc2.Attribute; -import ucar.nc2.NetcdfFile; -import ucar.nc2.Variable; -import ucar.nc2.dataset.NetcdfDataset; -import static java.nio.file.Files.readAllBytes; import static java.nio.file.Paths.get; /** diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/project/bizOpenfoam/entity/BizOpenfoam.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/project/calculateConfig/bizOpenfoam/entity/BizOpenfoam.java similarity index 93% rename from jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/project/bizOpenfoam/entity/BizOpenfoam.java rename to jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/project/calculateConfig/bizOpenfoam/entity/BizOpenfoam.java index f0a3541a..9b21a330 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/project/bizOpenfoam/entity/BizOpenfoam.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/project/calculateConfig/bizOpenfoam/entity/BizOpenfoam.java @@ -1,18 +1,15 @@ -package org.jeecg.modules.project.bizOpenfoam.entity; +package org.jeecg.modules.project.calculateConfig.bizOpenfoam.entity; import java.io.Serializable; -import java.io.UnsupportedEncodingException; import java.util.Date; -import java.math.BigDecimal; + import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; -import com.baomidou.mybatisplus.annotation.TableLogic; import lombok.Data; import com.fasterxml.jackson.annotation.JsonFormat; import org.springframework.format.annotation.DateTimeFormat; import org.jeecgframework.poi.excel.annotation.Excel; -import org.jeecg.common.aspect.annotation.Dict; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.EqualsAndHashCode; diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/project/bizOpenfoam/mapper/BizOpenfoamMapper.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/project/calculateConfig/bizOpenfoam/mapper/BizOpenfoamMapper.java similarity index 54% rename from jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/project/bizOpenfoam/mapper/BizOpenfoamMapper.java rename to jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/project/calculateConfig/bizOpenfoam/mapper/BizOpenfoamMapper.java index 18cadb03..c290dbdf 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/project/bizOpenfoam/mapper/BizOpenfoamMapper.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/project/calculateConfig/bizOpenfoam/mapper/BizOpenfoamMapper.java @@ -1,9 +1,6 @@ -package org.jeecg.modules.project.bizOpenfoam.mapper; +package org.jeecg.modules.project.calculateConfig.bizOpenfoam.mapper; -import java.util.List; - -import org.apache.ibatis.annotations.Param; -import org.jeecg.modules.project.bizOpenfoam.entity.BizOpenfoam; +import org.jeecg.modules.project.calculateConfig.bizOpenfoam.entity.BizOpenfoam; import com.baomidou.mybatisplus.core.mapper.BaseMapper; /** diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/project/calculateConfig/bizOpenfoam/mapper/xml/BizOpenfoamMapper.xml b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/project/calculateConfig/bizOpenfoam/mapper/xml/BizOpenfoamMapper.xml new file mode 100644 index 00000000..843d3668 --- /dev/null +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/project/calculateConfig/bizOpenfoam/mapper/xml/BizOpenfoamMapper.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/project/bizOpenfoam/service/IBizOpenfoamService.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/project/calculateConfig/bizOpenfoam/service/IBizOpenfoamService.java similarity index 61% rename from jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/project/bizOpenfoam/service/IBizOpenfoamService.java rename to jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/project/calculateConfig/bizOpenfoam/service/IBizOpenfoamService.java index 8e3fe3a3..cefd9575 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/project/bizOpenfoam/service/IBizOpenfoamService.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/project/calculateConfig/bizOpenfoam/service/IBizOpenfoamService.java @@ -1,8 +1,8 @@ -package org.jeecg.modules.project.bizOpenfoam.service; +package org.jeecg.modules.project.calculateConfig.bizOpenfoam.service; -import org.jeecg.modules.project.bizOpenfoam.entity.BizOpenfoam; +import org.jeecg.modules.project.calculateConfig.bizOpenfoam.entity.BizOpenfoam; import com.baomidou.mybatisplus.extension.service.IService; -import org.jeecg.modules.project.bizWrf.entity.BizWrf; +import org.jeecg.modules.project.calculateConfig.bizWrf.entity.BizWrf; import java.util.List; diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/project/bizOpenfoam/service/impl/BizOpenfoamServiceImpl.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/project/calculateConfig/bizOpenfoam/service/impl/BizOpenfoamServiceImpl.java similarity index 88% rename from jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/project/bizOpenfoam/service/impl/BizOpenfoamServiceImpl.java rename to jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/project/calculateConfig/bizOpenfoam/service/impl/BizOpenfoamServiceImpl.java index 60562d02..cacbe01e 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/project/bizOpenfoam/service/impl/BizOpenfoamServiceImpl.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/project/calculateConfig/bizOpenfoam/service/impl/BizOpenfoamServiceImpl.java @@ -1,13 +1,9 @@ -package org.jeecg.modules.project.bizOpenfoam.service.impl; +package org.jeecg.modules.project.calculateConfig.bizOpenfoam.service.impl; -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import org.apache.commons.lang3.StringUtils; -import org.jeecg.modules.project.bizOpenfoam.entity.BizOpenfoam; -import org.jeecg.modules.project.bizOpenfoam.mapper.BizOpenfoamMapper; -import org.jeecg.modules.project.bizOpenfoam.service.IBizOpenfoamService; -import org.jeecg.modules.project.bizWrf.entity.BizWrf; -import org.jeecg.modules.project.bizWrf.mapper.BizWrfMapper; -import org.springframework.beans.factory.annotation.Autowired; +import org.jeecg.modules.project.calculateConfig.bizOpenfoam.entity.BizOpenfoam; +import org.jeecg.modules.project.calculateConfig.bizOpenfoam.mapper.BizOpenfoamMapper; +import org.jeecg.modules.project.calculateConfig.bizOpenfoam.service.IBizOpenfoamService; +import org.jeecg.modules.project.calculateConfig.bizWrf.entity.BizWrf; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Service; diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/project/bizWrf/controller/BizWrfController.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/project/calculateConfig/bizWrf/controller/BizWrfController.java similarity index 91% rename from jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/project/bizWrf/controller/BizWrfController.java rename to jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/project/calculateConfig/bizWrf/controller/BizWrfController.java index 972ef7c7..56b30799 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/project/bizWrf/controller/BizWrfController.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/project/calculateConfig/bizWrf/controller/BizWrfController.java @@ -1,14 +1,9 @@ -package org.jeecg.modules.project.bizWrf.controller; +package org.jeecg.modules.project.calculateConfig.bizWrf.controller; import java.io.*; -import java.nio.file.Files; -import java.nio.file.Path; -import java.nio.file.Paths; import java.text.ParseException; import java.text.SimpleDateFormat; import java.util.*; -import java.util.stream.Collectors; -import java.net.URLDecoder; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; @@ -18,47 +13,33 @@ import cn.hutool.core.io.FileUtil; import cn.hutool.core.util.ObjectUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.jcraft.jsch.SftpException; -import org.apache.commons.lang3.StringUtils; import org.jeecg.common.api.vo.Result; import org.jeecg.common.system.query.QueryGenerator; -import org.jeecg.common.util.DateUtils; import org.jeecg.common.util.RemoteExecuteCommand; -import org.jeecg.common.util.oConvertUtils; -import org.jeecg.modules.project.bizEngineering.entity.BizEngineering; -import org.jeecg.modules.project.bizEngineering.service.IBizEngineeringService; -import org.jeecg.modules.project.bizOpenfoam.entity.BizOpenfoam; -import org.jeecg.modules.project.bizOpenfoam.service.IBizOpenfoamService; -import org.jeecg.modules.project.bizWrf.entity.BizWrf; -import org.jeecg.modules.project.bizWrf.service.IBizWrfService; +import org.jeecg.modules.project.baseConfig.bizEngineering.entity.BizEngineering; +import org.jeecg.modules.project.baseConfig.bizEngineering.service.IBizEngineeringService; +import org.jeecg.modules.project.calculateConfig.bizOpenfoam.entity.BizOpenfoam; +import org.jeecg.modules.project.calculateConfig.bizOpenfoam.service.IBizOpenfoamService; +import org.jeecg.modules.project.calculateConfig.bizWrf.entity.BizWrf; +import org.jeecg.modules.project.calculateConfig.bizWrf.service.IBizWrfService; 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.jeecg.modules.project.util.CmdUtil; -import org.jeecg.modules.project.util.SFTPUtil; -import org.jeecgframework.poi.excel.ExcelImportUtil; -import org.jeecgframework.poi.excel.def.NormalExcelConstants; -import org.jeecgframework.poi.excel.entity.ExportParams; -import org.jeecgframework.poi.excel.entity.ImportParams; -import org.jeecgframework.poi.excel.view.JeecgEntityExcelView; +import org.jeecg.modules.util.SFTPUtil; import org.jeecg.common.system.base.controller.JeecgController; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; import org.springframework.web.bind.annotation.*; -import org.springframework.web.multipart.MultipartFile; -import org.springframework.web.multipart.MultipartHttpServletRequest; import org.springframework.web.servlet.ModelAndView; -import com.alibaba.fastjson.JSON; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.jeecg.common.aspect.annotation.AutoLog; -import org.apache.shiro.authz.annotation.RequiresPermissions; import ucar.ma2.Array; import ucar.ma2.Index; import ucar.nc2.NetcdfFile; -import ucar.nc2.ProxyReader; import ucar.nc2.Variable; import ucar.nc2.dataset.NetcdfDataset; @@ -162,7 +143,7 @@ public class BizWrfController extends JeecgController { if (!file.exists()) { file.mkdir(); }else{ - file.delete(); + RemoteExecuteCommand.runRemoteLinuxCmd(ip, username, password, String.format("rm -rf %s",newAllRunPath)); file.mkdir(); } String runCmd = String.format("cp -r %sAll_Run %s", baseHome, newAllRunPath); @@ -367,10 +348,10 @@ public class BizWrfController extends JeecgController { SFTPUtil sftpUtil = new SFTPUtil(); sftpUtil.login(username, password,ip,port); - sftpUtil.download(allRunPath + "WRF/run","wrf.log",localFilePath + "wrf.log"); - String wrfLog = new String(readAllBytes(get(localFilePath + "wrf.log"))); -// sftpUtil.download(allRunPath + "WRF/run","rsl.out.0000",localFilePath + "rsl.out.0000"); -// String wrfLog = new String(readAllBytes(get(localFilePath + "rsl.out.0000"))); +// sftpUtil.download(allRunPath + "WRF/run","wrf.log",localFilePath + "wrf.log"); +// String wrfLog = new String(readAllBytes(get(localFilePath + "wrf.log"))); + sftpUtil.download(allRunPath + "WRF/run","rsl.out.0000",localFilePath + "rsl.out.0000"); + String wrfLog = new String(readAllBytes(get(localFilePath + "rsl.out.0000"))); if(wrfLog.indexOf("SUCCESS COMPLETE WRF") > 0){ String format = "yyyy-MM-dd_HH:mm:ss"; DateTime startTime = DateUtil.parse(bizWrf.getStartTime(), format); @@ -433,14 +414,14 @@ public class BizWrfController extends JeecgController { int column = 0; BizEngineering bizEngineering = bizEngineeringService.getById(engineeringId); try { - NetcdfFile ncfile = NetcdfDataset.open("C:\\Users\\13673\\Desktop\\某源\\Nuclear\\file\\wrfout_d01_2016-07-01_00_00_00"); -// BizWrf bizWrf = bizWrfService.getOne(new LambdaQueryWrapper().eq(BizWrf::getEngineeringId,bizEngineering.getId())); -// String format = "yyyy-MM-dd_HH:mm:ss"; -// DateTime startTime = DateUtil.parse(bizWrf.getStartTime(), format); -// long oneDaySecs = 60 * 60 * 24 * 1000; -// String newStartTime = DateUtil.format(new Date(startTime.getTime() + oneDaySecs), format); -// String ncNameWrf = "wrfout_d01_" + newStartTime; -// NetcdfFile ncfile = NetcdfDataset.open(localFilePrefix + ncNameWrf); +// NetcdfFile ncfile = NetcdfDataset.open("C:\\Users\\13673\\Desktop\\某源\\Nuclear\\file\\wrfout_d01_2016-07-01_00_00_00"); + BizWrf bizWrf = bizWrfService.getOne(new LambdaQueryWrapper().eq(BizWrf::getEngineeringId,bizEngineering.getId())); + String format = "yyyy-MM-dd_HH:mm:ss"; + DateTime startTime = DateUtil.parse(bizWrf.getStartTime(), format); + long oneDaySecs = 60 * 60 * 24 * 1000; + String newStartTime = DateUtil.format(new Date(startTime.getTime() + oneDaySecs), format); + String ncNameWrf = "wrfout_d01_" + newStartTime; + NetcdfFile ncfile = NetcdfDataset.open(localFilePrefix + ncNameWrf); List>> xlatAllList = getNCByName(ncfile, "XLAT",layer); List>> xlongAllList = getNCByName(ncfile, "XLONG",layer); List>> uAllList = getNCByName(ncfile, "U",layer); @@ -494,14 +475,14 @@ public class BizWrfController extends JeecgController { int column = 0; BizEngineering bizEngineering = bizEngineeringService.getById(engineeringId); try { - NetcdfFile ncfile = NetcdfDataset.open("C:\\Users\\13673\\Desktop\\某源\\Nuclear\\file\\wrfout_d01_2016-07-01_00_00_00"); -// BizWrf bizWrf = bizWrfService.getOne(new LambdaQueryWrapper().eq(BizWrf::getEngineeringId,bizEngineering.getId())); -// String format = "yyyy-MM-dd_HH:mm:ss"; -// DateTime startTime = DateUtil.parse(bizWrf.getStartTime(), format); -// long oneDaySecs = 60 * 60 * 24 * 1000; -// String newStartTime = DateUtil.format(new Date(startTime.getTime() + oneDaySecs), format); -// String ncNameWrf = "wrfout_d01_" + newStartTime; -// NetcdfFile ncfile = NetcdfDataset.open(localFilePrefix + ncNameWrf); +// NetcdfFile ncfile = NetcdfDataset.open("C:\\Users\\13673\\Desktop\\某源\\Nuclear\\file\\wrfout_d01_2016-07-01_00_00_00"); + BizWrf bizWrf = bizWrfService.getOne(new LambdaQueryWrapper().eq(BizWrf::getEngineeringId,bizEngineering.getId())); + String format = "yyyy-MM-dd_HH:mm:ss"; + DateTime startTime = DateUtil.parse(bizWrf.getStartTime(), format); + long oneDaySecs = 60 * 60 * 24 * 1000; + String newStartTime = DateUtil.format(new Date(startTime.getTime() + oneDaySecs), format); + String ncNameWrf = "wrfout_d01_" + newStartTime; + NetcdfFile ncfile = NetcdfDataset.open(localFilePrefix + ncNameWrf); List>> hgtAllList = getNCByName(ncfile, "HGT",0); List>> xlatAllList = getNCByName(ncfile, "XLAT",0); List>> xlongAllList = getNCByName(ncfile, "XLONG",0); @@ -655,6 +636,22 @@ public class BizWrfController extends JeecgController { return Result.OK(bizWrf); } + /** + * 通过temType查询模板 + * + * @return + */ + //@AutoLog(value = "wrf-通过temType查询模板") + @ApiOperation(value="wrf-通过temType查询模板", notes="wrf-通过temType查询模板") + @GetMapping(value = "/getWrfTem") + public Result getWrfTem() { + BizWrf bizWrf = bizWrfService.getOne(new LambdaQueryWrapper().eq(BizWrf::getTemType,0)); + if(bizWrf==null) { + return Result.error("未找到对应数据"); + } + return Result.OK(bizWrf); + } + /** * 查询wrf参数 * diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/project/bizWrf/entity/BizWrf.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/project/calculateConfig/bizWrf/entity/BizWrf.java similarity index 96% rename from jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/project/bizWrf/entity/BizWrf.java rename to jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/project/calculateConfig/bizWrf/entity/BizWrf.java index b7409863..e0e8db32 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/project/bizWrf/entity/BizWrf.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/project/calculateConfig/bizWrf/entity/BizWrf.java @@ -1,18 +1,15 @@ -package org.jeecg.modules.project.bizWrf.entity; +package org.jeecg.modules.project.calculateConfig.bizWrf.entity; import java.io.Serializable; -import java.io.UnsupportedEncodingException; import java.util.Date; -import java.math.BigDecimal; + import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; -import com.baomidou.mybatisplus.annotation.TableLogic; import lombok.Data; import com.fasterxml.jackson.annotation.JsonFormat; import org.springframework.format.annotation.DateTimeFormat; import org.jeecgframework.poi.excel.annotation.Excel; -import org.jeecg.common.aspect.annotation.Dict; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.EqualsAndHashCode; @@ -173,7 +170,10 @@ public class BizWrf implements Serializable { @Excel(name = "yIndex", width = 15) @ApiModelProperty(value = "yIndex") private int yIndex; - ; + @Excel(name = "temType", width = 15) + @ApiModelProperty(value = "temType") + private int temType; + /* add 23/01/10 */ diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/project/bizWrf/mapper/BizWrfMapper.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/project/calculateConfig/bizWrf/mapper/BizWrfMapper.java similarity index 60% rename from jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/project/bizWrf/mapper/BizWrfMapper.java rename to jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/project/calculateConfig/bizWrf/mapper/BizWrfMapper.java index 33805c48..fbe3ad42 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/project/bizWrf/mapper/BizWrfMapper.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/project/calculateConfig/bizWrf/mapper/BizWrfMapper.java @@ -1,10 +1,7 @@ -package org.jeecg.modules.project.bizWrf.mapper; - -import java.util.List; +package org.jeecg.modules.project.calculateConfig.bizWrf.mapper; import org.apache.ibatis.annotations.Mapper; -import org.apache.ibatis.annotations.Param; -import org.jeecg.modules.project.bizWrf.entity.BizWrf; +import org.jeecg.modules.project.calculateConfig.bizWrf.entity.BizWrf; import com.baomidou.mybatisplus.core.mapper.BaseMapper; /** diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/project/bizWrf/mapper/xml/BizWrfMapper.xml b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/project/calculateConfig/bizWrf/mapper/xml/BizWrfMapper.xml similarity index 63% rename from jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/project/bizWrf/mapper/xml/BizWrfMapper.xml rename to jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/project/calculateConfig/bizWrf/mapper/xml/BizWrfMapper.xml index fbb46f84..83b5e57b 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/project/bizWrf/mapper/xml/BizWrfMapper.xml +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/project/calculateConfig/bizWrf/mapper/xml/BizWrfMapper.xml @@ -1,5 +1,5 @@ - + \ No newline at end of file diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/project/bizWrf/service/IBizWrfService.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/project/calculateConfig/bizWrf/service/IBizWrfService.java similarity index 61% rename from jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/project/bizWrf/service/IBizWrfService.java rename to jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/project/calculateConfig/bizWrf/service/IBizWrfService.java index 59adb638..02deebc6 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/project/bizWrf/service/IBizWrfService.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/project/calculateConfig/bizWrf/service/IBizWrfService.java @@ -1,6 +1,6 @@ -package org.jeecg.modules.project.bizWrf.service; +package org.jeecg.modules.project.calculateConfig.bizWrf.service; -import org.jeecg.modules.project.bizWrf.entity.BizWrf; +import org.jeecg.modules.project.calculateConfig.bizWrf.entity.BizWrf; import com.baomidou.mybatisplus.extension.service.IService; /** diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/project/bizWrf/service/impl/BizWrfServiceImpl.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/project/calculateConfig/bizWrf/service/impl/BizWrfServiceImpl.java similarity index 52% rename from jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/project/bizWrf/service/impl/BizWrfServiceImpl.java rename to jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/project/calculateConfig/bizWrf/service/impl/BizWrfServiceImpl.java index f77acb57..3b8b12f5 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/project/bizWrf/service/impl/BizWrfServiceImpl.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/project/calculateConfig/bizWrf/service/impl/BizWrfServiceImpl.java @@ -1,8 +1,8 @@ -package org.jeecg.modules.project.bizWrf.service.impl; +package org.jeecg.modules.project.calculateConfig.bizWrf.service.impl; -import org.jeecg.modules.project.bizWrf.entity.BizWrf; -import org.jeecg.modules.project.bizWrf.mapper.BizWrfMapper; -import org.jeecg.modules.project.bizWrf.service.IBizWrfService; +import org.jeecg.modules.project.calculateConfig.bizWrf.entity.BizWrf; +import org.jeecg.modules.project.calculateConfig.bizWrf.mapper.BizWrfMapper; +import org.jeecg.modules.project.calculateConfig.bizWrf.service.IBizWrfService; import org.springframework.stereotype.Service; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/project/bizWrf/vue/BizWrfList.vue b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/project/calculateConfig/bizWrf/vue/BizWrfList.vue similarity index 100% rename from jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/project/bizWrf/vue/BizWrfList.vue rename to jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/project/calculateConfig/bizWrf/vue/BizWrfList.vue diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/project/bizWrf/vue/BizWrf_menu_insert.sql b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/project/calculateConfig/bizWrf/vue/BizWrf_menu_insert.sql similarity index 100% rename from jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/project/bizWrf/vue/BizWrf_menu_insert.sql rename to jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/project/calculateConfig/bizWrf/vue/BizWrf_menu_insert.sql diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/project/bizWrf/vue/modules/BizWrfForm.vue b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/project/calculateConfig/bizWrf/vue/modules/BizWrfForm.vue similarity index 100% rename from jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/project/bizWrf/vue/modules/BizWrfForm.vue rename to jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/project/calculateConfig/bizWrf/vue/modules/BizWrfForm.vue diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/project/bizWrf/vue/modules/BizWrfModal.Style#Drawer.vue b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/project/calculateConfig/bizWrf/vue/modules/BizWrfModal.Style#Drawer.vue similarity index 100% rename from jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/project/bizWrf/vue/modules/BizWrfModal.Style#Drawer.vue rename to jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/project/calculateConfig/bizWrf/vue/modules/BizWrfModal.Style#Drawer.vue diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/project/bizWrf/vue/modules/BizWrfModal.vue b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/project/calculateConfig/bizWrf/vue/modules/BizWrfModal.vue similarity index 100% rename from jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/project/bizWrf/vue/modules/BizWrfModal.vue rename to jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/project/calculateConfig/bizWrf/vue/modules/BizWrfModal.vue diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/project/calculateResult/bizResultDiffuse/controller/BizResultDiffuseController.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/project/calculateResult/bizResultDiffuse/controller/BizResultDiffuseController.java new file mode 100644 index 00000000..aef1ba84 --- /dev/null +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/project/calculateResult/bizResultDiffuse/controller/BizResultDiffuseController.java @@ -0,0 +1,198 @@ +package org.jeecg.modules.project.calculateResult.bizResultDiffuse.controller; + +import java.util.Arrays; +import java.util.List; +import java.util.Map; +import java.util.stream.Collectors; +import java.io.IOException; +import java.io.UnsupportedEncodingException; +import java.net.URLDecoder; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import org.jeecg.common.api.vo.Result; +import org.jeecg.common.system.query.QueryGenerator; +import org.jeecg.common.util.oConvertUtils; +import org.jeecg.modules.project.calculateResult.bizResultDiffuse.entity.BizResultDiffuse; +import org.jeecg.modules.project.calculateResult.bizResultDiffuse.service.IBizResultDiffuseService; + +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.jeecgframework.poi.excel.ExcelImportUtil; +import org.jeecgframework.poi.excel.def.NormalExcelConstants; +import org.jeecgframework.poi.excel.entity.ExportParams; +import org.jeecgframework.poi.excel.entity.ImportParams; +import org.jeecgframework.poi.excel.view.JeecgEntityExcelView; +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.multipart.MultipartFile; +import org.springframework.web.multipart.MultipartHttpServletRequest; +import org.springframework.web.servlet.ModelAndView; +import com.alibaba.fastjson.JSON; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.jeecg.common.aspect.annotation.AutoLog; +import org.apache.shiro.authz.annotation.RequiresPermissions; + + /** + * @Description: 扩散计算结果配置表 + * @Author: jeecg-boot + * @Date: 2023-09-20 + * @Version: V1.0 + */ +@Api(tags="扩散计算结果配置表") +@RestController +@RequestMapping("/bizResultDiffuse/bizResultDiffuse") +@Slf4j +public class BizResultDiffuseController extends JeecgController { + @Autowired + private IBizResultDiffuseService bizResultDiffuseService; + + /** + * 分页列表查询 + * + * @param bizResultDiffuse + * @param pageNo + * @param pageSize + * @param req + * @return + */ + //@AutoLog(value = "扩散计算结果配置表-分页列表查询") + @ApiOperation(value="扩散计算结果配置表-分页列表查询", notes="扩散计算结果配置表-分页列表查询") + @GetMapping(value = "/list") + public Result> queryPageList(BizResultDiffuse bizResultDiffuse, + @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, + @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, + HttpServletRequest req) { + QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(bizResultDiffuse, req.getParameterMap()); + Page page = new Page(pageNo, pageSize); + IPage pageList = bizResultDiffuseService.page(page, queryWrapper); + return Result.OK(pageList); + } + + /** + * 添加 + * + * @param bizResultDiffuse + * @return + */ + @AutoLog(value = "扩散计算结果配置表-添加") + @ApiOperation(value="扩散计算结果配置表-添加", notes="扩散计算结果配置表-添加") + @RequiresPermissions("bizResultDiffuse:biz_result_diffuse:add") + @PostMapping(value = "/add") + public Result add(@RequestBody BizResultDiffuse bizResultDiffuse) { + bizResultDiffuseService.save(bizResultDiffuse); + return Result.OK("添加成功！"); + } + + /** + * 编辑 + * + * @param bizResultDiffuse + * @return + */ + @AutoLog(value = "扩散计算结果配置表-编辑") + @ApiOperation(value="扩散计算结果配置表-编辑", notes="扩散计算结果配置表-编辑") + @RequiresPermissions("bizResultDiffuse:biz_result_diffuse:edit") + @RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST}) + public Result edit(@RequestBody BizResultDiffuse bizResultDiffuse) { + bizResultDiffuseService.updateById(bizResultDiffuse); + return Result.OK("编辑成功!"); + } + + /** + * 通过id删除 + * + * @param id + * @return + */ + @AutoLog(value = "扩散计算结果配置表-通过id删除") + @ApiOperation(value="扩散计算结果配置表-通过id删除", notes="扩散计算结果配置表-通过id删除") + @RequiresPermissions("bizResultDiffuse:biz_result_diffuse:delete") + @DeleteMapping(value = "/delete") + public Result delete(@RequestParam(name="id",required=true) String id) { + bizResultDiffuseService.removeById(id); + return Result.OK("删除成功!"); + } + + /** + * 批量删除 + * + * @param ids + * @return + */ + @AutoLog(value = "扩散计算结果配置表-批量删除") + @ApiOperation(value="扩散计算结果配置表-批量删除", notes="扩散计算结果配置表-批量删除") + @RequiresPermissions("bizResultDiffuse:biz_result_diffuse:deleteBatch") + @DeleteMapping(value = "/deleteBatch") + public Result deleteBatch(@RequestParam(name="ids",required=true) String ids) { + this.bizResultDiffuseService.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) { + BizResultDiffuse bizResultDiffuse = bizResultDiffuseService.getById(id); + if(bizResultDiffuse==null) { + return Result.error("未找到对应数据"); + } + return Result.OK(bizResultDiffuse); + } + + /** + * 通过工程ID查询 + * + * @param engineeringId + * @return + */ + @ApiOperation(value="扩散计算结果配置表-通过工程ID查询", notes="扩散计算结果配置表-通过工程ID查询") + @GetMapping(value = "/getDiffuseByEngId") + public Result getDiffuseByEngId(@RequestParam(name="engineeringId",required=true) String engineeringId) { + BizResultDiffuse bizResultDiffuse = bizResultDiffuseService. + getOne(new LambdaQueryWrapper().eq(BizResultDiffuse::getEngineeringId,engineeringId)); + if(bizResultDiffuse==null) { + return Result.error("未找到对应数据"); + } + return Result.OK(bizResultDiffuse); + } + + + /** + * 导出excel + * + * @param request + * @param bizResultDiffuse + */ + @RequiresPermissions("bizResultDiffuse:biz_result_diffuse:exportXls") + @RequestMapping(value = "/exportXls") + public ModelAndView exportXls(HttpServletRequest request, BizResultDiffuse bizResultDiffuse) { + return super.exportXls(request, bizResultDiffuse, BizResultDiffuse.class, "扩散计算结果配置表"); + } + + /** + * 通过excel导入数据 + * + * @param request + * @param response + * @return + */ + @RequiresPermissions("bizResultDiffuse:biz_result_diffuse:importExcel") + @RequestMapping(value = "/importExcel", method = RequestMethod.POST) + public Result importExcel(HttpServletRequest request, HttpServletResponse response) { + return super.importExcel(request, response, BizResultDiffuse.class); + } + +} diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/project/calculateResult/bizResultDiffuse/entity/BizResultDiffuse.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/project/calculateResult/bizResultDiffuse/entity/BizResultDiffuse.java new file mode 100644 index 00000000..b7118779 --- /dev/null +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/project/calculateResult/bizResultDiffuse/entity/BizResultDiffuse.java @@ -0,0 +1,79 @@ +package org.jeecg.modules.project.calculateResult.bizResultDiffuse.entity; + +import java.io.Serializable; +import java.io.UnsupportedEncodingException; +import java.util.Date; +import java.math.BigDecimal; +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.annotation.TableLogic; +import lombok.Data; +import com.fasterxml.jackson.annotation.JsonFormat; +import org.springframework.format.annotation.DateTimeFormat; +import org.jeecgframework.poi.excel.annotation.Excel; +import org.jeecg.common.aspect.annotation.Dict; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.EqualsAndHashCode; +import lombok.experimental.Accessors; + +/** + * @Description: 扩散计算结果配置表 + * @Author: jeecg-boot + * @Date: 2023-09-20 + * @Version: V1.0 + */ +@Data +@TableName("biz_result_diffuse") +@Accessors(chain = true) +@EqualsAndHashCode(callSuper = false) +@ApiModel(value="biz_result_diffuse对象", description="扩散计算结果配置表") +public class BizResultDiffuse implements Serializable { + private static final long serialVersionUID = 1L; + + /**主键*/ + @TableId(type = IdType.ASSIGN_ID) + @ApiModelProperty(value = "主键") + private String id; + /**创建人*/ + @ApiModelProperty(value = "创建人") + private String createBy; + /**创建日期*/ + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") + @ApiModelProperty(value = "创建日期") + private Date createTime; + /**更新人*/ + @ApiModelProperty(value = "更新人") + private String updateBy; + /**更新日期*/ + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") + @ApiModelProperty(value = "更新日期") + private Date updateTime; + /**经度*/ + @Excel(name = "经度", width = 15) + @ApiModelProperty(value = "经度") + private Double lon; + /**纬度*/ + @Excel(name = "纬度", width = 15) + @ApiModelProperty(value = "纬度") + private Double lat; + /**高度*/ + @Excel(name = "高度", width = 15) + @ApiModelProperty(value = "高度") + private Double height; + /**横截面*/ + @Excel(name = "横截面", width = 15) + @ApiModelProperty(value = "横截面") + private Integer crossSection; + /**竖截面*/ + @Excel(name = "竖截面", width = 15) + @ApiModelProperty(value = "竖截面") + private Integer verticalSection; + /**工程ID*/ + @Excel(name = "工程ID", width = 15) + @ApiModelProperty(value = "工程ID") + private String engineeringId; +} diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/project/calculateResult/bizResultDiffuse/mapper/BizResultDiffuseMapper.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/project/calculateResult/bizResultDiffuse/mapper/BizResultDiffuseMapper.java new file mode 100644 index 00000000..b5027b13 --- /dev/null +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/project/calculateResult/bizResultDiffuse/mapper/BizResultDiffuseMapper.java @@ -0,0 +1,17 @@ +package org.jeecg.modules.project.calculateResult.bizResultDiffuse.mapper; + +import java.util.List; + +import org.apache.ibatis.annotations.Param; +import org.jeecg.modules.project.calculateResult.bizResultDiffuse.entity.BizResultDiffuse; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; + +/** + * @Description: 扩散计算结果配置表 + * @Author: jeecg-boot + * @Date: 2023-09-20 + * @Version: V1.0 + */ +public interface BizResultDiffuseMapper extends BaseMapper { + +} diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/project/calculateResult/bizResultDiffuse/mapper/xml/BizResultDiffuseMapper.xml b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/project/calculateResult/bizResultDiffuse/mapper/xml/BizResultDiffuseMapper.xml new file mode 100644 index 00000000..0f33a562 --- /dev/null +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/project/calculateResult/bizResultDiffuse/mapper/xml/BizResultDiffuseMapper.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/project/calculateResult/bizResultDiffuse/service/IBizResultDiffuseService.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/project/calculateResult/bizResultDiffuse/service/IBizResultDiffuseService.java new file mode 100644 index 00000000..58bb2924 --- /dev/null +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/project/calculateResult/bizResultDiffuse/service/IBizResultDiffuseService.java @@ -0,0 +1,14 @@ +package org.jeecg.modules.project.calculateResult.bizResultDiffuse.service; + +import org.jeecg.modules.project.calculateResult.bizResultDiffuse.entity.BizResultDiffuse; +import com.baomidou.mybatisplus.extension.service.IService; + +/** + * @Description: 扩散计算结果配置表 + * @Author: jeecg-boot + * @Date: 2023-09-20 + * @Version: V1.0 + */ +public interface IBizResultDiffuseService extends IService { + +} diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/project/calculateResult/bizResultDiffuse/service/impl/BizResultDiffuseServiceImpl.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/project/calculateResult/bizResultDiffuse/service/impl/BizResultDiffuseServiceImpl.java new file mode 100644 index 00000000..58f953bc --- /dev/null +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/project/calculateResult/bizResultDiffuse/service/impl/BizResultDiffuseServiceImpl.java @@ -0,0 +1,19 @@ +package org.jeecg.modules.project.calculateResult.bizResultDiffuse.service.impl; + +import org.jeecg.modules.project.calculateResult.bizResultDiffuse.entity.BizResultDiffuse; +import org.jeecg.modules.project.calculateResult.bizResultDiffuse.mapper.BizResultDiffuseMapper; +import org.jeecg.modules.project.calculateResult.bizResultDiffuse.service.IBizResultDiffuseService; +import org.springframework.stereotype.Service; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; + +/** + * @Description: 扩散计算结果配置表 + * @Author: jeecg-boot + * @Date: 2023-09-20 + * @Version: V1.0 + */ +@Service +public class BizResultDiffuseServiceImpl extends ServiceImpl implements IBizResultDiffuseService { + +} diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/project/calculateResult/bizResultDosage/controller/BizResultDosageController.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/project/calculateResult/bizResultDosage/controller/BizResultDosageController.java new file mode 100644 index 00000000..b0421fb8 --- /dev/null +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/project/calculateResult/bizResultDosage/controller/BizResultDosageController.java @@ -0,0 +1,198 @@ +package org.jeecg.modules.project.calculateResult.bizResultDosage.controller; + +import java.util.Arrays; +import java.util.List; +import java.util.Map; +import java.util.stream.Collectors; +import java.io.IOException; +import java.io.UnsupportedEncodingException; +import java.net.URLDecoder; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import org.jeecg.common.api.vo.Result; +import org.jeecg.common.system.query.QueryGenerator; +import org.jeecg.common.util.oConvertUtils; +import org.jeecg.modules.project.calculateResult.bizResultDiffuse.entity.BizResultDiffuse; +import org.jeecg.modules.project.calculateResult.bizResultDosage.entity.BizResultDosage; +import org.jeecg.modules.project.calculateResult.bizResultDosage.service.IBizResultDosageService; + +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.jeecgframework.poi.excel.ExcelImportUtil; +import org.jeecgframework.poi.excel.def.NormalExcelConstants; +import org.jeecgframework.poi.excel.entity.ExportParams; +import org.jeecgframework.poi.excel.entity.ImportParams; +import org.jeecgframework.poi.excel.view.JeecgEntityExcelView; +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.multipart.MultipartFile; +import org.springframework.web.multipart.MultipartHttpServletRequest; +import org.springframework.web.servlet.ModelAndView; +import com.alibaba.fastjson.JSON; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.jeecg.common.aspect.annotation.AutoLog; +import org.apache.shiro.authz.annotation.RequiresPermissions; + + /** + * @Description: 剂量计算结果配置表 + * @Author: jeecg-boot + * @Date: 2023-09-20 + * @Version: V1.0 + */ +@Api(tags="剂量计算结果配置表") +@RestController +@RequestMapping("/bizResultDosage/bizResultDosage") +@Slf4j +public class BizResultDosageController extends JeecgController { + @Autowired + private IBizResultDosageService bizResultDosageService; + + /** + * 分页列表查询 + * + * @param bizResultDosage + * @param pageNo + * @param pageSize + * @param req + * @return + */ + //@AutoLog(value = "剂量计算结果配置表-分页列表查询") + @ApiOperation(value="剂量计算结果配置表-分页列表查询", notes="剂量计算结果配置表-分页列表查询") + @GetMapping(value = "/list") + public Result> queryPageList(BizResultDosage bizResultDosage, + @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, + @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, + HttpServletRequest req) { + QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(bizResultDosage, req.getParameterMap()); + Page page = new Page(pageNo, pageSize); + IPage pageList = bizResultDosageService.page(page, queryWrapper); + return Result.OK(pageList); + } + + /** + * 添加 + * + * @param bizResultDosage + * @return + */ + @AutoLog(value = "剂量计算结果配置表-添加") + @ApiOperation(value="剂量计算结果配置表-添加", notes="剂量计算结果配置表-添加") + @RequiresPermissions("bizResultDosage:biz_result_dosage:add") + @PostMapping(value = "/add") + public Result add(@RequestBody BizResultDosage bizResultDosage) { + bizResultDosageService.save(bizResultDosage); + return Result.OK("添加成功！"); + } + + /** + * 编辑 + * + * @param bizResultDosage + * @return + */ + @AutoLog(value = "剂量计算结果配置表-编辑") + @ApiOperation(value="剂量计算结果配置表-编辑", notes="剂量计算结果配置表-编辑") + @RequiresPermissions("bizResultDosage:biz_result_dosage:edit") + @RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST}) + public Result edit(@RequestBody BizResultDosage bizResultDosage) { + bizResultDosageService.updateById(bizResultDosage); + return Result.OK("编辑成功!"); + } + + /** + * 通过id删除 + * + * @param id + * @return + */ + @AutoLog(value = "剂量计算结果配置表-通过id删除") + @ApiOperation(value="剂量计算结果配置表-通过id删除", notes="剂量计算结果配置表-通过id删除") + @RequiresPermissions("bizResultDosage:biz_result_dosage:delete") + @DeleteMapping(value = "/delete") + public Result delete(@RequestParam(name="id",required=true) String id) { + bizResultDosageService.removeById(id); + return Result.OK("删除成功!"); + } + + /** + * 批量删除 + * + * @param ids + * @return + */ + @AutoLog(value = "剂量计算结果配置表-批量删除") + @ApiOperation(value="剂量计算结果配置表-批量删除", notes="剂量计算结果配置表-批量删除") + @RequiresPermissions("bizResultDosage:biz_result_dosage:deleteBatch") + @DeleteMapping(value = "/deleteBatch") + public Result deleteBatch(@RequestParam(name="ids",required=true) String ids) { + this.bizResultDosageService.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) { + BizResultDosage bizResultDosage = bizResultDosageService.getById(id); + if(bizResultDosage==null) { + return Result.error("未找到对应数据"); + } + return Result.OK(bizResultDosage); + } + + /** + * 通过工程ID查询 + * + * @param engineeringId + * @return + */ + @ApiOperation(value="剂量计算结果配置表-通过工程ID查询", notes="剂量计算结果配置表-通过工程ID查询") + @GetMapping(value = "/getDosageByEngId") + public Result getDosageByEngId(@RequestParam(name="engineeringId",required=true) String engineeringId) { + BizResultDosage bizResultDosage = bizResultDosageService. + getOne(new LambdaQueryWrapper().eq(BizResultDosage::getEngineeringId,engineeringId)); + if(bizResultDosage==null) { + return Result.error("未找到对应数据"); + } + return Result.OK(bizResultDosage); + } + + /** + * 导出excel + * + * @param request + * @param bizResultDosage + */ + @RequiresPermissions("bizResultDosage:biz_result_dosage:exportXls") + @RequestMapping(value = "/exportXls") + public ModelAndView exportXls(HttpServletRequest request, BizResultDosage bizResultDosage) { + return super.exportXls(request, bizResultDosage, BizResultDosage.class, "剂量计算结果配置表"); + } + + /** + * 通过excel导入数据 + * + * @param request + * @param response + * @return + */ + @RequiresPermissions("bizResultDosage:biz_result_dosage:importExcel") + @RequestMapping(value = "/importExcel", method = RequestMethod.POST) + public Result importExcel(HttpServletRequest request, HttpServletResponse response) { + return super.importExcel(request, response, BizResultDosage.class); + } + +} diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/project/calculateResult/bizResultDosage/entity/BizResultDosage.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/project/calculateResult/bizResultDosage/entity/BizResultDosage.java new file mode 100644 index 00000000..9a0d7337 --- /dev/null +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/project/calculateResult/bizResultDosage/entity/BizResultDosage.java @@ -0,0 +1,79 @@ +package org.jeecg.modules.project.calculateResult.bizResultDosage.entity; + +import java.io.Serializable; +import java.io.UnsupportedEncodingException; +import java.util.Date; +import java.math.BigDecimal; +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.annotation.TableLogic; +import lombok.Data; +import com.fasterxml.jackson.annotation.JsonFormat; +import org.springframework.format.annotation.DateTimeFormat; +import org.jeecgframework.poi.excel.annotation.Excel; +import org.jeecg.common.aspect.annotation.Dict; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.EqualsAndHashCode; +import lombok.experimental.Accessors; + +/** + * @Description: 剂量计算结果配置表 + * @Author: jeecg-boot + * @Date: 2023-09-20 + * @Version: V1.0 + */ +@Data +@TableName("biz_result_dosage") +@Accessors(chain = true) +@EqualsAndHashCode(callSuper = false) +@ApiModel(value="biz_result_dosage对象", description="剂量计算结果配置表") +public class BizResultDosage implements Serializable { + private static final long serialVersionUID = 1L; + + /**主键*/ + @TableId(type = IdType.ASSIGN_ID) + @ApiModelProperty(value = "主键") + private String id; + /**创建人*/ + @ApiModelProperty(value = "创建人") + private String createBy; + /**创建日期*/ + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") + @ApiModelProperty(value = "创建日期") + private Date createTime; + /**更新人*/ + @ApiModelProperty(value = "更新人") + private String updateBy; + /**更新日期*/ + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") + @ApiModelProperty(value = "更新日期") + private Date updateTime; + /**经度*/ + @Excel(name = "经度", width = 15) + @ApiModelProperty(value = "经度") + private Double lon; + /**纬度*/ + @Excel(name = "纬度", width = 15) + @ApiModelProperty(value = "纬度") + private Double lat; + /**高度*/ + @Excel(name = "高度", width = 15) + @ApiModelProperty(value = "高度") + private Double height; + /**横截面*/ + @Excel(name = "横截面", width = 15) + @ApiModelProperty(value = "横截面") + private Integer crossSection; + /**竖截面*/ + @Excel(name = "竖截面", width = 15) + @ApiModelProperty(value = "竖截面") + private Integer verticalSection; + /**工程ID*/ + @Excel(name = "工程ID", width = 15) + @ApiModelProperty(value = "工程ID") + private String engineeringId; +} diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/project/calculateResult/bizResultDosage/mapper/BizResultDosageMapper.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/project/calculateResult/bizResultDosage/mapper/BizResultDosageMapper.java new file mode 100644 index 00000000..23bcad7b --- /dev/null +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/project/calculateResult/bizResultDosage/mapper/BizResultDosageMapper.java @@ -0,0 +1,17 @@ +package org.jeecg.modules.project.calculateResult.bizResultDosage.mapper; + +import java.util.List; + +import org.apache.ibatis.annotations.Param; +import org.jeecg.modules.project.calculateResult.bizResultDosage.entity.BizResultDosage; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; + +/** + * @Description: 剂量计算结果配置表 + * @Author: jeecg-boot + * @Date: 2023-09-20 + * @Version: V1.0 + */ +public interface BizResultDosageMapper extends BaseMapper { + +} diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/project/calculateResult/bizResultDosage/mapper/xml/BizResultDosageMapper.xml b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/project/calculateResult/bizResultDosage/mapper/xml/BizResultDosageMapper.xml new file mode 100644 index 00000000..30839a84 --- /dev/null +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/project/calculateResult/bizResultDosage/mapper/xml/BizResultDosageMapper.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/project/calculateResult/bizResultDosage/service/IBizResultDosageService.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/project/calculateResult/bizResultDosage/service/IBizResultDosageService.java new file mode 100644 index 00000000..c3d497b8 --- /dev/null +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/project/calculateResult/bizResultDosage/service/IBizResultDosageService.java @@ -0,0 +1,14 @@ +package org.jeecg.modules.project.calculateResult.bizResultDosage.service; + +import org.jeecg.modules.project.calculateResult.bizResultDosage.entity.BizResultDosage; +import com.baomidou.mybatisplus.extension.service.IService; + +/** + * @Description: 剂量计算结果配置表 + * @Author: jeecg-boot + * @Date: 2023-09-20 + * @Version: V1.0 + */ +public interface IBizResultDosageService extends IService { + +} diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/project/calculateResult/bizResultDosage/service/impl/BizResultDosageServiceImpl.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/project/calculateResult/bizResultDosage/service/impl/BizResultDosageServiceImpl.java new file mode 100644 index 00000000..ce824af3 --- /dev/null +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/project/calculateResult/bizResultDosage/service/impl/BizResultDosageServiceImpl.java @@ -0,0 +1,19 @@ +package org.jeecg.modules.project.calculateResult.bizResultDosage.service.impl; + +import org.jeecg.modules.project.calculateResult.bizResultDosage.entity.BizResultDosage; +import org.jeecg.modules.project.calculateResult.bizResultDosage.mapper.BizResultDosageMapper; +import org.jeecg.modules.project.calculateResult.bizResultDosage.service.IBizResultDosageService; +import org.springframework.stereotype.Service; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; + +/** + * @Description: 剂量计算结果配置表 + * @Author: jeecg-boot + * @Date: 2023-09-20 + * @Version: V1.0 + */ +@Service +public class BizResultDosageServiceImpl extends ServiceImpl implements IBizResultDosageService { + +} diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/project/calculateResult/bizResultOptimize/controller/BizResultOptimizeController.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/project/calculateResult/bizResultOptimize/controller/BizResultOptimizeController.java new file mode 100644 index 00000000..50f83428 --- /dev/null +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/project/calculateResult/bizResultOptimize/controller/BizResultOptimizeController.java @@ -0,0 +1,198 @@ +package org.jeecg.modules.project.calculateResult.bizResultOptimize.controller; + +import java.util.Arrays; +import java.util.List; +import java.util.Map; +import java.util.stream.Collectors; +import java.io.IOException; +import java.io.UnsupportedEncodingException; +import java.net.URLDecoder; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import org.jeecg.common.api.vo.Result; +import org.jeecg.common.system.query.QueryGenerator; +import org.jeecg.common.util.oConvertUtils; +import org.jeecg.modules.project.calculateResult.bizResultDosage.entity.BizResultDosage; +import org.jeecg.modules.project.calculateResult.bizResultOptimize.entity.BizResultOptimize; +import org.jeecg.modules.project.calculateResult.bizResultOptimize.service.IBizResultOptimizeService; + +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.jeecgframework.poi.excel.ExcelImportUtil; +import org.jeecgframework.poi.excel.def.NormalExcelConstants; +import org.jeecgframework.poi.excel.entity.ExportParams; +import org.jeecgframework.poi.excel.entity.ImportParams; +import org.jeecgframework.poi.excel.view.JeecgEntityExcelView; +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.multipart.MultipartFile; +import org.springframework.web.multipart.MultipartHttpServletRequest; +import org.springframework.web.servlet.ModelAndView; +import com.alibaba.fastjson.JSON; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.jeecg.common.aspect.annotation.AutoLog; +import org.apache.shiro.authz.annotation.RequiresPermissions; + + /** + * @Description: 路径优化计算结果配置表 + * @Author: jeecg-boot + * @Date: 2023-09-20 + * @Version: V1.0 + */ +@Api(tags="路径优化计算结果配置表") +@RestController +@RequestMapping("/bizResultOptimize/bizResultOptimize") +@Slf4j +public class BizResultOptimizeController extends JeecgController { + @Autowired + private IBizResultOptimizeService bizResultOptimizeService; + + /** + * 分页列表查询 + * + * @param bizResultOptimize + * @param pageNo + * @param pageSize + * @param req + * @return + */ + //@AutoLog(value = "路径优化计算结果配置表-分页列表查询") + @ApiOperation(value="路径优化计算结果配置表-分页列表查询", notes="路径优化计算结果配置表-分页列表查询") + @GetMapping(value = "/list") + public Result> queryPageList(BizResultOptimize bizResultOptimize, + @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, + @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, + HttpServletRequest req) { + QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(bizResultOptimize, req.getParameterMap()); + Page page = new Page(pageNo, pageSize); + IPage pageList = bizResultOptimizeService.page(page, queryWrapper); + return Result.OK(pageList); + } + + /** + * 添加 + * + * @param bizResultOptimize + * @return + */ + @AutoLog(value = "路径优化计算结果配置表-添加") + @ApiOperation(value="路径优化计算结果配置表-添加", notes="路径优化计算结果配置表-添加") + @RequiresPermissions("bizResultOptimize:biz_result_optimize:add") + @PostMapping(value = "/add") + public Result add(@RequestBody BizResultOptimize bizResultOptimize) { + bizResultOptimizeService.save(bizResultOptimize); + return Result.OK("添加成功！"); + } + + /** + * 编辑 + * + * @param bizResultOptimize + * @return + */ + @AutoLog(value = "路径优化计算结果配置表-编辑") + @ApiOperation(value="路径优化计算结果配置表-编辑", notes="路径优化计算结果配置表-编辑") + @RequiresPermissions("bizResultOptimize:biz_result_optimize:edit") + @RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST}) + public Result edit(@RequestBody BizResultOptimize bizResultOptimize) { + bizResultOptimizeService.updateById(bizResultOptimize); + return Result.OK("编辑成功!"); + } + + /** + * 通过id删除 + * + * @param id + * @return + */ + @AutoLog(value = "路径优化计算结果配置表-通过id删除") + @ApiOperation(value="路径优化计算结果配置表-通过id删除", notes="路径优化计算结果配置表-通过id删除") + @RequiresPermissions("bizResultOptimize:biz_result_optimize:delete") + @DeleteMapping(value = "/delete") + public Result delete(@RequestParam(name="id",required=true) String id) { + bizResultOptimizeService.removeById(id); + return Result.OK("删除成功!"); + } + + /** + * 批量删除 + * + * @param ids + * @return + */ + @AutoLog(value = "路径优化计算结果配置表-批量删除") + @ApiOperation(value="路径优化计算结果配置表-批量删除", notes="路径优化计算结果配置表-批量删除") + @RequiresPermissions("bizResultOptimize:biz_result_optimize:deleteBatch") + @DeleteMapping(value = "/deleteBatch") + public Result deleteBatch(@RequestParam(name="ids",required=true) String ids) { + this.bizResultOptimizeService.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) { + BizResultOptimize bizResultOptimize = bizResultOptimizeService.getById(id); + if(bizResultOptimize==null) { + return Result.error("未找到对应数据"); + } + return Result.OK(bizResultOptimize); + } + + /** + * 通过工程ID查询 + * + * @param engineeringId + * @return + */ + @ApiOperation(value="路径优化计算结果配置表-通过工程ID查询", notes="路径优化计算结果配置表-通过工程ID查询") + @GetMapping(value = "/getOptimizeByEngId") + public Result getOptimizeByEngId(@RequestParam(name="engineeringId",required=true) String engineeringId) { + BizResultOptimize bizResultOptimize = bizResultOptimizeService. + getOne(new LambdaQueryWrapper().eq(BizResultOptimize::getEngineeringId,engineeringId)); + if(bizResultOptimize==null) { + return Result.error("未找到对应数据"); + } + return Result.OK(bizResultOptimize); + } + + /** + * 导出excel + * + * @param request + * @param bizResultOptimize + */ + @RequiresPermissions("bizResultOptimize:biz_result_optimize:exportXls") + @RequestMapping(value = "/exportXls") + public ModelAndView exportXls(HttpServletRequest request, BizResultOptimize bizResultOptimize) { + return super.exportXls(request, bizResultOptimize, BizResultOptimize.class, "路径优化计算结果配置表"); + } + + /** + * 通过excel导入数据 + * + * @param request + * @param response + * @return + */ + @RequiresPermissions("bizResultOptimize:biz_result_optimize:importExcel") + @RequestMapping(value = "/importExcel", method = RequestMethod.POST) + public Result importExcel(HttpServletRequest request, HttpServletResponse response) { + return super.importExcel(request, response, BizResultOptimize.class); + } + +} diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/project/calculateResult/bizResultOptimize/entity/BizResultOptimize.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/project/calculateResult/bizResultOptimize/entity/BizResultOptimize.java new file mode 100644 index 00000000..1710e428 --- /dev/null +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/project/calculateResult/bizResultOptimize/entity/BizResultOptimize.java @@ -0,0 +1,85 @@ +package org.jeecg.modules.project.calculateResult.bizResultOptimize.entity; + +import java.io.Serializable; +import java.io.UnsupportedEncodingException; +import java.util.Date; +import java.math.BigDecimal; +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.annotation.TableLogic; +import lombok.Data; +import com.fasterxml.jackson.annotation.JsonFormat; +import org.springframework.format.annotation.DateTimeFormat; +import org.jeecgframework.poi.excel.annotation.Excel; +import org.jeecg.common.aspect.annotation.Dict; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.EqualsAndHashCode; +import lombok.experimental.Accessors; + +/** + * @Description: 路径优化计算结果配置表 + * @Author: jeecg-boot + * @Date: 2023-09-20 + * @Version: V1.0 + */ +@Data +@TableName("biz_result_optimize") +@Accessors(chain = true) +@EqualsAndHashCode(callSuper = false) +@ApiModel(value="biz_result_optimize对象", description="路径优化计算结果配置表") +public class BizResultOptimize implements Serializable { + private static final long serialVersionUID = 1L; + + /**主键*/ + @TableId(type = IdType.ASSIGN_ID) + @ApiModelProperty(value = "主键") + private String id; + /**创建人*/ + @ApiModelProperty(value = "创建人") + private String createBy; + /**创建日期*/ + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") + @ApiModelProperty(value = "创建日期") + private Date createTime; + /**更新人*/ + @ApiModelProperty(value = "更新人") + private String updateBy; + /**更新日期*/ + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") + @ApiModelProperty(value = "更新日期") + private Date updateTime; + /**模式类型*/ + @Excel(name = "模式类型", width = 15) + @ApiModelProperty(value = "模式类型") + private Integer patternType; + /**开始时间*/ + @Excel(name = "开始时间", width = 20, format = "yyyy-MM-dd HH:mm:ss") + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") + @ApiModelProperty(value = "开始时间") + private Date startTime; + /**经度*/ + @Excel(name = "经度", width = 15) + @ApiModelProperty(value = "经度") + private Double lon; + /**纬度*/ + @Excel(name = "纬度", width = 15) + @ApiModelProperty(value = "纬度") + private Double lat; + /**高度*/ + @Excel(name = "高度", width = 15) + @ApiModelProperty(value = "高度") + private Double height; + /**机动ID*/ + @Excel(name = "机动ID", width = 15) + @ApiModelProperty(value = "机动ID") + private String motorId; + /**工程ID*/ + @Excel(name = "工程ID", width = 15) + @ApiModelProperty(value = "工程ID") + private String engineeringId; +} diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/project/calculateResult/bizResultOptimize/mapper/BizResultOptimizeMapper.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/project/calculateResult/bizResultOptimize/mapper/BizResultOptimizeMapper.java new file mode 100644 index 00000000..5284bb6e --- /dev/null +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/project/calculateResult/bizResultOptimize/mapper/BizResultOptimizeMapper.java @@ -0,0 +1,17 @@ +package org.jeecg.modules.project.calculateResult.bizResultOptimize.mapper; + +import java.util.List; + +import org.apache.ibatis.annotations.Param; +import org.jeecg.modules.project.calculateResult.bizResultOptimize.entity.BizResultOptimize; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; + +/** + * @Description: 路径优化计算结果配置表 + * @Author: jeecg-boot + * @Date: 2023-09-20 + * @Version: V1.0 + */ +public interface BizResultOptimizeMapper extends BaseMapper { + +} diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/project/calculateResult/bizResultOptimize/mapper/xml/BizResultOptimizeMapper.xml b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/project/calculateResult/bizResultOptimize/mapper/xml/BizResultOptimizeMapper.xml new file mode 100644 index 00000000..fdf8d4ce --- /dev/null +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/project/calculateResult/bizResultOptimize/mapper/xml/BizResultOptimizeMapper.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/project/calculateResult/bizResultOptimize/service/IBizResultOptimizeService.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/project/calculateResult/bizResultOptimize/service/IBizResultOptimizeService.java new file mode 100644 index 00000000..f855d55a --- /dev/null +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/project/calculateResult/bizResultOptimize/service/IBizResultOptimizeService.java @@ -0,0 +1,14 @@ +package org.jeecg.modules.project.calculateResult.bizResultOptimize.service; + +import org.jeecg.modules.project.calculateResult.bizResultOptimize.entity.BizResultOptimize; +import com.baomidou.mybatisplus.extension.service.IService; + +/** + * @Description: 路径优化计算结果配置表 + * @Author: jeecg-boot + * @Date: 2023-09-20 + * @Version: V1.0 + */ +public interface IBizResultOptimizeService extends IService { + +} diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/project/calculateResult/bizResultOptimize/service/impl/BizResultOptimizeServiceImpl.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/project/calculateResult/bizResultOptimize/service/impl/BizResultOptimizeServiceImpl.java new file mode 100644 index 00000000..41be3f63 --- /dev/null +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/project/calculateResult/bizResultOptimize/service/impl/BizResultOptimizeServiceImpl.java @@ -0,0 +1,19 @@ +package org.jeecg.modules.project.calculateResult.bizResultOptimize.service.impl; + +import org.jeecg.modules.project.calculateResult.bizResultOptimize.entity.BizResultOptimize; +import org.jeecg.modules.project.calculateResult.bizResultOptimize.mapper.BizResultOptimizeMapper; +import org.jeecg.modules.project.calculateResult.bizResultOptimize.service.IBizResultOptimizeService; +import org.springframework.stereotype.Service; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; + +/** + * @Description: 路径优化计算结果配置表 + * @Author: jeecg-boot + * @Date: 2023-09-20 + * @Version: V1.0 + */ +@Service +public class BizResultOptimizeServiceImpl extends ServiceImpl implements IBizResultOptimizeService { + +} diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/project/calculateResult/bizResultSourceItem/controller/BizResultSourceItemController.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/project/calculateResult/bizResultSourceItem/controller/BizResultSourceItemController.java new file mode 100644 index 00000000..6889b068 --- /dev/null +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/project/calculateResult/bizResultSourceItem/controller/BizResultSourceItemController.java @@ -0,0 +1,198 @@ +package org.jeecg.modules.project.calculateResult.bizResultSourceItem.controller; + +import java.util.Arrays; +import java.util.List; +import java.util.Map; +import java.util.stream.Collectors; +import java.io.IOException; +import java.io.UnsupportedEncodingException; +import java.net.URLDecoder; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import org.jeecg.common.api.vo.Result; +import org.jeecg.common.system.query.QueryGenerator; +import org.jeecg.common.util.oConvertUtils; +import org.jeecg.modules.project.calculateResult.bizResultOptimize.entity.BizResultOptimize; +import org.jeecg.modules.project.calculateResult.bizResultSourceItem.entity.BizResultSourceItem; +import org.jeecg.modules.project.calculateResult.bizResultSourceItem.service.IBizResultSourceItemService; + +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.jeecgframework.poi.excel.ExcelImportUtil; +import org.jeecgframework.poi.excel.def.NormalExcelConstants; +import org.jeecgframework.poi.excel.entity.ExportParams; +import org.jeecgframework.poi.excel.entity.ImportParams; +import org.jeecgframework.poi.excel.view.JeecgEntityExcelView; +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.multipart.MultipartFile; +import org.springframework.web.multipart.MultipartHttpServletRequest; +import org.springframework.web.servlet.ModelAndView; +import com.alibaba.fastjson.JSON; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.jeecg.common.aspect.annotation.AutoLog; +import org.apache.shiro.authz.annotation.RequiresPermissions; + + /** + * @Description: 源项计算结果配置表 + * @Author: jeecg-boot + * @Date: 2023-09-20 + * @Version: V1.0 + */ +@Api(tags="源项计算结果配置表") +@RestController +@RequestMapping("/bizResultSourceItem/bizResultSourceItem") +@Slf4j +public class BizResultSourceItemController extends JeecgController { + @Autowired + private IBizResultSourceItemService bizResultSourceItemService; + + /** + * 分页列表查询 + * + * @param bizResultSourceItem + * @param pageNo + * @param pageSize + * @param req + * @return + */ + //@AutoLog(value = "源项计算结果配置表-分页列表查询") + @ApiOperation(value="源项计算结果配置表-分页列表查询", notes="源项计算结果配置表-分页列表查询") + @GetMapping(value = "/list") + public Result> queryPageList(BizResultSourceItem bizResultSourceItem, + @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, + @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, + HttpServletRequest req) { + QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(bizResultSourceItem, req.getParameterMap()); + Page page = new Page(pageNo, pageSize); + IPage pageList = bizResultSourceItemService.page(page, queryWrapper); + return Result.OK(pageList); + } + + /** + * 添加 + * + * @param bizResultSourceItem + * @return + */ + @AutoLog(value = "源项计算结果配置表-添加") + @ApiOperation(value="源项计算结果配置表-添加", notes="源项计算结果配置表-添加") + @RequiresPermissions("bizResultSourceItem:biz_result_sourceitem:add") + @PostMapping(value = "/add") + public Result add(@RequestBody BizResultSourceItem bizResultSourceItem) { + bizResultSourceItemService.save(bizResultSourceItem); + return Result.OK("添加成功！"); + } + + /** + * 编辑 + * + * @param bizResultSourceItem + * @return + */ + @AutoLog(value = "源项计算结果配置表-编辑") + @ApiOperation(value="源项计算结果配置表-编辑", notes="源项计算结果配置表-编辑") + @RequiresPermissions("bizResultSourceItem:biz_result_sourceitem:edit") + @RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST}) + public Result edit(@RequestBody BizResultSourceItem bizResultSourceItem) { + bizResultSourceItemService.updateById(bizResultSourceItem); + return Result.OK("编辑成功!"); + } + + /** + * 通过id删除 + * + * @param id + * @return + */ + @AutoLog(value = "源项计算结果配置表-通过id删除") + @ApiOperation(value="源项计算结果配置表-通过id删除", notes="源项计算结果配置表-通过id删除") + @RequiresPermissions("bizResultSourceItem:biz_result_sourceitem:delete") + @DeleteMapping(value = "/delete") + public Result delete(@RequestParam(name="id",required=true) String id) { + bizResultSourceItemService.removeById(id); + return Result.OK("删除成功!"); + } + + /** + * 批量删除 + * + * @param ids + * @return + */ + @AutoLog(value = "源项计算结果配置表-批量删除") + @ApiOperation(value="源项计算结果配置表-批量删除", notes="源项计算结果配置表-批量删除") + @RequiresPermissions("bizResultSourceItem:biz_result_sourceitem:deleteBatch") + @DeleteMapping(value = "/deleteBatch") + public Result deleteBatch(@RequestParam(name="ids",required=true) String ids) { + this.bizResultSourceItemService.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) { + BizResultSourceItem bizResultSourceItem = bizResultSourceItemService.getById(id); + if(bizResultSourceItem==null) { + return Result.error("未找到对应数据"); + } + return Result.OK(bizResultSourceItem); + } + + /** + * 通过工程ID查询 + * + * @param engineeringId + * @return + */ + @ApiOperation(value="源项计算结果配置表-通过工程ID查询", notes="源项计算结果配置表-通过工程ID查询") + @GetMapping(value = "/getSourceItemByEngId") + public Result getSourceItemByEngId(@RequestParam(name="engineeringId",required=true) String engineeringId) { + BizResultSourceItem bizResultSourceItem = bizResultSourceItemService. + getOne(new LambdaQueryWrapper().eq(BizResultSourceItem::getEngineeringId,engineeringId)); + if(bizResultSourceItem==null) { + return Result.error("未找到对应数据"); + } + return Result.OK(bizResultSourceItem); + } + + /** + * 导出excel + * + * @param request + * @param bizResultSourceItem + */ + @RequiresPermissions("bizResultSourceItem:biz_result_sourceitem:exportXls") + @RequestMapping(value = "/exportXls") + public ModelAndView exportXls(HttpServletRequest request, BizResultSourceItem bizResultSourceItem) { + return super.exportXls(request, bizResultSourceItem, BizResultSourceItem.class, "源项计算结果配置表"); + } + + /** + * 通过excel导入数据 + * + * @param request + * @param response + * @return + */ + @RequiresPermissions("bizResultSourceItem:biz_result_sourceitem:importExcel") + @RequestMapping(value = "/importExcel", method = RequestMethod.POST) + public Result importExcel(HttpServletRequest request, HttpServletResponse response) { + return super.importExcel(request, response, BizResultSourceItem.class); + } + +} diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/project/calculateResult/bizResultSourceItem/entity/BizResultSourceItem.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/project/calculateResult/bizResultSourceItem/entity/BizResultSourceItem.java new file mode 100644 index 00000000..9739d3a5 --- /dev/null +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/project/calculateResult/bizResultSourceItem/entity/BizResultSourceItem.java @@ -0,0 +1,83 @@ +package org.jeecg.modules.project.calculateResult.bizResultSourceItem.entity; + +import java.io.Serializable; +import java.io.UnsupportedEncodingException; +import java.util.Date; +import java.math.BigDecimal; +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.annotation.TableLogic; +import lombok.Data; +import com.fasterxml.jackson.annotation.JsonFormat; +import org.springframework.format.annotation.DateTimeFormat; +import org.jeecgframework.poi.excel.annotation.Excel; +import org.jeecg.common.aspect.annotation.Dict; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.EqualsAndHashCode; +import lombok.experimental.Accessors; + +/** + * @Description: 源项计算结果配置表 + * @Author: jeecg-boot + * @Date: 2023-09-20 + * @Version: V1.0 + */ +@Data +@TableName("biz_result_sourceitem") +@Accessors(chain = true) +@EqualsAndHashCode(callSuper = false) +@ApiModel(value="biz_result_sourceitem对象", description="源项计算结果配置表") +public class BizResultSourceItem implements Serializable { + private static final long serialVersionUID = 1L; + + /**主键*/ + @TableId(type = IdType.ASSIGN_ID) + @ApiModelProperty(value = "主键") + private String id; + /**创建人*/ + @ApiModelProperty(value = "创建人") + private String createBy; + /**创建日期*/ + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") + @ApiModelProperty(value = "创建日期") + private Date createTime; + /**更新人*/ + @ApiModelProperty(value = "更新人") + private String updateBy; + /**更新日期*/ + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") + @ApiModelProperty(value = "更新日期") + private Date updateTime; + /**经度*/ + @Excel(name = "经度", width = 15) + @ApiModelProperty(value = "经度") + private Double lon; + /**纬度*/ + @Excel(name = "纬度", width = 15) + @ApiModelProperty(value = "纬度") + private Double lat; + /**高度*/ + @Excel(name = "高度", width = 15) + @ApiModelProperty(value = "高度") + private Double height; + /**横截面*/ + @Excel(name = "横截面", width = 15) + @ApiModelProperty(value = "横截面") + private Integer crossSection; + /**竖截面*/ + @Excel(name = "竖截面", width = 15) + @ApiModelProperty(value = "竖截面") + private Integer verticalSection; + /**空间层级*/ + @Excel(name = "空间层级", width = 15) + @ApiModelProperty(value = "空间层级") + private Integer spaceLevel; + /**工程ID*/ + @Excel(name = "工程ID", width = 15) + @ApiModelProperty(value = "工程ID") + private String engineeringId; +} diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/project/calculateResult/bizResultSourceItem/mapper/BizResultSourceItemMapper.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/project/calculateResult/bizResultSourceItem/mapper/BizResultSourceItemMapper.java new file mode 100644 index 00000000..ba89bd14 --- /dev/null +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/project/calculateResult/bizResultSourceItem/mapper/BizResultSourceItemMapper.java @@ -0,0 +1,17 @@ +package org.jeecg.modules.project.calculateResult.bizResultSourceItem.mapper; + +import java.util.List; + +import org.apache.ibatis.annotations.Param; +import org.jeecg.modules.project.calculateResult.bizResultSourceItem.entity.BizResultSourceItem; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; + +/** + * @Description: 源项计算结果配置表 + * @Author: jeecg-boot + * @Date: 2023-09-20 + * @Version: V1.0 + */ +public interface BizResultSourceItemMapper extends BaseMapper { + +} diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/project/calculateResult/bizResultSourceItem/mapper/xml/BizResultSourceItemMapper.xml b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/project/calculateResult/bizResultSourceItem/mapper/xml/BizResultSourceItemMapper.xml new file mode 100644 index 00000000..ec88ae75 --- /dev/null +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/project/calculateResult/bizResultSourceItem/mapper/xml/BizResultSourceItemMapper.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/project/calculateResult/bizResultSourceItem/service/IBizResultSourceItemService.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/project/calculateResult/bizResultSourceItem/service/IBizResultSourceItemService.java new file mode 100644 index 00000000..0c8596c3 --- /dev/null +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/project/calculateResult/bizResultSourceItem/service/IBizResultSourceItemService.java @@ -0,0 +1,14 @@ +package org.jeecg.modules.project.calculateResult.bizResultSourceItem.service; + +import org.jeecg.modules.project.calculateResult.bizResultSourceItem.entity.BizResultSourceItem; +import com.baomidou.mybatisplus.extension.service.IService; + +/** + * @Description: 源项计算结果配置表 + * @Author: jeecg-boot + * @Date: 2023-09-20 + * @Version: V1.0 + */ +public interface IBizResultSourceItemService extends IService { + +} diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/project/calculateResult/bizResultSourceItem/service/impl/BizResultSourceItemServiceImpl.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/project/calculateResult/bizResultSourceItem/service/impl/BizResultSourceItemServiceImpl.java new file mode 100644 index 00000000..d66cb0a7 --- /dev/null +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/project/calculateResult/bizResultSourceItem/service/impl/BizResultSourceItemServiceImpl.java @@ -0,0 +1,19 @@ +package org.jeecg.modules.project.calculateResult.bizResultSourceItem.service.impl; + +import org.jeecg.modules.project.calculateResult.bizResultSourceItem.entity.BizResultSourceItem; +import org.jeecg.modules.project.calculateResult.bizResultSourceItem.mapper.BizResultSourceItemMapper; +import org.jeecg.modules.project.calculateResult.bizResultSourceItem.service.IBizResultSourceItemService; +import org.springframework.stereotype.Service; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; + +/** + * @Description: 源项计算结果配置表 + * @Author: jeecg-boot + * @Date: 2023-09-20 + * @Version: V1.0 + */ +@Service +public class BizResultSourceItemServiceImpl extends ServiceImpl implements IBizResultSourceItemService { + +} diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/SysCommentController.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/SysCommentController.java index 93f31dc4..8789e1be 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/SysCommentController.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/SysCommentController.java @@ -165,7 +165,7 @@ public class SysCommentController extends JeecgController add(@RequestBody SysComment sysComment) { sysCommentService.save(sysComment); @@ -180,7 +180,7 @@ public class SysCommentController extends JeecgController edit(@RequestBody SysComment sysComment) { sysCommentService.updateById(sysComment); @@ -195,7 +195,7 @@ public class SysCommentController extends JeecgController delete(@RequestParam(name = "id", required = true) String id) { sysCommentService.removeById(id); @@ -210,7 +210,7 @@ public class SysCommentController extends JeecgController deleteBatch(@RequestParam(name = "ids", required = true) String ids) { this.sysCommentService.removeByIds(Arrays.asList(ids.split(","))); @@ -240,7 +240,7 @@ public class SysCommentController extends JeecgController