diff --git a/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/ExeVersionController.java b/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/ExeVersionController.java new file mode 100644 index 000000000..e05a99317 --- /dev/null +++ b/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/ExeVersionController.java @@ -0,0 +1,169 @@ +package com.zhgd.xmgl.modules.basicdata.controller; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.zhgd.jeecg.common.api.vo.Result; +import com.zhgd.jeecg.common.system.query.QueryGenerator; +import com.zhgd.xmgl.modules.basicdata.service.IExeVersionService; +import com.zhgd.xmgl.modules.basicdata.entity.ExeVersion; +import com.zhgd.xmgl.util.MessageUtil; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiImplicitParam; +import io.swagger.annotations.ApiOperation; +import lombok.extern.slf4j.Slf4j; +import org.apache.commons.collections.MapUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; + +import javax.servlet.http.HttpServletRequest; +import java.util.Map; + + + /** + * @Title: Controller + * @Description: Exe版本管理 + * @author： pds + * @date： 2021-03-04 + * @version： V1.0 + */ +@RestController +@RequestMapping("/xmgl/exeVersion") +@Slf4j +@Api(tags = "Exe版本管理相关Api") +public class ExeVersionController { + @Autowired + private IExeVersionService exeVersionService; + + /** + * 分页列表查询 + * @param exeVersion + * @param pageNo + * @param pageSize + * @param req + * @return + */ + @ApiOperation(value = "分页列表查询Exe版本管理信息", notes = "分页列表查询Exe版本管理信息", httpMethod = "GET") + @GetMapping(value = "/list") + public Result> queryPageList(ExeVersion exeVersion, + @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, + @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, + HttpServletRequest req) { + Result> result = new Result>(); + QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(exeVersion, req.getParameterMap()); + Page page = new Page(pageNo, pageSize); + IPage pageList = exeVersionService.page(page, queryWrapper); + result.setSuccess(true); + result.setResult(pageList); + return result; + } + + /** + * 添加 + * @param exeVersion + * @return + */ + @ApiOperation(value = "添加Exe版本管理信息", notes = "添加Exe版本管理信息", httpMethod = "POST") + @PostMapping(value = "/add") + public Result add(@RequestBody ExeVersion exeVersion) { + Result result = new Result(); + try { + QueryWrapper queryWrapper=new QueryWrapper<>(); + exeVersionService.remove(queryWrapper); + exeVersionService.save(exeVersion); + result.successMsg(MessageUtil.get("addSucess")); + } catch (Exception e) { + log.error("error：", e); + log.info(e.getMessage()); + result.error500(MessageUtil.get("failErr")); + } + return result; + } + + /** + * 编辑 + * @param exeVersion + * @return + */ + @ApiOperation(value = "编辑Exe版本管理信息", notes = "编辑Exe版本管理信息" , httpMethod="POST") + @PostMapping(value = "/edit") + public Result edit(@RequestBody ExeVersion exeVersion) { + Result result = new Result(); + ExeVersion exeVersionEntity = exeVersionService.getById(exeVersion.getId()); + if(exeVersionEntity==null) { + result.error500(MessageUtil.get("notFindErr")); + }else { + boolean ok = exeVersionService.updateById(exeVersion); + + if(ok) { + result.successMsg(MessageUtil.get("editSucess")); + } + } + + return result; + } + + /** + * 通过id删除 + * @param + * @return + */ + @ApiOperation(value = "删除Exe版本管理信息", notes = "删除Exe版本管理信息", httpMethod = "POST") + @ApiImplicitParam(name = "id", value = "Exe版本管理ID", paramType = "body", required = true, dataType = "Integer") + @PostMapping(value = "/delete") + public Result delete(@RequestBody Map map) { + Result result = new Result(); + ExeVersion exeVersion = exeVersionService.getById(MapUtils.getString(map,"id")); + if(exeVersion==null) { + result.error500(MessageUtil.get("notFindErr")); + }else { + boolean ok = exeVersionService.removeById(MapUtils.getString(map,"id")); + if(ok) { + result.successMsg(MessageUtil.get("deleteSucess")); + } + } + + return result; + } + + + /** + * 通过id查询 + * @param + * @return + */ + @ApiOperation(value = "通过id查询Exe版本管理信息", notes = "通过id查询Exe版本管理信息", httpMethod = "POST") + @ApiImplicitParam(name = "id", value = "Exe版本管理ID", paramType = "body", required = true, dataType = "Integer") + @PostMapping(value = "/queryById") + public Result queryById(@RequestBody Map map) { + Result result = new Result(); + ExeVersion exeVersion = exeVersionService.getById(MapUtils.getString(map,"id")); + if(exeVersion==null) { + result.error500(MessageUtil.get("notFindErr")); + }else { + result.setResult(exeVersion); + result.setSuccess(true); + } + return result; + } + + + /** + * 通过id查询 + * @param + * @return + */ + @ApiOperation(value = "查询一条Exe版本管理信息", notes = "查询一条Exe版本管理信息" , httpMethod="POST") + @PostMapping(value = "/getExeVersion") + public Result getExeVersion(@RequestBody ExeVersion exeVersion) { + Result result = new Result(); + if (exeVersion.getId() == null) { + exeVersion.setId(2L); + } + ExeVersion exeVersionEntity = exeVersionService.getById(exeVersion.getId()); + result.setResult(exeVersionEntity); + result.setSuccess(true); + return result; + } + +} diff --git a/src/main/java/com/zhgd/xmgl/modules/basicdata/entity/ExeVersion.java b/src/main/java/com/zhgd/xmgl/modules/basicdata/entity/ExeVersion.java new file mode 100644 index 000000000..3c67a01d6 --- /dev/null +++ b/src/main/java/com/zhgd/xmgl/modules/basicdata/entity/ExeVersion.java @@ -0,0 +1,46 @@ +package com.zhgd.xmgl.modules.basicdata.entity; + +import java.io.Serializable; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import com.fasterxml.jackson.databind.annotation.JsonSerialize; +import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; +import lombok.Data; +import org.jeecgframework.poi.excel.annotation.Excel; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +/** + * @Description: Exe版本管理 + * @author： pds + * @date： 2021-03-04 + * @version： V1.0 + */ +@Data +@TableName("exe_version") +@ApiModel(value="ExeVersion实体类",description="ExeVersion") +public class ExeVersion implements Serializable { + private static final long serialVersionUID = 1L; + + /**id*/ + @TableId(type = IdType.ASSIGN_ID) + @ApiModelProperty(value="id") + private Long id ; + /**版本号*/ + @Excel(name = "版本号", width = 15) + @ApiModelProperty(value="版本号") + private String versionNo ; + /**下载地址*/ + @Excel(name = "下载地址", width = 15) + @ApiModelProperty(value="下载地址") + private String downloadUrl ; + /**版本描述*/ + @Excel(name = "版本描述", width = 15) + @ApiModelProperty(value="版本描述") + private String versionDescribe ; + /**版本名称*/ + @Excel(name = "版本名称", width = 15) + @ApiModelProperty(value="版本名称") + private String versionName; +} diff --git a/src/main/java/com/zhgd/xmgl/modules/basicdata/mapper/ExeVersionMapper.java b/src/main/java/com/zhgd/xmgl/modules/basicdata/mapper/ExeVersionMapper.java new file mode 100644 index 000000000..94453bbee --- /dev/null +++ b/src/main/java/com/zhgd/xmgl/modules/basicdata/mapper/ExeVersionMapper.java @@ -0,0 +1,16 @@ +package com.zhgd.xmgl.modules.basicdata.mapper; + +import com.zhgd.xmgl.modules.basicdata.entity.ExeVersion; +import org.apache.ibatis.annotations.Mapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; + +/** + * @Description: Exe版本管理 + * @author： pds + * @date： 2021-03-04 + * @version： V1.0 + */ +@Mapper +public interface ExeVersionMapper extends BaseMapper { + +} diff --git a/src/main/java/com/zhgd/xmgl/modules/basicdata/mapper/xml/ExeVersionMapper.xml b/src/main/java/com/zhgd/xmgl/modules/basicdata/mapper/xml/ExeVersionMapper.xml new file mode 100644 index 000000000..54e355e21 --- /dev/null +++ b/src/main/java/com/zhgd/xmgl/modules/basicdata/mapper/xml/ExeVersionMapper.xml @@ -0,0 +1,5 @@ + + + + + diff --git a/src/main/java/com/zhgd/xmgl/modules/basicdata/service/IExeVersionService.java b/src/main/java/com/zhgd/xmgl/modules/basicdata/service/IExeVersionService.java new file mode 100644 index 000000000..444abece7 --- /dev/null +++ b/src/main/java/com/zhgd/xmgl/modules/basicdata/service/IExeVersionService.java @@ -0,0 +1,14 @@ +package com.zhgd.xmgl.modules.basicdata.service; + +import com.zhgd.xmgl.modules.basicdata.entity.ExeVersion; +import com.baomidou.mybatisplus.extension.service.IService; + +/** + * @Description: Exe版本管理 + * @author： pds + * @date： 2021-03-04 + * @version： V1.0 + */ +public interface IExeVersionService extends IService { + +} diff --git a/src/main/java/com/zhgd/xmgl/modules/basicdata/service/impl/ExeVersionServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/basicdata/service/impl/ExeVersionServiceImpl.java new file mode 100644 index 000000000..c3a1a2a16 --- /dev/null +++ b/src/main/java/com/zhgd/xmgl/modules/basicdata/service/impl/ExeVersionServiceImpl.java @@ -0,0 +1,19 @@ +package com.zhgd.xmgl.modules.basicdata.service.impl; + +import com.zhgd.xmgl.modules.basicdata.entity.ExeVersion; +import com.zhgd.xmgl.modules.basicdata.mapper.ExeVersionMapper; +import com.zhgd.xmgl.modules.basicdata.service.IExeVersionService; +import org.springframework.stereotype.Service; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; + +/** + * @Description: Exe版本管理 + * @author： pds + * @date： 2021-03-04 + * @version： V1.0 + */ +@Service +public class ExeVersionServiceImpl extends ServiceImpl implements IExeVersionService { + +} diff --git a/src/main/java/com/zhgd/xmgl/security/WebSecurityConfig.java b/src/main/java/com/zhgd/xmgl/security/WebSecurityConfig.java index b64eb7731..075cceb16 100644 --- a/src/main/java/com/zhgd/xmgl/security/WebSecurityConfig.java +++ b/src/main/java/com/zhgd/xmgl/security/WebSecurityConfig.java @@ -80,6 +80,7 @@ public class WebSecurityConfig extends WebSecurityConfigurerAdapter { http.authorizeRequests() //请求路径允许访问 + .antMatchers("/xmgl/exeVersion/**").permitAll() .antMatchers("/xmgl/pileFoundationInspectionCommissionForm/flow/add").permitAll() .antMatchers("/xmgl/workerAdmission/getUploadZipWorkAdmissions").permitAll() .antMatchers("/xmgl/safetyHatDev/**").permitAll()