diff --git a/SynologyDrive/1.需求设计/D变更和问题记录/蔚来项目问题记录表.osheet b/SynologyDrive/1.需求设计/D变更和问题记录/蔚来项目问题记录表.osheet new file mode 100644 index 000000000..44b8c845e Binary files /dev/null and b/SynologyDrive/1.需求设计/D变更和问题记录/蔚来项目问题记录表.osheet differ diff --git a/SynologyDrive/1.需求设计/D变更和问题记录/蔚来项目问题记录表.xlsx b/SynologyDrive/1.需求设计/D变更和问题记录/蔚来项目问题记录表.xlsx new file mode 100644 index 000000000..64d454a39 Binary files /dev/null and b/SynologyDrive/1.需求设计/D变更和问题记录/蔚来项目问题记录表.xlsx differ diff --git a/SynologyDrive/3.程序设计文档/nio权限系统/权限对接问题记录.txt b/SynologyDrive/3.程序设计文档/nio权限系统/权限对接问题记录.txt new file mode 100644 index 000000000..97209212a --- /dev/null +++ b/SynologyDrive/3.程序设计文档/nio权限系统/权限对接问题记录.txt @@ -0,0 +1,8 @@ +1、权限系统2.0操作文档:https://nio.feishu.cn/docs/doccnUSMQMjxayqmhW619H6TA6c + 3.1.1 权限需要单独开? 拥有权限系统内置的Lessee manage相关权限的人员可以使用租户管理功能 + +相关问题答疑:https://nio.feishu.cn/docs/doccnaW8n2CMi2DJ0fyDaS7i9Xc#5eW6BR + +ADTEST环境加入:https://nio.feishu.cn/docs/doccnTrfJGXKnne12XoErTyCigh + +人员组织表结构设计:https://nio.feishu.cn/docs/doccnhc51QERo9N4ULBZQvH3mke \ No newline at end of file diff --git a/jero-boot/jero-boot-single-startup/pom.xml b/jero-boot/jero-boot-single-startup/pom.xml index b8c6481cd..640542089 100644 --- a/jero-boot/jero-boot-single-startup/pom.xml +++ b/jero-boot/jero-boot-single-startup/pom.xml @@ -32,6 +32,11 @@ jero-boot-modules ${jero.version} + + com.jero.boot + jero-boot-tag-system + ${jero.version} + diff --git a/jero-boot/jero-boot-single-startup/src/main/resources/jero/jero_config.properties b/jero-boot/jero-boot-single-startup/src/main/resources/jero/jero_config.properties index 082a902b3..053cafa29 100644 --- a/jero-boot/jero-boot-single-startup/src/main/resources/jero/jero_config.properties +++ b/jero-boot/jero-boot-single-startup/src/main/resources/jero/jero_config.properties @@ -1,5 +1,6 @@ #code_generate_project_path -project_path=E:\\project\\jero-boot +project_path=F:\\idea-workspace\\laws-weilai\\jero-boot + #bussi_package[User defined] bussi_package=com.jero.modules @@ -26,4 +27,4 @@ db_filed_convert=true page_search_filed_num=1 #page_filter_fields page_filter_fields=create_time,create_by,update_time,update_by -exclude_table=act_,ext_act_,design_,onl_,sys_,qrtz_ +exclude_table=act_,ext_act_,design_,qrtz_ diff --git a/jero-boot/jero-boot-tag-system/pom.xml b/jero-boot/jero-boot-tag-system/pom.xml new file mode 100644 index 000000000..8a551cec4 --- /dev/null +++ b/jero-boot/jero-boot-tag-system/pom.xml @@ -0,0 +1,48 @@ + + + + jero-boot + com.jero.boot + 2.4.2 + + 4.0.0 + + jero-boot-tag-system + + + 8 + 8 + + + + com.jero.boot + jero-system-local-api + + + com.jero.boot + jero-boot-starter-redis + + + + org.springframework + spring-web + 5.3.9 + + + + com.jero.boot + jero-boot + 2.4.2 + compile + + + + com.baomidou + mybatis-plus + 3.4.1 + + + + \ No newline at end of file diff --git a/jero-boot/jero-boot-tag-system/src/main/java/com/jero/controller/OnlCgformAreaController.java b/jero-boot/jero-boot-tag-system/src/main/java/com/jero/controller/OnlCgformAreaController.java new file mode 100644 index 000000000..caf36208f --- /dev/null +++ b/jero-boot/jero-boot-tag-system/src/main/java/com/jero/controller/OnlCgformAreaController.java @@ -0,0 +1,170 @@ +package com.jero.controller; + +import java.util.Arrays; +import java.util.List; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import com.jero.common.api.vo.Result; +import com.jero.common.system.query.QueryGenerator; +import com.jero.modules.com.jero.entity.OnlCgformArea; +import com.jero.modules.com.jero.service.IOnlCgformAreaService; +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 com.jero.common.system.base.controller.JeroController; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.*; +import org.springframework.web.servlet.ModelAndView; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import com.jero.common.aspect.annotation.AutoLog; + + + /** + * @Description: 区域管理表 + * @Author: jero-boot + * @Date: 2022-01-21 + * @Version: V1.0 + */ +@Api(tags="区域管理表") +@RestController +@RequestMapping("/tag/onlCgformArea") +@Slf4j +public class OnlCgformAreaController extends JeroController { + @Autowired + private IOnlCgformAreaService onlCgformAreaService; + + /** + * 分页列表查询 + * + * @param onlCgformArea + * @param pageNo + * @param pageSize + * @param req + * @return + */ + @AutoLog(value = "区域管理表-分页列表查询") + @ApiOperation(value="区域管理表-分页列表查询", notes="区域管理表-分页列表查询") + @GetMapping(value = "/page") + public Result queryPageList(OnlCgformArea onlCgformArea, + @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, + @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, + HttpServletRequest req) { + QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(onlCgformArea, req.getParameterMap()); + Page page = new Page(pageNo, pageSize); + IPage pageList = onlCgformAreaService.page(page, queryWrapper); + return Result.OK(pageList); + } + + /** + * 列表查询 + * + * @return + */ + @AutoLog(value = "区域管理表-列表查询") + @ApiOperation(value="区域管理表-列表查询", notes="区域管理表-列表查询") + @GetMapping(value = "/list") + public Result> queryList() { + List list = onlCgformAreaService.queryList(); + return Result.OK(list); + } + + /** + * 添加 + * + * @param onlCgformArea + * @return + */ + @AutoLog(value = "区域管理表-添加") + @ApiOperation(value="区域管理表-添加", notes="区域管理表-添加") + @PostMapping(value = "/add") + public Result add(@Validated @RequestBody OnlCgformArea onlCgformArea) { + onlCgformAreaService.add(onlCgformArea); + return Result.OK("添加成功!"); + } + + /** + * 编辑 + * + * @param onlCgformArea + * @return + */ + @AutoLog(value = "区域管理表-编辑") + @ApiOperation(value="区域管理表-编辑", notes="区域管理表-编辑") + @PutMapping(value = "/edit") + public Result edit(@Validated @RequestBody OnlCgformArea onlCgformArea) { + onlCgformAreaService.editById(onlCgformArea); + return Result.OK("编辑成功!"); + } + + /** + * 通过id删除 + * + * @param id + * @return + */ + @AutoLog(value = "区域管理表-通过id删除") + @ApiOperation(value="区域管理表-通过id删除", notes="区域管理表-通过id删除") + @DeleteMapping(value = "/delete") + public Result delete(@RequestParam(name="id",required=true) String id) { + onlCgformAreaService.deleteById(id); + return Result.OK("删除成功!"); + } + + /** + * 批量删除 + * + * @param ids + * @return + */ + @AutoLog(value = "区域管理表-批量删除") + @ApiOperation(value="区域管理表-批量删除", notes="区域管理表-批量删除") + @DeleteMapping(value = "/deleteBatch") + public Result deleteBatch(@RequestParam(name="ids",required=true) String ids) { + this.onlCgformAreaService.deleteByIds(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) { + OnlCgformArea onlCgformArea = onlCgformAreaService.queryById(id); + if(onlCgformArea==null) { + return Result.error("未找到对应数据"); + } + return Result.OK(onlCgformArea); + } + + /** + * 导出excel + * + * @param request + * @param onlCgformArea + */ + @RequestMapping(value = "/exportXls") + public ModelAndView exportXls(HttpServletRequest request, OnlCgformArea onlCgformArea) { + return super.exportXls(request, onlCgformArea, OnlCgformArea.class, "区域管理表"); + } + + /** + * 通过excel导入数据 + * + * @param request + * @param response + * @return + */ + @RequestMapping(value = "/importExcel", method = RequestMethod.POST) + public Result importExcel(HttpServletRequest request, HttpServletResponse response) { + return super.importExcel(request, response, OnlCgformArea.class); + } + +} diff --git a/jero-boot/jero-boot-tag-system/src/main/java/com/jero/entity/OnlCgformArea.java b/jero-boot/jero-boot-tag-system/src/main/java/com/jero/entity/OnlCgformArea.java new file mode 100644 index 000000000..bf3be52bc --- /dev/null +++ b/jero-boot/jero-boot-tag-system/src/main/java/com/jero/entity/OnlCgformArea.java @@ -0,0 +1,110 @@ +package com.jero.entity; + +import java.io.Serializable; +import java.io.UnsupportedEncodingException; +import java.math.BigDecimal; +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 com.jero.common.aspect.annotation.Dict; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.EqualsAndHashCode; +import lombok.experimental.Accessors; +import com.fasterxml.jackson.databind.annotation.JsonSerialize; + + +/** + * @Description: 区域管理表 + * @Author: jero-boot + * @Date: 2022-01-21 + * @Version: V1.0 + */ +@Data +@TableName("onl_cgform_area") +@Accessors(chain = true) +@EqualsAndHashCode(callSuper = false) +@ApiModel(value="onl_cgform_area对象", description="区域管理表") +public class OnlCgformArea 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 java.util.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 java.util.Date updateTime; + + /**所属部门*/ + @ApiModelProperty(value = "所属部门") + private String sysOrgCode; + + /**展示区域*/ + @Excel(name = "展示区域", width = 15) + @ApiModelProperty(value = "展示区域") + private String showArea; + + /**英文名称*/ + @Excel(name = "英文名称", width = 15) + @javax.validation.constraints.Pattern(regexp = "^[a-zA-Z]{1}$",message = "请输入正确的字母") + @ApiModelProperty(value = "英文名称") + private String enName; + + /**所属模块*/ + @Excel(name = "所属模块", width = 15) + private transient String isModelString; + + private byte[] isModel; + + public byte[] getIsModel(){ + if(isModelString==null){ + return null; + } + try { + return isModelString.getBytes("UTF-8"); + } catch (UnsupportedEncodingException e) { + e.printStackTrace(); + } + return null; + } + + public String getIsModelString(){ + if(isModel==null || isModel.length==0){ + return ""; + } + try { + return new String(isModel,"UTF-8"); + } catch (UnsupportedEncodingException e) { + e.printStackTrace(); + } + return ""; + } + /**排序号*/ + @Excel(name = "排序号", width = 15) + @javax.validation.constraints.Pattern(regexp = "^-?[1-9]\\d+$",message = "请输入正确的整数") + @ApiModelProperty(value = "排序号") + private Integer sort; + +} diff --git a/jero-boot/jero-boot-tag-system/src/main/java/com/jero/mapper/OnlCgformAreaMapper.java b/jero-boot/jero-boot-tag-system/src/main/java/com/jero/mapper/OnlCgformAreaMapper.java new file mode 100644 index 000000000..39513be9c --- /dev/null +++ b/jero-boot/jero-boot-tag-system/src/main/java/com/jero/mapper/OnlCgformAreaMapper.java @@ -0,0 +1,17 @@ +package com.jero.mapper; + +import java.util.List; + +import org.apache.ibatis.annotations.Param; +import com.jero.modules.com.jero.entity.OnlCgformArea; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; + +/** + * @Description: 区域管理表 + * @Author: jero-boot + * @Date: 2022-01-21 + * @Version: V1.0 + */ +public interface OnlCgformAreaMapper extends BaseMapper { + +} diff --git a/jero-boot/jero-boot-tag-system/src/main/java/com/jero/mapper/xml/OnlCgformAreaMapper.xml b/jero-boot/jero-boot-tag-system/src/main/java/com/jero/mapper/xml/OnlCgformAreaMapper.xml new file mode 100644 index 000000000..4b81b4221 --- /dev/null +++ b/jero-boot/jero-boot-tag-system/src/main/java/com/jero/mapper/xml/OnlCgformAreaMapper.xml @@ -0,0 +1,16 @@ + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/jero-boot/jero-boot-tag-system/src/main/java/com/jero/service/IOnlCgformAreaService.java b/jero-boot/jero-boot-tag-system/src/main/java/com/jero/service/IOnlCgformAreaService.java new file mode 100644 index 000000000..fc9c69291 --- /dev/null +++ b/jero-boot/jero-boot-tag-system/src/main/java/com/jero/service/IOnlCgformAreaService.java @@ -0,0 +1,61 @@ +package com.jero.service; + +import com.jero.modules.com.jero.entity.OnlCgformArea; +import com.baomidou.mybatisplus.extension.service.IService; +import java.util.List; + +/** + * @Description: 区域管理表 + * @Author: jero-boot + * @Date: 2022-01-21 + * @Version: V1.0 + */ +public interface IOnlCgformAreaService extends IService { + + /** + * 保存 + * + * @param onlCgformArea + * @return + */ + void add(OnlCgformArea onlCgformArea); + + /** + * 更新 + * + * @param onlCgformArea + * @return + */ + void editById(OnlCgformArea onlCgformArea); + + /** + * 通过id删除 + * + * @param id + * @return + */ + void deleteById(String id); + + /** + * 批量删除 + * + * @param ids + * @return + */ + void deleteByIds(List ids); + + /** + * 通过id查询 + * + * @param id + * @return + */ + OnlCgformArea queryById(String id); + + /** + * 列表查询 + * + * @return + */ + List queryList(); +} diff --git a/jero-boot/jero-boot-tag-system/src/main/java/com/jero/service/impl/OnlCgformAreaServiceImpl.java b/jero-boot/jero-boot-tag-system/src/main/java/com/jero/service/impl/OnlCgformAreaServiceImpl.java new file mode 100644 index 000000000..a569d9fa0 --- /dev/null +++ b/jero-boot/jero-boot-tag-system/src/main/java/com/jero/service/impl/OnlCgformAreaServiceImpl.java @@ -0,0 +1,89 @@ +package com.jero.service.impl; + +import com.jero.modules.com.jero.entity.OnlCgformArea; +import com.jero.modules.com.jero.mapper.OnlCgformAreaMapper; +import com.jero.modules.com.jero.service.IOnlCgformAreaService; +import org.springframework.stereotype.Service; +import java.util.List; +import java.util.Date; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; + +/** + * @Description: 区域管理表 + * @Author: jero-boot + * @Date: 2022-01-21 + * @Version: V1.0 + */ +@Service +public class OnlCgformAreaServiceImpl extends ServiceImpl implements IOnlCgformAreaService { + + /** + * 保存 + * + * @param onlCgformArea + * @return + */ + @Override + public void add(OnlCgformArea onlCgformArea) { + Date now = new Date(); + onlCgformArea.setCreateTime(now); + onlCgformArea.setUpdateTime(now); + save(onlCgformArea); + } + + /** + * 更新 + * + * @param onlCgformArea + * @return + */ + @Override + public void editById(OnlCgformArea onlCgformArea) { + Date now = new Date(); + onlCgformArea.setUpdateTime(now); + saveOrUpdate(onlCgformArea); + } + + /** + * 通过id删除 + * + * @param id + * @return + */ + @Override + public void deleteById(String id) { + removeById(id); + } + + /** + * 批量删除 + * + * @param ids + * @return + */ + @Override + public void deleteByIds(List ids) { + removeByIds(ids); + } + + /** + * 通过id查询 + * + * @param id + * @return + */ + @Override + public OnlCgformArea queryById(String id) { + return getById(id); + } + + /** + * 列表查询 + * + * @return + */ + @Override + public List queryList() { + return list(); + } +} diff --git a/jero-boot/jero-boot-tag-system/src/main/java/com/jero/vue/OnlCgformAreaList.vue b/jero-boot/jero-boot-tag-system/src/main/java/com/jero/vue/OnlCgformAreaList.vue new file mode 100644 index 000000000..94a140599 --- /dev/null +++ b/jero-boot/jero-boot-tag-system/src/main/java/com/jero/vue/OnlCgformAreaList.vue @@ -0,0 +1,190 @@ + + + + \ No newline at end of file diff --git a/jero-boot/jero-boot-tag-system/src/main/java/com/jero/vue/modules/OnlCgformAreaForm.vue b/jero-boot/jero-boot-tag-system/src/main/java/com/jero/vue/modules/OnlCgformAreaForm.vue new file mode 100644 index 000000000..4e246cf22 --- /dev/null +++ b/jero-boot/jero-boot-tag-system/src/main/java/com/jero/vue/modules/OnlCgformAreaForm.vue @@ -0,0 +1,191 @@ + + + \ No newline at end of file diff --git a/jero-boot/jero-boot-tag-system/src/main/java/com/jero/vue/modules/OnlCgformAreaModal.vue b/jero-boot/jero-boot-tag-system/src/main/java/com/jero/vue/modules/OnlCgformAreaModal.vue new file mode 100644 index 000000000..298a5218a --- /dev/null +++ b/jero-boot/jero-boot-tag-system/src/main/java/com/jero/vue/modules/OnlCgformAreaModal.vue @@ -0,0 +1,60 @@ + + + \ No newline at end of file diff --git a/jero-boot/jero-boot-tag-system/src/main/java/com/jero/vue/modules/OnlCgformAreaModal__Style#Drawer.vue b/jero-boot/jero-boot-tag-system/src/main/java/com/jero/vue/modules/OnlCgformAreaModal__Style#Drawer.vue new file mode 100644 index 000000000..d7d160556 --- /dev/null +++ b/jero-boot/jero-boot-tag-system/src/main/java/com/jero/vue/modules/OnlCgformAreaModal__Style#Drawer.vue @@ -0,0 +1,83 @@ + + + + + \ No newline at end of file diff --git a/jero-boot/pom.xml b/jero-boot/pom.xml index 5fc21ff45..d881dbcc2 100644 --- a/jero-boot/pom.xml +++ b/jero-boot/pom.xml @@ -54,6 +54,7 @@ jero-boot-single-startup jero-boot-modules + jero-boot-tag-system @@ -108,6 +109,60 @@ fastjson ${fastjson.version} + + io.swagger + swagger-annotations + 1.5.22 + compile + + + com.baomidou + mybatis-plus-annotation + 3.4.1 + compile + + + com.fasterxml.jackson.core + jackson-annotations + + + org.springframework + spring-context + + + org.jeecgframework + autopoi + 1.2.5 + compile + + + com.fasterxml.jackson.core + jackson-databind + + + com.baomidou + mybatis-plus-core + 3.4.1 + compile + + + org.apache.tomcat.embed + tomcat-embed-core + + + com.baomidou + mybatis-plus-extension + 3.4.1 + compile + + + org.springframework + spring-webmvc + + + com.jero.boot + jero-boot-base-core + diff --git a/jero-boot/src/main/java/com/jero/modules/com/jero/controller/OnlCgformAreaController.java b/jero-boot/src/main/java/com/jero/modules/com/jero/controller/OnlCgformAreaController.java new file mode 100644 index 000000000..3746f0abe --- /dev/null +++ b/jero-boot/src/main/java/com/jero/modules/com/jero/controller/OnlCgformAreaController.java @@ -0,0 +1,170 @@ +package com.jero.modules.com.jero.controller; + +import java.util.Arrays; +import java.util.List; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import com.jero.common.api.vo.Result; +import com.jero.common.system.query.QueryGenerator; +import com.jero.modules.com.jero.entity.OnlCgformArea; +import com.jero.modules.com.jero.service.IOnlCgformAreaService; +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 com.jero.common.system.base.controller.JeroController; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.*; +import org.springframework.web.servlet.ModelAndView; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import com.jero.common.aspect.annotation.AutoLog; + + + /** + * @Description: 区域管理表 + * @Author: jero-boot + * @Date: 2022-01-21 + * @Version: V1.0 + */ +@Api(tags="区域管理表") +@RestController +@RequestMapping("/com.jero/onlCgformArea") +@Slf4j +public class OnlCgformAreaController extends JeroController { + @Autowired + private IOnlCgformAreaService onlCgformAreaService; + + /** + * 分页列表查询 + * + * @param onlCgformArea + * @param pageNo + * @param pageSize + * @param req + * @return + */ + @AutoLog(value = "区域管理表-分页列表查询") + @ApiOperation(value="区域管理表-分页列表查询", notes="区域管理表-分页列表查询") + @GetMapping(value = "/page") + public Result queryPageList(OnlCgformArea onlCgformArea, + @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, + @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, + HttpServletRequest req) { + QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(onlCgformArea, req.getParameterMap()); + Page page = new Page(pageNo, pageSize); + IPage pageList = onlCgformAreaService.page(page, queryWrapper); + return Result.OK(pageList); + } + + /** + * 列表查询 + * + * @return + */ + @AutoLog(value = "区域管理表-列表查询") + @ApiOperation(value="区域管理表-列表查询", notes="区域管理表-列表查询") + @GetMapping(value = "/list") + public Result> queryList() { + List list = onlCgformAreaService.queryList(); + return Result.OK(list); + } + + /** + * 添加 + * + * @param onlCgformArea + * @return + */ + @AutoLog(value = "区域管理表-添加") + @ApiOperation(value="区域管理表-添加", notes="区域管理表-添加") + @PostMapping(value = "/add") + public Result add(@Validated @RequestBody OnlCgformArea onlCgformArea) { + onlCgformAreaService.add(onlCgformArea); + return Result.OK("添加成功!"); + } + + /** + * 编辑 + * + * @param onlCgformArea + * @return + */ + @AutoLog(value = "区域管理表-编辑") + @ApiOperation(value="区域管理表-编辑", notes="区域管理表-编辑") + @PutMapping(value = "/edit") + public Result edit(@Validated @RequestBody OnlCgformArea onlCgformArea) { + onlCgformAreaService.editById(onlCgformArea); + return Result.OK("编辑成功!"); + } + + /** + * 通过id删除 + * + * @param id + * @return + */ + @AutoLog(value = "区域管理表-通过id删除") + @ApiOperation(value="区域管理表-通过id删除", notes="区域管理表-通过id删除") + @DeleteMapping(value = "/delete") + public Result delete(@RequestParam(name="id",required=true) String id) { + onlCgformAreaService.deleteById(id); + return Result.OK("删除成功!"); + } + + /** + * 批量删除 + * + * @param ids + * @return + */ + @AutoLog(value = "区域管理表-批量删除") + @ApiOperation(value="区域管理表-批量删除", notes="区域管理表-批量删除") + @DeleteMapping(value = "/deleteBatch") + public Result deleteBatch(@RequestParam(name="ids",required=true) String ids) { + this.onlCgformAreaService.deleteByIds(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) { + OnlCgformArea onlCgformArea = onlCgformAreaService.queryById(id); + if(onlCgformArea==null) { + return Result.error("未找到对应数据"); + } + return Result.OK(onlCgformArea); + } + + /** + * 导出excel + * + * @param request + * @param onlCgformArea + */ + @RequestMapping(value = "/exportXls") + public ModelAndView exportXls(HttpServletRequest request, OnlCgformArea onlCgformArea) { + return super.exportXls(request, onlCgformArea, OnlCgformArea.class, "区域管理表"); + } + + /** + * 通过excel导入数据 + * + * @param request + * @param response + * @return + */ + @RequestMapping(value = "/importExcel", method = RequestMethod.POST) + public Result importExcel(HttpServletRequest request, HttpServletResponse response) { + return super.importExcel(request, response, OnlCgformArea.class); + } + +} diff --git a/jero-boot/src/main/java/com/jero/modules/com/jero/entity/OnlCgformArea.java b/jero-boot/src/main/java/com/jero/modules/com/jero/entity/OnlCgformArea.java new file mode 100644 index 000000000..5a030729d --- /dev/null +++ b/jero-boot/src/main/java/com/jero/modules/com/jero/entity/OnlCgformArea.java @@ -0,0 +1,110 @@ +package com.jero.modules.com.jero.entity; + +import java.io.Serializable; +import java.io.UnsupportedEncodingException; +import java.math.BigDecimal; +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 com.jero.common.aspect.annotation.Dict; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.EqualsAndHashCode; +import lombok.experimental.Accessors; +import com.fasterxml.jackson.databind.annotation.JsonSerialize; + + +/** + * @Description: 区域管理表 + * @Author: jero-boot + * @Date: 2022-01-21 + * @Version: V1.0 + */ +@Data +@TableName("onl_cgform_area") +@Accessors(chain = true) +@EqualsAndHashCode(callSuper = false) +@ApiModel(value="onl_cgform_area对象", description="区域管理表") +public class OnlCgformArea implements Serializable { + private static final long serialVersionUID = 1L; + + /**主键*/ + @TableId(type = IdType.ASSIGN_ID) + @ApiModelProperty(value = "主键") + private java.lang.String id; + + /**创建人*/ + @ApiModelProperty(value = "创建人") + private java.lang.String createBy; + + /**创建日期*/ + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") + @ApiModelProperty(value = "创建日期") + private java.util.Date createTime; + + /**更新人*/ + @ApiModelProperty(value = "更新人") + private java.lang.String updateBy; + + /**更新日期*/ + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") + @ApiModelProperty(value = "更新日期") + private java.util.Date updateTime; + + /**所属部门*/ + @ApiModelProperty(value = "所属部门") + private java.lang.String sysOrgCode; + + /**展示区域*/ + @Excel(name = "展示区域", width = 15) + @ApiModelProperty(value = "展示区域") + private java.lang.String showArea; + + /**英文名称*/ + @Excel(name = "英文名称", width = 15) + @javax.validation.constraints.Pattern(regexp = "^[a-zA-Z]{1}$",message = "请输入正确的字母") + @ApiModelProperty(value = "英文名称") + private java.lang.String enName; + + /**所属模块*/ + @Excel(name = "所属模块", width = 15) + private transient java.lang.String isModelString; + + private byte[] isModel; + + public byte[] getIsModel(){ + if(isModelString==null){ + return null; + } + try { + return isModelString.getBytes("UTF-8"); + } catch (UnsupportedEncodingException e) { + e.printStackTrace(); + } + return null; + } + + public String getIsModelString(){ + if(isModel==null || isModel.length==0){ + return ""; + } + try { + return new String(isModel,"UTF-8"); + } catch (UnsupportedEncodingException e) { + e.printStackTrace(); + } + return ""; + } + /**排序号*/ + @Excel(name = "排序号", width = 15) + @javax.validation.constraints.Pattern(regexp = "^-?[1-9]\\d+$",message = "请输入正确的整数") + @ApiModelProperty(value = "排序号") + private java.lang.Integer sort; + +} diff --git a/jero-boot/src/main/java/com/jero/modules/com/jero/mapper/OnlCgformAreaMapper.java b/jero-boot/src/main/java/com/jero/modules/com/jero/mapper/OnlCgformAreaMapper.java new file mode 100644 index 000000000..fe7305c7c --- /dev/null +++ b/jero-boot/src/main/java/com/jero/modules/com/jero/mapper/OnlCgformAreaMapper.java @@ -0,0 +1,17 @@ +package com.jero.modules.com.jero.mapper; + +import java.util.List; + +import org.apache.ibatis.annotations.Param; +import com.jero.modules.com.jero.entity.OnlCgformArea; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; + +/** + * @Description: 区域管理表 + * @Author: jero-boot + * @Date: 2022-01-21 + * @Version: V1.0 + */ +public interface OnlCgformAreaMapper extends BaseMapper { + +} diff --git a/jero-boot/src/main/java/com/jero/modules/com/jero/mapper/xml/OnlCgformAreaMapper.xml b/jero-boot/src/main/java/com/jero/modules/com/jero/mapper/xml/OnlCgformAreaMapper.xml new file mode 100644 index 000000000..4b81b4221 --- /dev/null +++ b/jero-boot/src/main/java/com/jero/modules/com/jero/mapper/xml/OnlCgformAreaMapper.xml @@ -0,0 +1,16 @@ + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/jero-boot/src/main/java/com/jero/modules/com/jero/service/IOnlCgformAreaService.java b/jero-boot/src/main/java/com/jero/modules/com/jero/service/IOnlCgformAreaService.java new file mode 100644 index 000000000..0a46956e2 --- /dev/null +++ b/jero-boot/src/main/java/com/jero/modules/com/jero/service/IOnlCgformAreaService.java @@ -0,0 +1,61 @@ +package com.jero.modules.com.jero.service; + +import com.jero.modules.com.jero.entity.OnlCgformArea; +import com.baomidou.mybatisplus.extension.service.IService; +import java.util.List; + +/** + * @Description: 区域管理表 + * @Author: jero-boot + * @Date: 2022-01-21 + * @Version: V1.0 + */ +public interface IOnlCgformAreaService extends IService { + + /** + * 保存 + * + * @param onlCgformArea + * @return + */ + void add(OnlCgformArea onlCgformArea); + + /** + * 更新 + * + * @param onlCgformArea + * @return + */ + void editById(OnlCgformArea onlCgformArea); + + /** + * 通过id删除 + * + * @param id + * @return + */ + void deleteById(String id); + + /** + * 批量删除 + * + * @param ids + * @return + */ + void deleteByIds(List ids); + + /** + * 通过id查询 + * + * @param id + * @return + */ + OnlCgformArea queryById(String id); + + /** + * 列表查询 + * + * @return + */ + List queryList(); +} diff --git a/jero-boot/src/main/java/com/jero/modules/com/jero/service/impl/OnlCgformAreaServiceImpl.java b/jero-boot/src/main/java/com/jero/modules/com/jero/service/impl/OnlCgformAreaServiceImpl.java new file mode 100644 index 000000000..1e766f564 --- /dev/null +++ b/jero-boot/src/main/java/com/jero/modules/com/jero/service/impl/OnlCgformAreaServiceImpl.java @@ -0,0 +1,89 @@ +package com.jero.modules.com.jero.service.impl; + +import com.jero.modules.com.jero.entity.OnlCgformArea; +import com.jero.modules.com.jero.mapper.OnlCgformAreaMapper; +import com.jero.modules.com.jero.service.IOnlCgformAreaService; +import org.springframework.stereotype.Service; +import java.util.List; +import java.util.Date; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; + +/** + * @Description: 区域管理表 + * @Author: jero-boot + * @Date: 2022-01-21 + * @Version: V1.0 + */ +@Service +public class OnlCgformAreaServiceImpl extends ServiceImpl implements IOnlCgformAreaService { + + /** + * 保存 + * + * @param onlCgformArea + * @return + */ + @Override + public void add(OnlCgformArea onlCgformArea) { + Date now = new Date(); + onlCgformArea.setCreateTime(now); + onlCgformArea.setUpdateTime(now); + save(onlCgformArea); + } + + /** + * 更新 + * + * @param onlCgformArea + * @return + */ + @Override + public void editById(OnlCgformArea onlCgformArea) { + Date now = new Date(); + onlCgformArea.setUpdateTime(now); + saveOrUpdate(onlCgformArea); + } + + /** + * 通过id删除 + * + * @param id + * @return + */ + @Override + public void deleteById(String id) { + removeById(id); + } + + /** + * 批量删除 + * + * @param ids + * @return + */ + @Override + public void deleteByIds(List ids) { + removeByIds(ids); + } + + /** + * 通过id查询 + * + * @param id + * @return + */ + @Override + public OnlCgformArea queryById(String id) { + return getById(id); + } + + /** + * 列表查询 + * + * @return + */ + @Override + public List queryList() { + return list(); + } +} diff --git a/jero-boot/src/main/java/com/jero/modules/com/jero/vue/OnlCgformAreaList.vue b/jero-boot/src/main/java/com/jero/modules/com/jero/vue/OnlCgformAreaList.vue new file mode 100644 index 000000000..94a140599 --- /dev/null +++ b/jero-boot/src/main/java/com/jero/modules/com/jero/vue/OnlCgformAreaList.vue @@ -0,0 +1,190 @@ + + + + \ No newline at end of file diff --git a/jero-boot/src/main/java/com/jero/modules/com/jero/vue/modules/OnlCgformAreaForm.vue b/jero-boot/src/main/java/com/jero/modules/com/jero/vue/modules/OnlCgformAreaForm.vue new file mode 100644 index 000000000..4e246cf22 --- /dev/null +++ b/jero-boot/src/main/java/com/jero/modules/com/jero/vue/modules/OnlCgformAreaForm.vue @@ -0,0 +1,191 @@ + + + \ No newline at end of file diff --git a/jero-boot/src/main/java/com/jero/modules/com/jero/vue/modules/OnlCgformAreaModal.vue b/jero-boot/src/main/java/com/jero/modules/com/jero/vue/modules/OnlCgformAreaModal.vue new file mode 100644 index 000000000..298a5218a --- /dev/null +++ b/jero-boot/src/main/java/com/jero/modules/com/jero/vue/modules/OnlCgformAreaModal.vue @@ -0,0 +1,60 @@ + + + \ No newline at end of file diff --git a/jero-boot/src/main/java/com/jero/modules/com/jero/vue/modules/OnlCgformAreaModal__Style#Drawer.vue b/jero-boot/src/main/java/com/jero/modules/com/jero/vue/modules/OnlCgformAreaModal__Style#Drawer.vue new file mode 100644 index 000000000..d7d160556 --- /dev/null +++ b/jero-boot/src/main/java/com/jero/modules/com/jero/vue/modules/OnlCgformAreaModal__Style#Drawer.vue @@ -0,0 +1,83 @@ + + + + + \ No newline at end of file diff --git a/jero-web/src/components/Standardselection/index.vue b/jero-web/src/components/Standardselection/index.vue new file mode 100644 index 000000000..8925bd886 --- /dev/null +++ b/jero-web/src/components/Standardselection/index.vue @@ -0,0 +1,281 @@ + + + + + \ No newline at end of file diff --git a/jero-web/src/components/addForm/index.vue b/jero-web/src/components/addForm/index.vue index 3367471b2..3700ff0c5 100644 --- a/jero-web/src/components/addForm/index.vue +++ b/jero-web/src/components/addForm/index.vue @@ -39,7 +39,7 @@ {{item.name}} - @@ -53,7 +53,7 @@ {{item.name}} - + @@ -81,8 +81,8 @@ + :placeholder="$t('selectStatus')" :type="'select'" + :triggerChange="false" dictCode="valid_status"/> @@ -108,20 +108,57 @@ {{item.name}} - + + + + + +
+
+ * + {{item.enName}}
+ {{item.name}} +
+ + + {{ (formInline[item.attrModel] === 'null' || formInline[item.attrModel] === '' || + formInline[item.attrModel] == null) ? '上传文件' : '查看已上传文件' + }} + + +
+
+ +
+
+ * + {{item.enName}}
+ {{item.name}} +
+ +
+ @@ -268,10 +336,12 @@ line-height: 38px; height: 38px; } - .box-input .ant-select-selection--multiple .ant-select-selection__rendered > ul > li{ - margin-top:6px; + + .box-input .ant-select-selection--multiple .ant-select-selection__rendered > ul > li { + margin-top: 6px; } - .box-input .ant-input-number-input-wrap{ + + .box-input .ant-input-number-input-wrap { line-height: 38px; height: 38px; } diff --git a/jero-web/src/components/uploadFile/file.vue b/jero-web/src/components/uploadFile/file.vue new file mode 100644 index 000000000..244a8532a --- /dev/null +++ b/jero-web/src/components/uploadFile/file.vue @@ -0,0 +1,203 @@ + + + + + \ No newline at end of file