diff --git a/neuray-admin/src/main/java/com/gitee/neuray/security/modules/param/controller/EngineParamController.java b/neuray-admin/src/main/java/com/gitee/neuray/security/modules/param/controller/EngineParamController.java index 5203315d84baefe8c540b6f24ba071c29957a212..953b1e7944faccba06246c302d83bb6e90976e11 100644 --- a/neuray-admin/src/main/java/com/gitee/neuray/security/modules/param/controller/EngineParamController.java +++ b/neuray-admin/src/main/java/com/gitee/neuray/security/modules/param/controller/EngineParamController.java @@ -53,7 +53,39 @@ public class EngineParamController { List ret = paramItemService.getParamByEngine(engineId,deptId); return R.ok().put("paramList", ret); } + /** + * 保存 + */ + @RequestMapping("/save") + @RequiresPermissions("engine:param:save") + public R save(@RequestBody Map map){ + + paramService.saveParam(map); + + return R.ok(); + } + /** + * 保存 + */ + @RequestMapping("/update") + @RequiresPermissions("engine:param:update") + public R update(@RequestBody Map map){ + paramService.updateParam(map); + + return R.ok(); + } + /** + * 保存 + */ + @RequestMapping("/delete") + @RequiresPermissions("engine:param:delete") + public R delete(@RequestBody Map map){ + + paramService.deleteParam(map); + + return R.ok(); + } /** * 信息 */ @@ -70,16 +102,7 @@ public class EngineParamController { return R.ok().put("engineItem", engineItem); } - *//** - * 保存 - *//* - @RequestMapping("/save") - @RequiresPermissions("engine:param:save") - public R save(@RequestBody EngineItemEntity engineItem){ - - engineManageService.saveEngine(engineItem); - return R.ok(); - } + *//* *//** * 修改 diff --git a/neuray-admin/src/main/java/com/gitee/neuray/security/modules/param/dao/EngineParamDao.java b/neuray-admin/src/main/java/com/gitee/neuray/security/modules/param/dao/EngineParamDao.java index 91361b8327ec6618b935749f75b430d1d9dac933..b96edcac162a555045c872e618dd4c072900d39e 100644 --- a/neuray-admin/src/main/java/com/gitee/neuray/security/modules/param/dao/EngineParamDao.java +++ b/neuray-admin/src/main/java/com/gitee/neuray/security/modules/param/dao/EngineParamDao.java @@ -3,6 +3,11 @@ package com.gitee.neuray.security.modules.param.dao; import com.gitee.neuray.security.modules.param.entity.EngineParamEntity; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; + +import java.math.BigInteger; +import java.util.List; +import java.util.Map; /** * 发动机参数关联表 @@ -13,5 +18,8 @@ import org.apache.ibatis.annotations.Mapper; */ @Mapper public interface EngineParamDao extends BaseMapper { - + + void saveParam(@Param("list") List list, @Param("tableName") String tableName); + void updateParam(@Param("list") List list, @Param("tableName") String tableName,@Param("id") Long id); + void deleteParam(@Param("tableName") String tableName,@Param("list") List list); } diff --git a/neuray-admin/src/main/java/com/gitee/neuray/security/modules/param/service/EngineParamService.java b/neuray-admin/src/main/java/com/gitee/neuray/security/modules/param/service/EngineParamService.java index 2736881aca3ed7716e416d548cbbc8465fc9409f..f8a0d4114c913ffc66048053ea2b37c30f5fcc2f 100644 --- a/neuray-admin/src/main/java/com/gitee/neuray/security/modules/param/service/EngineParamService.java +++ b/neuray-admin/src/main/java/com/gitee/neuray/security/modules/param/service/EngineParamService.java @@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.extension.service.IService; import com.gitee.neuray.security.common.utils.PageUtils; import com.gitee.neuray.security.modules.param.entity.EngineParamEntity; +import java.util.List; import java.util.Map; /** @@ -17,5 +18,8 @@ public interface EngineParamService extends IService { PageUtils queryPage(Map params); Map queryTable(Map map); + void saveParam(Map map); + void updateParam(Map map); + void deleteParam(Map map); } diff --git a/neuray-admin/src/main/java/com/gitee/neuray/security/modules/param/service/impl/EngineParamServiceImpl.java b/neuray-admin/src/main/java/com/gitee/neuray/security/modules/param/service/impl/EngineParamServiceImpl.java index 7e6e8dd50a0ed5de746fc90fa2e3deb6ad261ce9..9c3495615e974e6c3e913f7cff82af5fc6b5248a 100644 --- a/neuray-admin/src/main/java/com/gitee/neuray/security/modules/param/service/impl/EngineParamServiceImpl.java +++ b/neuray-admin/src/main/java/com/gitee/neuray/security/modules/param/service/impl/EngineParamServiceImpl.java @@ -1,14 +1,16 @@ package com.gitee.neuray.security.modules.param.service.impl; +import com.alibaba.fastjson.JSONObject; import com.gitee.neuray.security.modules.param.dao.EngineItemDao; import com.gitee.neuray.security.modules.param.entity.ParamItemEntity; import com.gitee.neuray.security.modules.param.service.ParamItemService; +import com.gitee.neuray.security.modules.sys.entity.SysUserEntity; +import com.gitee.neuray.security.modules.sys.shiro.ShiroUtils; import org.springframework.stereotype.Service; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; +import java.math.BigInteger; +import java.util.*; + import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; @@ -31,6 +33,9 @@ public class EngineParamServiceImpl extends ServiceImpl params) { IPage page = this.page( @@ -44,21 +49,44 @@ public class EngineParamServiceImpl extends ServiceImpl columns = engineItemDao.queryTableColumn(tableName); List jqgrid = new ArrayList<>(); - columns.stream().forEach( (t) -> { - String name = t.get("colunmName").toString(); - String id = name.substring(6); - ParamItemEntity p = paramItemService.getById(id); - String label = p.getParamName(); - Map item = new HashMap(); - item.put("label",label); - item.put("name",name); - item.put("index",name); - jqgrid.add(item); - /*{ label: '发动机名称', name: 'name', index: 'name', width: 80 },*/ - }); + if(columns!=null && columns.size() != 0){ + columns.stream().forEach( (t) -> { + String name = t.get("colunmName").toString(); + String label = ""; + boolean hidden = false; + if(!"id".equals(name) && !"create_time".equals(name) && !"create_user".equals(name) + && !"create_name".equals(name) && !"update_time".equals(name) + && !"update_user".equals(name) && !"update_name".equals(name) && !"dept_id".equals(name)){ + String id = name.substring(6); + ParamItemEntity p = paramItemService.getById(id); + label = p.getParamName(); + }else if("create_time".equals(name)){ + label = "创建时间"; + }else if("create_name".equals(name)){ + label = "创建人"; + }else if("update_time".equals(name)){ + label = "修改时间"; + }else if("update_name".equals(name)){ + label = "修改人"; + }else{ + label = name; + hidden = true; + } + Map item = new HashMap(); + item.put("label",label); + item.put("name",name); + item.put("index",name); + if (hidden){ + item.put("hidden",true); + } + jqgrid.add(item); + /*{ label: '发动机名称', name: 'name', index: 'name', width: 80 },*/ + }); + Collections.reverse(jqgrid); + } List ret = engineItemDao.getParamByTable(tableName); @@ -67,4 +95,74 @@ public class EngineParamServiceImpl extends ServiceImpl maps = JSONObject.parseArray(JSONObject.toJSONString(map.get("list")),Map.class); + SysUserEntity userEntity = ShiroUtils.getUserEntity(); + Map create_time = new HashMap(); + create_time.put("name","create_time"); + create_time.put("ret",new Date()); + Map create_user = new HashMap(); + create_user.put("name","create_user"); + create_user.put("ret",userEntity.getUserId()); + Map create_name = new HashMap(); + create_name.put("name","create_name"); + create_name.put("ret",userEntity.getUsername()); + Map update_time = new HashMap(); + update_time.put("name","update_time"); + update_time.put("ret",new Date()); + Map update_user = new HashMap(); + update_user.put("name","update_user"); + update_user.put("ret",userEntity.getUserId()); + Map update_name = new HashMap(); + update_name.put("name","update_name"); + update_name.put("ret",userEntity.getUsername()); + Map dept_id = new HashMap(); + dept_id.put("name","dept_id"); + dept_id.put("ret",userEntity.getDeptId()); + maps.add(create_time); + maps.add(create_user); + maps.add(create_name); + maps.add(update_time); + maps.add(update_user); + maps.add(update_name); + maps.add(dept_id); + //String tableName = map.get("tableName").toString(); + String tableName = "engine_i3yYl4OS"; + engineParamDao.saveParam(maps,tableName); + + } + + @Override + public void updateParam(Map map) { + List maps = JSONObject.parseArray(JSONObject.toJSONString(map.get("list")),Map.class); + SysUserEntity userEntity = ShiroUtils.getUserEntity(); + Map update_time = new HashMap(); + update_time.put("name","update_time"); + update_time.put("ret",new Date()); + Map update_user = new HashMap(); + update_user.put("name","update_user"); + update_user.put("ret",userEntity.getUserId()); + Map update_name = new HashMap(); + update_name.put("name","update_name"); + update_name.put("ret",userEntity.getUsername()); + maps.add(update_time); + maps.add(update_user); + maps.add(update_name); + //String tableName = map.get("tableName").toString(); + String tableName = "engine_i3yYl4OS"; + Long id = Long.parseLong(map.get("id").toString()); + engineParamDao.updateParam(maps,tableName,id); + + } + + @Override + public void deleteParam(Map map) { + String tableName = "engine_i3yYl4OS"; + + List id = (List) map.get("ids"); + engineParamDao.deleteParam(tableName,id); + + } } diff --git a/neuray-admin/src/main/resources/mapper/param/EngineItemDao.xml b/neuray-admin/src/main/resources/mapper/param/EngineItemDao.xml index 69a8671b4745170c33bb5810d8f503ae016b02aa..44c7f8a054d1c1e26cf5c8a860ad3d311da4b879 100644 --- a/neuray-admin/src/main/resources/mapper/param/EngineItemDao.xml +++ b/neuray-admin/src/main/resources/mapper/param/EngineItemDao.xml @@ -18,11 +18,19 @@ CREATE TABLE ${tableName} ( - id bigint NOT NULL AUTO_INCREMENT PRIMARY KEY, + id bigint NOT NULL AUTO_INCREMENT, + create_time datetime(0) NULL DEFAULT NULL COMMENT '创建时间', + create_user bigint(20) NULL DEFAULT NULL COMMENT '创建人id', + create_name varchar(50) CHARACTER SET utf8 COLLATE utf8_bin NULL DEFAULT NULL COMMENT '创建人名称', + update_time datetime(0) NULL DEFAULT NULL COMMENT '修改时间', + update_user bigint(20) NULL DEFAULT NULL COMMENT '修改人id', + update_name varchar(50) CHARACTER SET utf8 COLLATE utf8_bin NULL DEFAULT NULL COMMENT '修改人名称', + dept_id bigint(20) NULL DEFAULT NULL COMMENT '部门id', ${item} VARCHAR(20), - UNIQUE INDEX 'id'('id') USING BTREE + PRIMARY KEY (`id`) USING BTREE, + UNIQUE INDEX `id`(`id`) USING BTREE ) diff --git a/neuray-admin/src/main/resources/mapper/param/EngineParamDao.xml b/neuray-admin/src/main/resources/mapper/param/EngineParamDao.xml new file mode 100644 index 0000000000000000000000000000000000000000..c93b6aff95f4996bbff851308315696d7c4219ed --- /dev/null +++ b/neuray-admin/src/main/resources/mapper/param/EngineParamDao.xml @@ -0,0 +1,33 @@ + + + + + + + + insert into ${tableName} + + ${item.name} + + values + + #{item.ret} + + + + + + + update ${tableName} set + + ${item.name} = #{item.ret} + + where id = #{id} + + + delete from ${tableName} where id in + + #{item} + + + \ No newline at end of file