From 7339fc11f0aa1e548f5fc94d0130689983be39c7 Mon Sep 17 00:00:00 2001 From: lyd <1419499670@qq.com> Date: Fri, 30 Sep 2022 11:18:02 +0800 Subject: [PATCH] =?UTF-8?q?=E8=A1=A8=E6=A0=BC=E5=88=97=E8=A1=A8=E3=80=81?= =?UTF-8?q?=E7=BC=96=E7=A0=81=E7=94=9F=E6=88=90=E5=AE=8C=E5=96=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/system/rest/GridController.java | 1 - .../system/rest/GridFieldController.java | 1 - .../system/service/GenCodeService.java | 17 ++++++++++ .../modules/system/service/dto/GridDto.java | 18 +++++----- .../system/service/dto/GridFieldDto.java | 24 ++++++------- .../service/impl/GenCodeServiceImpl.java | 13 ++++--- .../service/impl/GridFieldServiceImpl.java | 28 +++++++++------ .../system/service/impl/GridServiceImpl.java | 16 +++++---- .../java/org/nl/modules/system/wql/sys.xls | Bin 220160 -> 220672 bytes nladmin-ui/src/views/system/grid/index.vue | 32 +++++++----------- nladmin-ui/src/views/system/grid/table.vue | 2 +- 11 files changed, 88 insertions(+), 64 deletions(-) diff --git a/nladmin-system/src/main/java/org/nl/modules/system/rest/GridController.java b/nladmin-system/src/main/java/org/nl/modules/system/rest/GridController.java index 4b7c1647e..121bcc8d3 100644 --- a/nladmin-system/src/main/java/org/nl/modules/system/rest/GridController.java +++ b/nladmin-system/src/main/java/org/nl/modules/system/rest/GridController.java @@ -39,7 +39,6 @@ public class GridController { @Log("新增系统表格") @ApiOperation("新增系统表格") public ResponseEntity create(@Validated @RequestBody GridDto dto){ - log.info("dto:{}",dto); gridService.create(dto); return new ResponseEntity<>(HttpStatus.CREATED); } diff --git a/nladmin-system/src/main/java/org/nl/modules/system/rest/GridFieldController.java b/nladmin-system/src/main/java/org/nl/modules/system/rest/GridFieldController.java index 88c8665b2..bc6bb259e 100644 --- a/nladmin-system/src/main/java/org/nl/modules/system/rest/GridFieldController.java +++ b/nladmin-system/src/main/java/org/nl/modules/system/rest/GridFieldController.java @@ -40,7 +40,6 @@ public class GridFieldController { @Log("单个新增表格字段") @ApiOperation("单个新增表格字段") public ResponseEntity create(@Validated @RequestBody GridFieldDto dto){ - log.info("dto:{}",dto); gridFieldService.create(dto); return new ResponseEntity<>(HttpStatus.CREATED); } diff --git a/nladmin-system/src/main/java/org/nl/modules/system/service/GenCodeService.java b/nladmin-system/src/main/java/org/nl/modules/system/service/GenCodeService.java index b98d83ec4..097c2ac6c 100644 --- a/nladmin-system/src/main/java/org/nl/modules/system/service/GenCodeService.java +++ b/nladmin-system/src/main/java/org/nl/modules/system/service/GenCodeService.java @@ -16,14 +16,31 @@ public interface GenCodeService { */ JSONObject queryAll(Map form, Pageable pageable); + /** + * 新增编码 + * @param form + */ public void create(Map form); + /** + * 删除编码 + * @param ids + */ public void delete(Set ids); + /** + * 更新编码 + * @param json + */ public void update(JSONObject json); public String codeDemo(Map form); + /** + * 根据编码获取id + * @param code + * @return + */ public String queryIdByCode(String code); } diff --git a/nladmin-system/src/main/java/org/nl/modules/system/service/dto/GridDto.java b/nladmin-system/src/main/java/org/nl/modules/system/service/dto/GridDto.java index 14ccd520d..43e1e7631 100644 --- a/nladmin-system/src/main/java/org/nl/modules/system/service/dto/GridDto.java +++ b/nladmin-system/src/main/java/org/nl/modules/system/service/dto/GridDto.java @@ -30,29 +30,29 @@ public class GridDto { private String remark; /** - * 是否激活 + * 创建人id */ - private String is_active; - - /** - * 是否删除 - */ - private String is_delete; + private String create_id; /** * 创建人 */ - private String create_by; + private String create_name; /** * 创建时间 */ private String create_time; + /** + * 更新人id + */ + private String update_optid; + /** * 更新人 */ - private String update_by; + private String update_optname; /** * 更新时间 diff --git a/nladmin-system/src/main/java/org/nl/modules/system/service/dto/GridFieldDto.java b/nladmin-system/src/main/java/org/nl/modules/system/service/dto/GridFieldDto.java index 2429f096a..0ac6b6571 100644 --- a/nladmin-system/src/main/java/org/nl/modules/system/service/dto/GridFieldDto.java +++ b/nladmin-system/src/main/java/org/nl/modules/system/service/dto/GridFieldDto.java @@ -49,35 +49,35 @@ public class GridFieldDto { */ private Integer sort_num; - /** - * 是否激活 - */ - private String is_active; - - /** - * 是否删除 - */ - private String is_delete; - /** * 是否隐藏 */ private String is_hidden; + /** + * 创建人id + */ + private String create_id; + /** * 创建人 */ - private String create_by; + private String create_name; /** * 创建时间 */ private String create_time; + /** + * 更新人id + */ + private String update_optid; + /** * 更新人 */ - private String update_by; + private String update_optname; /** * 更新时间 diff --git a/nladmin-system/src/main/java/org/nl/modules/system/service/impl/GenCodeServiceImpl.java b/nladmin-system/src/main/java/org/nl/modules/system/service/impl/GenCodeServiceImpl.java index f0cb78b74..32ff1df53 100644 --- a/nladmin-system/src/main/java/org/nl/modules/system/service/impl/GenCodeServiceImpl.java +++ b/nladmin-system/src/main/java/org/nl/modules/system/service/impl/GenCodeServiceImpl.java @@ -50,6 +50,8 @@ public class GenCodeServiceImpl implements GenCodeService { @Override public void create(Map form) { + Long currentUserId = SecurityUtils.getCurrentUserId(); + String currentUsername = SecurityUtils.getCurrentUsername(); WQLObject wql = WQLObject.getWQLObject("sys_code_rule"); JSONObject json = new JSONObject(); String id = IdUtil.simpleUUID(); @@ -62,10 +64,12 @@ public class GenCodeServiceImpl implements GenCodeService { json.put("id", id); json.put("code", form.get("code")); json.put("name", form.get("name")); - json.put("is_active", "1"); - json.put("is_delete", "0"); - json.put("create_by", SecurityUtils.getCurrentUsername()); + json.put("create_id", currentUserId); + json.put("update_optid", currentUserId); + json.put("create_name", currentUsername); + json.put("update_optname", currentUsername); json.put("create_time", now); + json.put("update_time", now); WQLObject.getWQLObject("sys_code_rule").insert(json); } @@ -87,8 +91,9 @@ public class GenCodeServiceImpl implements GenCodeService { throw new BadRequestException("该编码code已存在，请校验！"); } String now = DateUtil.now(); + json.put("update_optid", SecurityUtils.getCurrentUserId()); json.put("update_time", now); - json.put("update_by", SecurityUtils.getCurrentUsername()); + json.put("update_optname", SecurityUtils.getCurrentUsername()); WQLObject.getWQLObject("sys_code_rule").update(json); } diff --git a/nladmin-system/src/main/java/org/nl/modules/system/service/impl/GridFieldServiceImpl.java b/nladmin-system/src/main/java/org/nl/modules/system/service/impl/GridFieldServiceImpl.java index 192b5a11c..291bfebe6 100644 --- a/nladmin-system/src/main/java/org/nl/modules/system/service/impl/GridFieldServiceImpl.java +++ b/nladmin-system/src/main/java/org/nl/modules/system/service/impl/GridFieldServiceImpl.java @@ -47,11 +47,14 @@ public class GridFieldServiceImpl implements GridFieldService { @Transactional(rollbackFor = Exception.class) public void create(GridFieldDto dto) { String currentUsername = SecurityUtils.getCurrentUsername(); + Long uid = SecurityUtils.getCurrentUserId(); String now = DateUtil.now(); dto.setId(IdUtil.simpleUUID()); - dto.setCreate_by(currentUsername); - dto.setUpdate_by(currentUsername); + dto.setCreate_id(uid.toString()); + dto.setUpdate_optid(uid.toString()); + dto.setCreate_name(currentUsername); + dto.setUpdate_optname(currentUsername); dto.setUpdate_time(now); dto.setCreate_time(now); @@ -77,7 +80,8 @@ public class GridFieldServiceImpl implements GridFieldService { String currentUsername = SecurityUtils.getCurrentUsername(); String now = DateUtil.now(); dto.setUpdate_time(now); - dto.setUpdate_by(currentUsername); + dto.setUpdate_optid(SecurityUtils.getCurrentUserId().toString()); + dto.setUpdate_optname(currentUsername); WQLObject wo = WQLObject.getWQLObject("sys_grid_field"); JSONObject json = JSONObject.parseObject( JSONObject.toJSONString(dto)); @@ -89,10 +93,11 @@ public class GridFieldServiceImpl implements GridFieldService { public void deleteAll(String[] ids) { WQLObject wo = WQLObject.getWQLObject("sys_grid_field"); for (String id : ids) { - GridFieldDto gridFieldDto = this.findById(id); - gridFieldDto.setIs_delete("1"); - JSONObject json = JSONObject.parseObject( JSONObject.toJSONString(gridFieldDto)); - wo.update(json); +// GridFieldDto gridFieldDto = this.findById(id); +// gridFieldDto.setIs_delete("1"); +// JSONObject json = JSONObject.parseObject( JSONObject.toJSONString(gridFieldDto)); +// wo.update(json); + wo.delete("grid_id = '" + id + "'"); } } @@ -103,6 +108,7 @@ public class GridFieldServiceImpl implements GridFieldService { JSONArray fieldDatas = json.getJSONArray("gridFieldData"); WQLObject wo = WQLObject.getWQLObject("sys_grid_field"); String currentUsername = SecurityUtils.getCurrentUsername(); + Long currentUserId = SecurityUtils.getCurrentUserId(); // 先删除原先所有的数据 wo.delete("grid_id = '" + grid_id + "'"); // 然后添加 @@ -111,9 +117,11 @@ public class GridFieldServiceImpl implements GridFieldService { JSONObject fieldData = fieldDatas.getJSONObject(i); fieldData.put("grid_id", grid_id); fieldData.put("id", IdUtil.simpleUUID()); - fieldData.put("create_by", currentUsername); - fieldData.put("create_time", currentUsername); - fieldData.put("update_by", now); + fieldData.put("create_id", currentUserId); + fieldData.put("update_optid", currentUserId); + fieldData.put("create_name", currentUsername); + fieldData.put("update_optname", currentUsername); + fieldData.put("create_time", now); fieldData.put("update_time", now); wo.insert(fieldData); } diff --git a/nladmin-system/src/main/java/org/nl/modules/system/service/impl/GridServiceImpl.java b/nladmin-system/src/main/java/org/nl/modules/system/service/impl/GridServiceImpl.java index d89d8ca96..129658176 100644 --- a/nladmin-system/src/main/java/org/nl/modules/system/service/impl/GridServiceImpl.java +++ b/nladmin-system/src/main/java/org/nl/modules/system/service/impl/GridServiceImpl.java @@ -35,7 +35,7 @@ public class GridServiceImpl implements GridService { if (whereJson.get("name") != null) { where = "name like ('%" + whereJson.get("name") + "%')"; } - ResultBean rb = wo.pagequery(WqlUtil.getHttpContext(page), where +" AND is_delete = '0'", "update_time desc"); + ResultBean rb = wo.pagequery(WqlUtil.getHttpContext(page), where, "update_time desc"); final JSONObject json = rb.pageResult(); return json; } @@ -44,11 +44,14 @@ public class GridServiceImpl implements GridService { @Transactional(rollbackFor = Exception.class) public void create(GridDto dto) { String currentUsername = SecurityUtils.getCurrentUsername(); + Long uid = SecurityUtils.getCurrentUserId(); String now = DateUtil.now(); dto.setId(IdUtil.simpleUUID()); - dto.setCreate_by(currentUsername); - dto.setUpdate_by(currentUsername); + dto.setCreate_id(uid.toString()); + dto.setUpdate_optid(uid.toString()); + dto.setCreate_name(currentUsername); + dto.setUpdate_optname(currentUsername); dto.setUpdate_time(now); dto.setCreate_time(now); @@ -60,7 +63,7 @@ public class GridServiceImpl implements GridService { @Override public GridDto findById(String id) { WQLObject wo = WQLObject.getWQLObject("sys_grid"); - JSONObject json = wo.query("id ='" + id + "' AND is_delete = '0'").uniqueResult(0); + JSONObject json = wo.query("id = '" + id + "'").uniqueResult(0); final GridDto obj = json.toJavaObject(GridDto.class);; return obj; } @@ -73,8 +76,9 @@ public class GridServiceImpl implements GridService { String currentUsername = SecurityUtils.getCurrentUsername(); String now = DateUtil.now(); + dto.setUpdate_optid(SecurityUtils.getCurrentUserId().toString()); dto.setUpdate_time(now); - dto.setUpdate_by(currentUsername); + dto.setUpdate_optname(currentUsername); WQLObject wo = WQLObject.getWQLObject("sys_grid"); JSONObject json = JSONObject.parseObject( JSONObject.toJSONString(dto)); @@ -95,7 +99,7 @@ public class GridServiceImpl implements GridService { @Override public JSONArray getGridList() { - JSONArray arr = WQLObject.getWQLObject("sys_grid").query("is_delete= '0' AND is_active= '1'").getResultJSONArray(0); + JSONArray arr = WQLObject.getWQLObject("sys_grid").query().getResultJSONArray(0); JSONArray result = new JSONArray(); for (int i = 0; i < arr.size(); i++) { JSONObject obj = arr.getJSONObject(i); diff --git a/nladmin-system/src/main/java/org/nl/modules/system/wql/sys.xls b/nladmin-system/src/main/java/org/nl/modules/system/wql/sys.xls index ed6deb8e7d0ce4c851532e2187a48c7f22b233ae..8ffedae58cfa4283a0e355c8198f672a47756ab0 100644 GIT binary patch delta 9431 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 Y(ccJ6c2C#4L$k;E9=hm$bOZl?0YDxV;{X5v delta 9066 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是 - + @@ -212,11 +212,9 @@ const defaultForm = { code: null, name: null, remark: null, - is_active: 1, - is_delete: 0, - create_by: null, + create_name: null, create_time: null, - update_by: null, + update_optname: null, update_time: null } export default { @@ -273,11 +271,9 @@ export default { sort_num: null, remark: null, is_hidden: 0, - is_active: 1, - is_delete: 0, - create_by: null, + create_name: null, create_time: null, - update_by: null, + update_optname: null, update_time: null, grid_id: null } @@ -310,11 +306,9 @@ export default { sort_num: null, remark: null, is_hidden: 0, - is_active: 1, - is_delete: 0, - create_by: null, + create_name: null, create_time: null, - update_by: null, + update_optname: null, update_time: null, grid_id: null } @@ -348,11 +342,9 @@ export default { sort_num: null, remark: null, is_hidden: 0, - is_active: 1, - is_delete: 0, - create_by: null, + create_name: null, create_time: null, - update_by: null, + update_optname: null, update_time: null, grid_id: null } @@ -389,7 +381,7 @@ export default { diff --git a/nladmin-ui/src/views/system/grid/table.vue b/nladmin-ui/src/views/system/grid/table.vue index 7e4326f3b..e91dfded9 100644 --- a/nladmin-ui/src/views/system/grid/table.vue +++ b/nladmin-ui/src/views/system/grid/table.vue @@ -46,7 +46,7 @@ :align="item.align" /> - +