diff --git a/casic-iris-acs/pom.xml b/casic-iris-acs/pom.xml
index 58dc25b..92a10e1 100644
--- a/casic-iris-acs/pom.xml
+++ b/casic-iris-acs/pom.xml
@@ -29,6 +29,12 @@
com.casic
+ casic-metadata-core
+ ${casic.version}
+
+
+
+ com.casic
casic-export-support
1.0.0-SNAPSHOT
@@ -80,6 +86,7 @@
commons-lang3
+
diff --git a/casic-iris-acs/pom.xml b/casic-iris-acs/pom.xml
index 58dc25b..92a10e1 100644
--- a/casic-iris-acs/pom.xml
+++ b/casic-iris-acs/pom.xml
@@ -29,6 +29,12 @@
com.casic
+ casic-metadata-core
+ ${casic.version}
+
+
+
+ com.casic
casic-export-support
1.0.0-SNAPSHOT
@@ -80,6 +86,7 @@
commons-lang3
+
diff --git a/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/controller/PersonController.java b/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/controller/PersonController.java
new file mode 100644
index 0000000..882434e
--- /dev/null
+++ b/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/controller/PersonController.java
@@ -0,0 +1,98 @@
+package com.casic.missiles.modular.system.controller;
+
+import com.baomidou.mybatisplus.mapper.EntityWrapper;
+import com.baomidou.mybatisplus.plugins.Page;
+import com.casic.missiles.core.base.controller.BaseController;
+import com.casic.missiles.core.base.response.ResponseData;
+import com.casic.missiles.core.common.constant.factory.PageFactory;
+import com.casic.missiles.modular.system.model.Person;
+import com.casic.missiles.modular.system.service.IPersonService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+/**
+ * 人员管理控制器
+ *
+ * @author dev
+ * @Date 2019-12-03 17:45:18
+ */
+@RestController
+@RequestMapping("/person")
+public class PersonController extends BaseController {
+
+
+ @Autowired
+ private IPersonService personService;
+
+
+ /**
+ * 获取人员管理列表
+ */
+ @RequestMapping(value = "/list")
+ @ResponseBody
+ public Object list(String condition) {
+ return personService.selectList(null);
+ }
+
+ /**
+ * 获取人员管理分页列表
+ */
+ @RequestMapping(value = "/listPage")
+ @ResponseBody
+ public Object listPage(String condition) {
+ Page page = new PageFactory().defaultPage();
+ EntityWrapper query = new EntityWrapper<>();
+ page = personService.selectPage(page,query);
+ return super.packForBT(page);
+ }
+ /**
+ * 新增人员管理
+ */
+ @RequestMapping(value = "/add")
+ @ResponseBody
+ public Object add(Person person) {
+ personService.insert(person);
+ return ResponseData.success();
+ }
+
+ /**
+ * 删除人员管理
+ */
+ @RequestMapping(value = "/delete")
+ @ResponseBody
+ public Object delete(@RequestParam String personId) {
+ personService.deleteById(personId);
+ return ResponseData.success();
+ }
+
+ /**
+ * 批量删除
+ */
+ @RequestMapping(value = "/batchDelete")
+ @ResponseBody
+ public Object delete(@RequestParam("personIds") List personIds) {
+ personService.deleteBatchIds(personIds);
+ return ResponseData.success();
+ }
+
+ /**
+ * 修改人员管理
+ */
+ @RequestMapping(value = "/update")
+ @ResponseBody
+ public Object update(Person person) {
+ personService.updateById(person);
+ return ResponseData.success();
+ }
+
+ /**
+ * 人员管理详情
+ */
+ @RequestMapping(value = "/detail/{personId}")
+ @ResponseBody
+ public Object detail(@PathVariable("personId") String personId) {
+ return ResponseData.success(personService.selectById(personId));
+ }
+}
diff --git a/casic-iris-acs/pom.xml b/casic-iris-acs/pom.xml
index 58dc25b..92a10e1 100644
--- a/casic-iris-acs/pom.xml
+++ b/casic-iris-acs/pom.xml
@@ -29,6 +29,12 @@
com.casic
+ casic-metadata-core
+ ${casic.version}
+
+
+
+ com.casic
casic-export-support
1.0.0-SNAPSHOT
@@ -80,6 +86,7 @@
commons-lang3
+
diff --git a/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/controller/PersonController.java b/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/controller/PersonController.java
new file mode 100644
index 0000000..882434e
--- /dev/null
+++ b/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/controller/PersonController.java
@@ -0,0 +1,98 @@
+package com.casic.missiles.modular.system.controller;
+
+import com.baomidou.mybatisplus.mapper.EntityWrapper;
+import com.baomidou.mybatisplus.plugins.Page;
+import com.casic.missiles.core.base.controller.BaseController;
+import com.casic.missiles.core.base.response.ResponseData;
+import com.casic.missiles.core.common.constant.factory.PageFactory;
+import com.casic.missiles.modular.system.model.Person;
+import com.casic.missiles.modular.system.service.IPersonService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+/**
+ * 人员管理控制器
+ *
+ * @author dev
+ * @Date 2019-12-03 17:45:18
+ */
+@RestController
+@RequestMapping("/person")
+public class PersonController extends BaseController {
+
+
+ @Autowired
+ private IPersonService personService;
+
+
+ /**
+ * 获取人员管理列表
+ */
+ @RequestMapping(value = "/list")
+ @ResponseBody
+ public Object list(String condition) {
+ return personService.selectList(null);
+ }
+
+ /**
+ * 获取人员管理分页列表
+ */
+ @RequestMapping(value = "/listPage")
+ @ResponseBody
+ public Object listPage(String condition) {
+ Page page = new PageFactory().defaultPage();
+ EntityWrapper query = new EntityWrapper<>();
+ page = personService.selectPage(page,query);
+ return super.packForBT(page);
+ }
+ /**
+ * 新增人员管理
+ */
+ @RequestMapping(value = "/add")
+ @ResponseBody
+ public Object add(Person person) {
+ personService.insert(person);
+ return ResponseData.success();
+ }
+
+ /**
+ * 删除人员管理
+ */
+ @RequestMapping(value = "/delete")
+ @ResponseBody
+ public Object delete(@RequestParam String personId) {
+ personService.deleteById(personId);
+ return ResponseData.success();
+ }
+
+ /**
+ * 批量删除
+ */
+ @RequestMapping(value = "/batchDelete")
+ @ResponseBody
+ public Object delete(@RequestParam("personIds") List personIds) {
+ personService.deleteBatchIds(personIds);
+ return ResponseData.success();
+ }
+
+ /**
+ * 修改人员管理
+ */
+ @RequestMapping(value = "/update")
+ @ResponseBody
+ public Object update(Person person) {
+ personService.updateById(person);
+ return ResponseData.success();
+ }
+
+ /**
+ * 人员管理详情
+ */
+ @RequestMapping(value = "/detail/{personId}")
+ @ResponseBody
+ public Object detail(@PathVariable("personId") String personId) {
+ return ResponseData.success(personService.selectById(personId));
+ }
+}
diff --git a/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/dao/PersonMapper.java b/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/dao/PersonMapper.java
new file mode 100644
index 0000000..c2a324b
--- /dev/null
+++ b/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/dao/PersonMapper.java
@@ -0,0 +1,16 @@
+package com.casic.missiles.modular.system.dao;
+
+import com.casic.missiles.modular.system.model.Person;
+import com.baomidou.mybatisplus.mapper.BaseMapper;
+
+/**
+ *
+ * 人员数据表 Mapper 接口
+ *
+ *
+ * @author lwh123
+ * @since 2019-12-03
+ */
+public interface PersonMapper extends BaseMapper {
+
+}
diff --git a/casic-iris-acs/pom.xml b/casic-iris-acs/pom.xml
index 58dc25b..92a10e1 100644
--- a/casic-iris-acs/pom.xml
+++ b/casic-iris-acs/pom.xml
@@ -29,6 +29,12 @@
com.casic
+ casic-metadata-core
+ ${casic.version}
+
+
+
+ com.casic
casic-export-support
1.0.0-SNAPSHOT
@@ -80,6 +86,7 @@
commons-lang3
+
diff --git a/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/controller/PersonController.java b/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/controller/PersonController.java
new file mode 100644
index 0000000..882434e
--- /dev/null
+++ b/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/controller/PersonController.java
@@ -0,0 +1,98 @@
+package com.casic.missiles.modular.system.controller;
+
+import com.baomidou.mybatisplus.mapper.EntityWrapper;
+import com.baomidou.mybatisplus.plugins.Page;
+import com.casic.missiles.core.base.controller.BaseController;
+import com.casic.missiles.core.base.response.ResponseData;
+import com.casic.missiles.core.common.constant.factory.PageFactory;
+import com.casic.missiles.modular.system.model.Person;
+import com.casic.missiles.modular.system.service.IPersonService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+/**
+ * 人员管理控制器
+ *
+ * @author dev
+ * @Date 2019-12-03 17:45:18
+ */
+@RestController
+@RequestMapping("/person")
+public class PersonController extends BaseController {
+
+
+ @Autowired
+ private IPersonService personService;
+
+
+ /**
+ * 获取人员管理列表
+ */
+ @RequestMapping(value = "/list")
+ @ResponseBody
+ public Object list(String condition) {
+ return personService.selectList(null);
+ }
+
+ /**
+ * 获取人员管理分页列表
+ */
+ @RequestMapping(value = "/listPage")
+ @ResponseBody
+ public Object listPage(String condition) {
+ Page page = new PageFactory().defaultPage();
+ EntityWrapper query = new EntityWrapper<>();
+ page = personService.selectPage(page,query);
+ return super.packForBT(page);
+ }
+ /**
+ * 新增人员管理
+ */
+ @RequestMapping(value = "/add")
+ @ResponseBody
+ public Object add(Person person) {
+ personService.insert(person);
+ return ResponseData.success();
+ }
+
+ /**
+ * 删除人员管理
+ */
+ @RequestMapping(value = "/delete")
+ @ResponseBody
+ public Object delete(@RequestParam String personId) {
+ personService.deleteById(personId);
+ return ResponseData.success();
+ }
+
+ /**
+ * 批量删除
+ */
+ @RequestMapping(value = "/batchDelete")
+ @ResponseBody
+ public Object delete(@RequestParam("personIds") List personIds) {
+ personService.deleteBatchIds(personIds);
+ return ResponseData.success();
+ }
+
+ /**
+ * 修改人员管理
+ */
+ @RequestMapping(value = "/update")
+ @ResponseBody
+ public Object update(Person person) {
+ personService.updateById(person);
+ return ResponseData.success();
+ }
+
+ /**
+ * 人员管理详情
+ */
+ @RequestMapping(value = "/detail/{personId}")
+ @ResponseBody
+ public Object detail(@PathVariable("personId") String personId) {
+ return ResponseData.success(personService.selectById(personId));
+ }
+}
diff --git a/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/dao/PersonMapper.java b/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/dao/PersonMapper.java
new file mode 100644
index 0000000..c2a324b
--- /dev/null
+++ b/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/dao/PersonMapper.java
@@ -0,0 +1,16 @@
+package com.casic.missiles.modular.system.dao;
+
+import com.casic.missiles.modular.system.model.Person;
+import com.baomidou.mybatisplus.mapper.BaseMapper;
+
+/**
+ *
+ * 人员数据表 Mapper 接口
+ *
+ *
+ * @author lwh123
+ * @since 2019-12-03
+ */
+public interface PersonMapper extends BaseMapper {
+
+}
diff --git a/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/dao/mapping/PersonMapper.xml b/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/dao/mapping/PersonMapper.xml
new file mode 100644
index 0000000..f556815
--- /dev/null
+++ b/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/dao/mapping/PersonMapper.xml
@@ -0,0 +1,24 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ ID AS id, DELFLAG AS delflag, CREATETIME AS createtime, UPDATETIME AS updatetime, NAME AS name, SEX AS sex, DEPTID AS deptid, ID_CARD AS idCard, REMARKS AS remarks, PERSON_TYPE AS personType
+
+
+
diff --git a/casic-iris-acs/pom.xml b/casic-iris-acs/pom.xml
index 58dc25b..92a10e1 100644
--- a/casic-iris-acs/pom.xml
+++ b/casic-iris-acs/pom.xml
@@ -29,6 +29,12 @@
com.casic
+ casic-metadata-core
+ ${casic.version}
+
+
+
+ com.casic
casic-export-support
1.0.0-SNAPSHOT
@@ -80,6 +86,7 @@
commons-lang3
+
diff --git a/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/controller/PersonController.java b/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/controller/PersonController.java
new file mode 100644
index 0000000..882434e
--- /dev/null
+++ b/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/controller/PersonController.java
@@ -0,0 +1,98 @@
+package com.casic.missiles.modular.system.controller;
+
+import com.baomidou.mybatisplus.mapper.EntityWrapper;
+import com.baomidou.mybatisplus.plugins.Page;
+import com.casic.missiles.core.base.controller.BaseController;
+import com.casic.missiles.core.base.response.ResponseData;
+import com.casic.missiles.core.common.constant.factory.PageFactory;
+import com.casic.missiles.modular.system.model.Person;
+import com.casic.missiles.modular.system.service.IPersonService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+/**
+ * 人员管理控制器
+ *
+ * @author dev
+ * @Date 2019-12-03 17:45:18
+ */
+@RestController
+@RequestMapping("/person")
+public class PersonController extends BaseController {
+
+
+ @Autowired
+ private IPersonService personService;
+
+
+ /**
+ * 获取人员管理列表
+ */
+ @RequestMapping(value = "/list")
+ @ResponseBody
+ public Object list(String condition) {
+ return personService.selectList(null);
+ }
+
+ /**
+ * 获取人员管理分页列表
+ */
+ @RequestMapping(value = "/listPage")
+ @ResponseBody
+ public Object listPage(String condition) {
+ Page page = new PageFactory().defaultPage();
+ EntityWrapper query = new EntityWrapper<>();
+ page = personService.selectPage(page,query);
+ return super.packForBT(page);
+ }
+ /**
+ * 新增人员管理
+ */
+ @RequestMapping(value = "/add")
+ @ResponseBody
+ public Object add(Person person) {
+ personService.insert(person);
+ return ResponseData.success();
+ }
+
+ /**
+ * 删除人员管理
+ */
+ @RequestMapping(value = "/delete")
+ @ResponseBody
+ public Object delete(@RequestParam String personId) {
+ personService.deleteById(personId);
+ return ResponseData.success();
+ }
+
+ /**
+ * 批量删除
+ */
+ @RequestMapping(value = "/batchDelete")
+ @ResponseBody
+ public Object delete(@RequestParam("personIds") List personIds) {
+ personService.deleteBatchIds(personIds);
+ return ResponseData.success();
+ }
+
+ /**
+ * 修改人员管理
+ */
+ @RequestMapping(value = "/update")
+ @ResponseBody
+ public Object update(Person person) {
+ personService.updateById(person);
+ return ResponseData.success();
+ }
+
+ /**
+ * 人员管理详情
+ */
+ @RequestMapping(value = "/detail/{personId}")
+ @ResponseBody
+ public Object detail(@PathVariable("personId") String personId) {
+ return ResponseData.success(personService.selectById(personId));
+ }
+}
diff --git a/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/dao/PersonMapper.java b/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/dao/PersonMapper.java
new file mode 100644
index 0000000..c2a324b
--- /dev/null
+++ b/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/dao/PersonMapper.java
@@ -0,0 +1,16 @@
+package com.casic.missiles.modular.system.dao;
+
+import com.casic.missiles.modular.system.model.Person;
+import com.baomidou.mybatisplus.mapper.BaseMapper;
+
+/**
+ *
+ * 人员数据表 Mapper 接口
+ *
+ *
+ * @author lwh123
+ * @since 2019-12-03
+ */
+public interface PersonMapper extends BaseMapper {
+
+}
diff --git a/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/dao/mapping/PersonMapper.xml b/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/dao/mapping/PersonMapper.xml
new file mode 100644
index 0000000..f556815
--- /dev/null
+++ b/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/dao/mapping/PersonMapper.xml
@@ -0,0 +1,24 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ ID AS id, DELFLAG AS delflag, CREATETIME AS createtime, UPDATETIME AS updatetime, NAME AS name, SEX AS sex, DEPTID AS deptid, ID_CARD AS idCard, REMARKS AS remarks, PERSON_TYPE AS personType
+
+
+
diff --git a/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/model/Person.java b/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/model/Person.java
new file mode 100644
index 0000000..4a8d915
--- /dev/null
+++ b/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/model/Person.java
@@ -0,0 +1,176 @@
+package com.casic.missiles.modular.system.model;
+
+import java.io.Serializable;
+
+import java.util.Date;
+import com.baomidou.mybatisplus.annotations.TableId;
+import com.baomidou.mybatisplus.annotations.TableField;
+import com.baomidou.mybatisplus.activerecord.Model;
+import com.baomidou.mybatisplus.annotations.TableName;
+import com.casic.missiles.modular.metadata.base.DataMetaModel;
+
+import java.io.Serializable;
+
+/**
+ *
+ * 人员数据表
+ *
+ *
+ * @author lwh123
+ * @since 2019-12-03
+ */
+@TableName("sys_person")
+public class Person extends DataMetaModel {
+
+ private static final long serialVersionUID = 1L;
+
+ @TableId("ID")
+ private Long id;
+ /**
+ * 状态(0：有效 1：删除）
+ */
+ @TableField("DELFLAG")
+ private String delflag;
+ /**
+ * 创建时间
+ */
+ @TableField("CREATETIME")
+ private Date createtime;
+ /**
+ * 修改时间
+ */
+ @TableField("UPDATETIME")
+ private Date updatetime;
+ /**
+ * 姓名
+ */
+ @TableField("NAME")
+ private String name;
+ /**
+ * 性别
+ */
+ @TableField("SEX")
+ private String sex;
+ /**
+ * 所属部门
+ */
+ @TableField("DEPTID")
+ private Long deptid;
+ /**
+ * 身份证号
+ */
+ @TableField("ID_CARD")
+ private String idCard;
+ /**
+ * 备注信息
+ */
+ @TableField("REMARKS")
+ private String remarks;
+ /**
+ * 人员类型
+ */
+ @TableField("PERSON_TYPE")
+ private String personType;
+
+
+ public Long getId() {
+ return id;
+ }
+
+ public void setId(Long id) {
+ this.id = id;
+ }
+
+ public String getDelflag() {
+ return delflag;
+ }
+
+ public void setDelflag(String delflag) {
+ this.delflag = delflag;
+ }
+
+ public Date getCreatetime() {
+ return createtime;
+ }
+
+ public void setCreatetime(Date createtime) {
+ this.createtime = createtime;
+ }
+
+ public Date getUpdatetime() {
+ return updatetime;
+ }
+
+ public void setUpdatetime(Date updatetime) {
+ this.updatetime = updatetime;
+ }
+
+ public String getName() {
+ return name;
+ }
+
+ public void setName(String name) {
+ this.name = name;
+ }
+
+ public String getSex() {
+ return sex;
+ }
+
+ public void setSex(String sex) {
+ this.sex = sex;
+ }
+
+ public Long getDeptid() {
+ return deptid;
+ }
+
+ public void setDeptid(Long deptid) {
+ this.deptid = deptid;
+ }
+
+ public String getIdCard() {
+ return idCard;
+ }
+
+ public void setIdCard(String idCard) {
+ this.idCard = idCard;
+ }
+
+ public String getRemarks() {
+ return remarks;
+ }
+
+ public void setRemarks(String remarks) {
+ this.remarks = remarks;
+ }
+
+ public String getPersonType() {
+ return personType;
+ }
+
+ public void setPersonType(String personType) {
+ this.personType = personType;
+ }
+
+ @Override
+ protected Serializable pkVal() {
+ return this.id;
+ }
+
+ @Override
+ public String toString() {
+ return "Person{" +
+ "id=" + id +
+ ", delflag=" + delflag +
+ ", createtime=" + createtime +
+ ", updatetime=" + updatetime +
+ ", name=" + name +
+ ", sex=" + sex +
+ ", deptid=" + deptid +
+ ", idCard=" + idCard +
+ ", remarks=" + remarks +
+ ", personType=" + personType +
+ "}";
+ }
+}
diff --git a/casic-iris-acs/pom.xml b/casic-iris-acs/pom.xml
index 58dc25b..92a10e1 100644
--- a/casic-iris-acs/pom.xml
+++ b/casic-iris-acs/pom.xml
@@ -29,6 +29,12 @@
com.casic
+ casic-metadata-core
+ ${casic.version}
+
+
+
+ com.casic
casic-export-support
1.0.0-SNAPSHOT
@@ -80,6 +86,7 @@
commons-lang3
+
diff --git a/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/controller/PersonController.java b/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/controller/PersonController.java
new file mode 100644
index 0000000..882434e
--- /dev/null
+++ b/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/controller/PersonController.java
@@ -0,0 +1,98 @@
+package com.casic.missiles.modular.system.controller;
+
+import com.baomidou.mybatisplus.mapper.EntityWrapper;
+import com.baomidou.mybatisplus.plugins.Page;
+import com.casic.missiles.core.base.controller.BaseController;
+import com.casic.missiles.core.base.response.ResponseData;
+import com.casic.missiles.core.common.constant.factory.PageFactory;
+import com.casic.missiles.modular.system.model.Person;
+import com.casic.missiles.modular.system.service.IPersonService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+/**
+ * 人员管理控制器
+ *
+ * @author dev
+ * @Date 2019-12-03 17:45:18
+ */
+@RestController
+@RequestMapping("/person")
+public class PersonController extends BaseController {
+
+
+ @Autowired
+ private IPersonService personService;
+
+
+ /**
+ * 获取人员管理列表
+ */
+ @RequestMapping(value = "/list")
+ @ResponseBody
+ public Object list(String condition) {
+ return personService.selectList(null);
+ }
+
+ /**
+ * 获取人员管理分页列表
+ */
+ @RequestMapping(value = "/listPage")
+ @ResponseBody
+ public Object listPage(String condition) {
+ Page page = new PageFactory().defaultPage();
+ EntityWrapper query = new EntityWrapper<>();
+ page = personService.selectPage(page,query);
+ return super.packForBT(page);
+ }
+ /**
+ * 新增人员管理
+ */
+ @RequestMapping(value = "/add")
+ @ResponseBody
+ public Object add(Person person) {
+ personService.insert(person);
+ return ResponseData.success();
+ }
+
+ /**
+ * 删除人员管理
+ */
+ @RequestMapping(value = "/delete")
+ @ResponseBody
+ public Object delete(@RequestParam String personId) {
+ personService.deleteById(personId);
+ return ResponseData.success();
+ }
+
+ /**
+ * 批量删除
+ */
+ @RequestMapping(value = "/batchDelete")
+ @ResponseBody
+ public Object delete(@RequestParam("personIds") List personIds) {
+ personService.deleteBatchIds(personIds);
+ return ResponseData.success();
+ }
+
+ /**
+ * 修改人员管理
+ */
+ @RequestMapping(value = "/update")
+ @ResponseBody
+ public Object update(Person person) {
+ personService.updateById(person);
+ return ResponseData.success();
+ }
+
+ /**
+ * 人员管理详情
+ */
+ @RequestMapping(value = "/detail/{personId}")
+ @ResponseBody
+ public Object detail(@PathVariable("personId") String personId) {
+ return ResponseData.success(personService.selectById(personId));
+ }
+}
diff --git a/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/dao/PersonMapper.java b/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/dao/PersonMapper.java
new file mode 100644
index 0000000..c2a324b
--- /dev/null
+++ b/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/dao/PersonMapper.java
@@ -0,0 +1,16 @@
+package com.casic.missiles.modular.system.dao;
+
+import com.casic.missiles.modular.system.model.Person;
+import com.baomidou.mybatisplus.mapper.BaseMapper;
+
+/**
+ *
+ * 人员数据表 Mapper 接口
+ *
+ *
+ * @author lwh123
+ * @since 2019-12-03
+ */
+public interface PersonMapper extends BaseMapper {
+
+}
diff --git a/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/dao/mapping/PersonMapper.xml b/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/dao/mapping/PersonMapper.xml
new file mode 100644
index 0000000..f556815
--- /dev/null
+++ b/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/dao/mapping/PersonMapper.xml
@@ -0,0 +1,24 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ ID AS id, DELFLAG AS delflag, CREATETIME AS createtime, UPDATETIME AS updatetime, NAME AS name, SEX AS sex, DEPTID AS deptid, ID_CARD AS idCard, REMARKS AS remarks, PERSON_TYPE AS personType
+
+
+
diff --git a/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/model/Person.java b/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/model/Person.java
new file mode 100644
index 0000000..4a8d915
--- /dev/null
+++ b/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/model/Person.java
@@ -0,0 +1,176 @@
+package com.casic.missiles.modular.system.model;
+
+import java.io.Serializable;
+
+import java.util.Date;
+import com.baomidou.mybatisplus.annotations.TableId;
+import com.baomidou.mybatisplus.annotations.TableField;
+import com.baomidou.mybatisplus.activerecord.Model;
+import com.baomidou.mybatisplus.annotations.TableName;
+import com.casic.missiles.modular.metadata.base.DataMetaModel;
+
+import java.io.Serializable;
+
+/**
+ *
+ * 人员数据表
+ *
+ *
+ * @author lwh123
+ * @since 2019-12-03
+ */
+@TableName("sys_person")
+public class Person extends DataMetaModel {
+
+ private static final long serialVersionUID = 1L;
+
+ @TableId("ID")
+ private Long id;
+ /**
+ * 状态(0：有效 1：删除）
+ */
+ @TableField("DELFLAG")
+ private String delflag;
+ /**
+ * 创建时间
+ */
+ @TableField("CREATETIME")
+ private Date createtime;
+ /**
+ * 修改时间
+ */
+ @TableField("UPDATETIME")
+ private Date updatetime;
+ /**
+ * 姓名
+ */
+ @TableField("NAME")
+ private String name;
+ /**
+ * 性别
+ */
+ @TableField("SEX")
+ private String sex;
+ /**
+ * 所属部门
+ */
+ @TableField("DEPTID")
+ private Long deptid;
+ /**
+ * 身份证号
+ */
+ @TableField("ID_CARD")
+ private String idCard;
+ /**
+ * 备注信息
+ */
+ @TableField("REMARKS")
+ private String remarks;
+ /**
+ * 人员类型
+ */
+ @TableField("PERSON_TYPE")
+ private String personType;
+
+
+ public Long getId() {
+ return id;
+ }
+
+ public void setId(Long id) {
+ this.id = id;
+ }
+
+ public String getDelflag() {
+ return delflag;
+ }
+
+ public void setDelflag(String delflag) {
+ this.delflag = delflag;
+ }
+
+ public Date getCreatetime() {
+ return createtime;
+ }
+
+ public void setCreatetime(Date createtime) {
+ this.createtime = createtime;
+ }
+
+ public Date getUpdatetime() {
+ return updatetime;
+ }
+
+ public void setUpdatetime(Date updatetime) {
+ this.updatetime = updatetime;
+ }
+
+ public String getName() {
+ return name;
+ }
+
+ public void setName(String name) {
+ this.name = name;
+ }
+
+ public String getSex() {
+ return sex;
+ }
+
+ public void setSex(String sex) {
+ this.sex = sex;
+ }
+
+ public Long getDeptid() {
+ return deptid;
+ }
+
+ public void setDeptid(Long deptid) {
+ this.deptid = deptid;
+ }
+
+ public String getIdCard() {
+ return idCard;
+ }
+
+ public void setIdCard(String idCard) {
+ this.idCard = idCard;
+ }
+
+ public String getRemarks() {
+ return remarks;
+ }
+
+ public void setRemarks(String remarks) {
+ this.remarks = remarks;
+ }
+
+ public String getPersonType() {
+ return personType;
+ }
+
+ public void setPersonType(String personType) {
+ this.personType = personType;
+ }
+
+ @Override
+ protected Serializable pkVal() {
+ return this.id;
+ }
+
+ @Override
+ public String toString() {
+ return "Person{" +
+ "id=" + id +
+ ", delflag=" + delflag +
+ ", createtime=" + createtime +
+ ", updatetime=" + updatetime +
+ ", name=" + name +
+ ", sex=" + sex +
+ ", deptid=" + deptid +
+ ", idCard=" + idCard +
+ ", remarks=" + remarks +
+ ", personType=" + personType +
+ "}";
+ }
+}
diff --git a/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/service/IPersonService.java b/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/service/IPersonService.java
new file mode 100644
index 0000000..c58c236
--- /dev/null
+++ b/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/service/IPersonService.java
@@ -0,0 +1,16 @@
+package com.casic.missiles.modular.system.service;
+
+import com.casic.missiles.modular.system.model.Person;
+import com.baomidou.mybatisplus.service.IService;
+
+/**
+ *
+ * 人员数据表 服务类
+ *
+ *
+ * @author lwh123
+ * @since 2019-12-03
+ */
+public interface IPersonService extends IService {
+
+}
diff --git a/casic-iris-acs/pom.xml b/casic-iris-acs/pom.xml
index 58dc25b..92a10e1 100644
--- a/casic-iris-acs/pom.xml
+++ b/casic-iris-acs/pom.xml
@@ -29,6 +29,12 @@
com.casic
+ casic-metadata-core
+ ${casic.version}
+
+
+
+ com.casic
casic-export-support
1.0.0-SNAPSHOT
@@ -80,6 +86,7 @@
commons-lang3
+
diff --git a/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/controller/PersonController.java b/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/controller/PersonController.java
new file mode 100644
index 0000000..882434e
--- /dev/null
+++ b/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/controller/PersonController.java
@@ -0,0 +1,98 @@
+package com.casic.missiles.modular.system.controller;
+
+import com.baomidou.mybatisplus.mapper.EntityWrapper;
+import com.baomidou.mybatisplus.plugins.Page;
+import com.casic.missiles.core.base.controller.BaseController;
+import com.casic.missiles.core.base.response.ResponseData;
+import com.casic.missiles.core.common.constant.factory.PageFactory;
+import com.casic.missiles.modular.system.model.Person;
+import com.casic.missiles.modular.system.service.IPersonService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+/**
+ * 人员管理控制器
+ *
+ * @author dev
+ * @Date 2019-12-03 17:45:18
+ */
+@RestController
+@RequestMapping("/person")
+public class PersonController extends BaseController {
+
+
+ @Autowired
+ private IPersonService personService;
+
+
+ /**
+ * 获取人员管理列表
+ */
+ @RequestMapping(value = "/list")
+ @ResponseBody
+ public Object list(String condition) {
+ return personService.selectList(null);
+ }
+
+ /**
+ * 获取人员管理分页列表
+ */
+ @RequestMapping(value = "/listPage")
+ @ResponseBody
+ public Object listPage(String condition) {
+ Page page = new PageFactory().defaultPage();
+ EntityWrapper query = new EntityWrapper<>();
+ page = personService.selectPage(page,query);
+ return super.packForBT(page);
+ }
+ /**
+ * 新增人员管理
+ */
+ @RequestMapping(value = "/add")
+ @ResponseBody
+ public Object add(Person person) {
+ personService.insert(person);
+ return ResponseData.success();
+ }
+
+ /**
+ * 删除人员管理
+ */
+ @RequestMapping(value = "/delete")
+ @ResponseBody
+ public Object delete(@RequestParam String personId) {
+ personService.deleteById(personId);
+ return ResponseData.success();
+ }
+
+ /**
+ * 批量删除
+ */
+ @RequestMapping(value = "/batchDelete")
+ @ResponseBody
+ public Object delete(@RequestParam("personIds") List personIds) {
+ personService.deleteBatchIds(personIds);
+ return ResponseData.success();
+ }
+
+ /**
+ * 修改人员管理
+ */
+ @RequestMapping(value = "/update")
+ @ResponseBody
+ public Object update(Person person) {
+ personService.updateById(person);
+ return ResponseData.success();
+ }
+
+ /**
+ * 人员管理详情
+ */
+ @RequestMapping(value = "/detail/{personId}")
+ @ResponseBody
+ public Object detail(@PathVariable("personId") String personId) {
+ return ResponseData.success(personService.selectById(personId));
+ }
+}
diff --git a/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/dao/PersonMapper.java b/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/dao/PersonMapper.java
new file mode 100644
index 0000000..c2a324b
--- /dev/null
+++ b/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/dao/PersonMapper.java
@@ -0,0 +1,16 @@
+package com.casic.missiles.modular.system.dao;
+
+import com.casic.missiles.modular.system.model.Person;
+import com.baomidou.mybatisplus.mapper.BaseMapper;
+
+/**
+ *
+ * 人员数据表 Mapper 接口
+ *
+ *
+ * @author lwh123
+ * @since 2019-12-03
+ */
+public interface PersonMapper extends BaseMapper {
+
+}
diff --git a/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/dao/mapping/PersonMapper.xml b/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/dao/mapping/PersonMapper.xml
new file mode 100644
index 0000000..f556815
--- /dev/null
+++ b/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/dao/mapping/PersonMapper.xml
@@ -0,0 +1,24 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ ID AS id, DELFLAG AS delflag, CREATETIME AS createtime, UPDATETIME AS updatetime, NAME AS name, SEX AS sex, DEPTID AS deptid, ID_CARD AS idCard, REMARKS AS remarks, PERSON_TYPE AS personType
+
+
+
diff --git a/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/model/Person.java b/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/model/Person.java
new file mode 100644
index 0000000..4a8d915
--- /dev/null
+++ b/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/model/Person.java
@@ -0,0 +1,176 @@
+package com.casic.missiles.modular.system.model;
+
+import java.io.Serializable;
+
+import java.util.Date;
+import com.baomidou.mybatisplus.annotations.TableId;
+import com.baomidou.mybatisplus.annotations.TableField;
+import com.baomidou.mybatisplus.activerecord.Model;
+import com.baomidou.mybatisplus.annotations.TableName;
+import com.casic.missiles.modular.metadata.base.DataMetaModel;
+
+import java.io.Serializable;
+
+/**
+ *
+ * 人员数据表
+ *
+ *
+ * @author lwh123
+ * @since 2019-12-03
+ */
+@TableName("sys_person")
+public class Person extends DataMetaModel {
+
+ private static final long serialVersionUID = 1L;
+
+ @TableId("ID")
+ private Long id;
+ /**
+ * 状态(0：有效 1：删除）
+ */
+ @TableField("DELFLAG")
+ private String delflag;
+ /**
+ * 创建时间
+ */
+ @TableField("CREATETIME")
+ private Date createtime;
+ /**
+ * 修改时间
+ */
+ @TableField("UPDATETIME")
+ private Date updatetime;
+ /**
+ * 姓名
+ */
+ @TableField("NAME")
+ private String name;
+ /**
+ * 性别
+ */
+ @TableField("SEX")
+ private String sex;
+ /**
+ * 所属部门
+ */
+ @TableField("DEPTID")
+ private Long deptid;
+ /**
+ * 身份证号
+ */
+ @TableField("ID_CARD")
+ private String idCard;
+ /**
+ * 备注信息
+ */
+ @TableField("REMARKS")
+ private String remarks;
+ /**
+ * 人员类型
+ */
+ @TableField("PERSON_TYPE")
+ private String personType;
+
+
+ public Long getId() {
+ return id;
+ }
+
+ public void setId(Long id) {
+ this.id = id;
+ }
+
+ public String getDelflag() {
+ return delflag;
+ }
+
+ public void setDelflag(String delflag) {
+ this.delflag = delflag;
+ }
+
+ public Date getCreatetime() {
+ return createtime;
+ }
+
+ public void setCreatetime(Date createtime) {
+ this.createtime = createtime;
+ }
+
+ public Date getUpdatetime() {
+ return updatetime;
+ }
+
+ public void setUpdatetime(Date updatetime) {
+ this.updatetime = updatetime;
+ }
+
+ public String getName() {
+ return name;
+ }
+
+ public void setName(String name) {
+ this.name = name;
+ }
+
+ public String getSex() {
+ return sex;
+ }
+
+ public void setSex(String sex) {
+ this.sex = sex;
+ }
+
+ public Long getDeptid() {
+ return deptid;
+ }
+
+ public void setDeptid(Long deptid) {
+ this.deptid = deptid;
+ }
+
+ public String getIdCard() {
+ return idCard;
+ }
+
+ public void setIdCard(String idCard) {
+ this.idCard = idCard;
+ }
+
+ public String getRemarks() {
+ return remarks;
+ }
+
+ public void setRemarks(String remarks) {
+ this.remarks = remarks;
+ }
+
+ public String getPersonType() {
+ return personType;
+ }
+
+ public void setPersonType(String personType) {
+ this.personType = personType;
+ }
+
+ @Override
+ protected Serializable pkVal() {
+ return this.id;
+ }
+
+ @Override
+ public String toString() {
+ return "Person{" +
+ "id=" + id +
+ ", delflag=" + delflag +
+ ", createtime=" + createtime +
+ ", updatetime=" + updatetime +
+ ", name=" + name +
+ ", sex=" + sex +
+ ", deptid=" + deptid +
+ ", idCard=" + idCard +
+ ", remarks=" + remarks +
+ ", personType=" + personType +
+ "}";
+ }
+}
diff --git a/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/service/IPersonService.java b/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/service/IPersonService.java
new file mode 100644
index 0000000..c58c236
--- /dev/null
+++ b/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/service/IPersonService.java
@@ -0,0 +1,16 @@
+package com.casic.missiles.modular.system.service;
+
+import com.casic.missiles.modular.system.model.Person;
+import com.baomidou.mybatisplus.service.IService;
+
+/**
+ *
+ * 人员数据表 服务类
+ *
+ *
+ * @author lwh123
+ * @since 2019-12-03
+ */
+public interface IPersonService extends IService {
+
+}
diff --git a/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/service/impl/PersonServiceImpl.java b/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/service/impl/PersonServiceImpl.java
new file mode 100644
index 0000000..4eb8734
--- /dev/null
+++ b/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/service/impl/PersonServiceImpl.java
@@ -0,0 +1,20 @@
+package com.casic.missiles.modular.system.service.impl;
+
+import com.casic.missiles.modular.system.model.Person;
+import com.casic.missiles.modular.system.dao.PersonMapper;
+import com.casic.missiles.modular.system.service.IPersonService;
+import com.baomidou.mybatisplus.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ *
+ * 人员数据表 服务实现类
+ *
+ *
+ * @author lwh123
+ * @since 2019-12-03
+ */
+@Service
+public class PersonServiceImpl extends ServiceImpl implements IPersonService {
+
+}
diff --git a/casic-iris-acs/pom.xml b/casic-iris-acs/pom.xml
index 58dc25b..92a10e1 100644
--- a/casic-iris-acs/pom.xml
+++ b/casic-iris-acs/pom.xml
@@ -29,6 +29,12 @@
com.casic
+ casic-metadata-core
+ ${casic.version}
+
+
+
+ com.casic
casic-export-support
1.0.0-SNAPSHOT
@@ -80,6 +86,7 @@
commons-lang3
+
diff --git a/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/controller/PersonController.java b/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/controller/PersonController.java
new file mode 100644
index 0000000..882434e
--- /dev/null
+++ b/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/controller/PersonController.java
@@ -0,0 +1,98 @@
+package com.casic.missiles.modular.system.controller;
+
+import com.baomidou.mybatisplus.mapper.EntityWrapper;
+import com.baomidou.mybatisplus.plugins.Page;
+import com.casic.missiles.core.base.controller.BaseController;
+import com.casic.missiles.core.base.response.ResponseData;
+import com.casic.missiles.core.common.constant.factory.PageFactory;
+import com.casic.missiles.modular.system.model.Person;
+import com.casic.missiles.modular.system.service.IPersonService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+/**
+ * 人员管理控制器
+ *
+ * @author dev
+ * @Date 2019-12-03 17:45:18
+ */
+@RestController
+@RequestMapping("/person")
+public class PersonController extends BaseController {
+
+
+ @Autowired
+ private IPersonService personService;
+
+
+ /**
+ * 获取人员管理列表
+ */
+ @RequestMapping(value = "/list")
+ @ResponseBody
+ public Object list(String condition) {
+ return personService.selectList(null);
+ }
+
+ /**
+ * 获取人员管理分页列表
+ */
+ @RequestMapping(value = "/listPage")
+ @ResponseBody
+ public Object listPage(String condition) {
+ Page page = new PageFactory().defaultPage();
+ EntityWrapper query = new EntityWrapper<>();
+ page = personService.selectPage(page,query);
+ return super.packForBT(page);
+ }
+ /**
+ * 新增人员管理
+ */
+ @RequestMapping(value = "/add")
+ @ResponseBody
+ public Object add(Person person) {
+ personService.insert(person);
+ return ResponseData.success();
+ }
+
+ /**
+ * 删除人员管理
+ */
+ @RequestMapping(value = "/delete")
+ @ResponseBody
+ public Object delete(@RequestParam String personId) {
+ personService.deleteById(personId);
+ return ResponseData.success();
+ }
+
+ /**
+ * 批量删除
+ */
+ @RequestMapping(value = "/batchDelete")
+ @ResponseBody
+ public Object delete(@RequestParam("personIds") List personIds) {
+ personService.deleteBatchIds(personIds);
+ return ResponseData.success();
+ }
+
+ /**
+ * 修改人员管理
+ */
+ @RequestMapping(value = "/update")
+ @ResponseBody
+ public Object update(Person person) {
+ personService.updateById(person);
+ return ResponseData.success();
+ }
+
+ /**
+ * 人员管理详情
+ */
+ @RequestMapping(value = "/detail/{personId}")
+ @ResponseBody
+ public Object detail(@PathVariable("personId") String personId) {
+ return ResponseData.success(personService.selectById(personId));
+ }
+}
diff --git a/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/dao/PersonMapper.java b/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/dao/PersonMapper.java
new file mode 100644
index 0000000..c2a324b
--- /dev/null
+++ b/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/dao/PersonMapper.java
@@ -0,0 +1,16 @@
+package com.casic.missiles.modular.system.dao;
+
+import com.casic.missiles.modular.system.model.Person;
+import com.baomidou.mybatisplus.mapper.BaseMapper;
+
+/**
+ *
+ * 人员数据表 Mapper 接口
+ *
+ *
+ * @author lwh123
+ * @since 2019-12-03
+ */
+public interface PersonMapper extends BaseMapper {
+
+}
diff --git a/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/dao/mapping/PersonMapper.xml b/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/dao/mapping/PersonMapper.xml
new file mode 100644
index 0000000..f556815
--- /dev/null
+++ b/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/dao/mapping/PersonMapper.xml
@@ -0,0 +1,24 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ ID AS id, DELFLAG AS delflag, CREATETIME AS createtime, UPDATETIME AS updatetime, NAME AS name, SEX AS sex, DEPTID AS deptid, ID_CARD AS idCard, REMARKS AS remarks, PERSON_TYPE AS personType
+
+
+
diff --git a/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/model/Person.java b/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/model/Person.java
new file mode 100644
index 0000000..4a8d915
--- /dev/null
+++ b/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/model/Person.java
@@ -0,0 +1,176 @@
+package com.casic.missiles.modular.system.model;
+
+import java.io.Serializable;
+
+import java.util.Date;
+import com.baomidou.mybatisplus.annotations.TableId;
+import com.baomidou.mybatisplus.annotations.TableField;
+import com.baomidou.mybatisplus.activerecord.Model;
+import com.baomidou.mybatisplus.annotations.TableName;
+import com.casic.missiles.modular.metadata.base.DataMetaModel;
+
+import java.io.Serializable;
+
+/**
+ *
+ * 人员数据表
+ *
+ *
+ * @author lwh123
+ * @since 2019-12-03
+ */
+@TableName("sys_person")
+public class Person extends DataMetaModel {
+
+ private static final long serialVersionUID = 1L;
+
+ @TableId("ID")
+ private Long id;
+ /**
+ * 状态(0：有效 1：删除）
+ */
+ @TableField("DELFLAG")
+ private String delflag;
+ /**
+ * 创建时间
+ */
+ @TableField("CREATETIME")
+ private Date createtime;
+ /**
+ * 修改时间
+ */
+ @TableField("UPDATETIME")
+ private Date updatetime;
+ /**
+ * 姓名
+ */
+ @TableField("NAME")
+ private String name;
+ /**
+ * 性别
+ */
+ @TableField("SEX")
+ private String sex;
+ /**
+ * 所属部门
+ */
+ @TableField("DEPTID")
+ private Long deptid;
+ /**
+ * 身份证号
+ */
+ @TableField("ID_CARD")
+ private String idCard;
+ /**
+ * 备注信息
+ */
+ @TableField("REMARKS")
+ private String remarks;
+ /**
+ * 人员类型
+ */
+ @TableField("PERSON_TYPE")
+ private String personType;
+
+
+ public Long getId() {
+ return id;
+ }
+
+ public void setId(Long id) {
+ this.id = id;
+ }
+
+ public String getDelflag() {
+ return delflag;
+ }
+
+ public void setDelflag(String delflag) {
+ this.delflag = delflag;
+ }
+
+ public Date getCreatetime() {
+ return createtime;
+ }
+
+ public void setCreatetime(Date createtime) {
+ this.createtime = createtime;
+ }
+
+ public Date getUpdatetime() {
+ return updatetime;
+ }
+
+ public void setUpdatetime(Date updatetime) {
+ this.updatetime = updatetime;
+ }
+
+ public String getName() {
+ return name;
+ }
+
+ public void setName(String name) {
+ this.name = name;
+ }
+
+ public String getSex() {
+ return sex;
+ }
+
+ public void setSex(String sex) {
+ this.sex = sex;
+ }
+
+ public Long getDeptid() {
+ return deptid;
+ }
+
+ public void setDeptid(Long deptid) {
+ this.deptid = deptid;
+ }
+
+ public String getIdCard() {
+ return idCard;
+ }
+
+ public void setIdCard(String idCard) {
+ this.idCard = idCard;
+ }
+
+ public String getRemarks() {
+ return remarks;
+ }
+
+ public void setRemarks(String remarks) {
+ this.remarks = remarks;
+ }
+
+ public String getPersonType() {
+ return personType;
+ }
+
+ public void setPersonType(String personType) {
+ this.personType = personType;
+ }
+
+ @Override
+ protected Serializable pkVal() {
+ return this.id;
+ }
+
+ @Override
+ public String toString() {
+ return "Person{" +
+ "id=" + id +
+ ", delflag=" + delflag +
+ ", createtime=" + createtime +
+ ", updatetime=" + updatetime +
+ ", name=" + name +
+ ", sex=" + sex +
+ ", deptid=" + deptid +
+ ", idCard=" + idCard +
+ ", remarks=" + remarks +
+ ", personType=" + personType +
+ "}";
+ }
+}
diff --git a/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/service/IPersonService.java b/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/service/IPersonService.java
new file mode 100644
index 0000000..c58c236
--- /dev/null
+++ b/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/service/IPersonService.java
@@ -0,0 +1,16 @@
+package com.casic.missiles.modular.system.service;
+
+import com.casic.missiles.modular.system.model.Person;
+import com.baomidou.mybatisplus.service.IService;
+
+/**
+ *
+ * 人员数据表 服务类
+ *
+ *
+ * @author lwh123
+ * @since 2019-12-03
+ */
+public interface IPersonService extends IService {
+
+}
diff --git a/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/service/impl/PersonServiceImpl.java b/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/service/impl/PersonServiceImpl.java
new file mode 100644
index 0000000..4eb8734
--- /dev/null
+++ b/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/service/impl/PersonServiceImpl.java
@@ -0,0 +1,20 @@
+package com.casic.missiles.modular.system.service.impl;
+
+import com.casic.missiles.modular.system.model.Person;
+import com.casic.missiles.modular.system.dao.PersonMapper;
+import com.casic.missiles.modular.system.service.IPersonService;
+import com.baomidou.mybatisplus.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ *
+ * 人员数据表 服务实现类
+ *
+ *
+ * @author lwh123
+ * @since 2019-12-03
+ */
+@Service
+public class PersonServiceImpl extends ServiceImpl implements IPersonService {
+
+}
diff --git a/casic-web/pom.xml b/casic-web/pom.xml
index 64e5eae..afde795 100644
--- a/casic-web/pom.xml
+++ b/casic-web/pom.xml
@@ -76,7 +76,11 @@
casic-admin-area
${casic.version}
-
+
+ com.casic
+ casic-metadata-core
+ ${casic.version}
+
com.casic
diff --git a/casic-iris-acs/pom.xml b/casic-iris-acs/pom.xml
index 58dc25b..92a10e1 100644
--- a/casic-iris-acs/pom.xml
+++ b/casic-iris-acs/pom.xml
@@ -29,6 +29,12 @@
com.casic
+ casic-metadata-core
+ ${casic.version}
+
+
+
+ com.casic
casic-export-support
1.0.0-SNAPSHOT
@@ -80,6 +86,7 @@
commons-lang3
+
diff --git a/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/controller/PersonController.java b/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/controller/PersonController.java
new file mode 100644
index 0000000..882434e
--- /dev/null
+++ b/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/controller/PersonController.java
@@ -0,0 +1,98 @@
+package com.casic.missiles.modular.system.controller;
+
+import com.baomidou.mybatisplus.mapper.EntityWrapper;
+import com.baomidou.mybatisplus.plugins.Page;
+import com.casic.missiles.core.base.controller.BaseController;
+import com.casic.missiles.core.base.response.ResponseData;
+import com.casic.missiles.core.common.constant.factory.PageFactory;
+import com.casic.missiles.modular.system.model.Person;
+import com.casic.missiles.modular.system.service.IPersonService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+/**
+ * 人员管理控制器
+ *
+ * @author dev
+ * @Date 2019-12-03 17:45:18
+ */
+@RestController
+@RequestMapping("/person")
+public class PersonController extends BaseController {
+
+
+ @Autowired
+ private IPersonService personService;
+
+
+ /**
+ * 获取人员管理列表
+ */
+ @RequestMapping(value = "/list")
+ @ResponseBody
+ public Object list(String condition) {
+ return personService.selectList(null);
+ }
+
+ /**
+ * 获取人员管理分页列表
+ */
+ @RequestMapping(value = "/listPage")
+ @ResponseBody
+ public Object listPage(String condition) {
+ Page page = new PageFactory().defaultPage();
+ EntityWrapper query = new EntityWrapper<>();
+ page = personService.selectPage(page,query);
+ return super.packForBT(page);
+ }
+ /**
+ * 新增人员管理
+ */
+ @RequestMapping(value = "/add")
+ @ResponseBody
+ public Object add(Person person) {
+ personService.insert(person);
+ return ResponseData.success();
+ }
+
+ /**
+ * 删除人员管理
+ */
+ @RequestMapping(value = "/delete")
+ @ResponseBody
+ public Object delete(@RequestParam String personId) {
+ personService.deleteById(personId);
+ return ResponseData.success();
+ }
+
+ /**
+ * 批量删除
+ */
+ @RequestMapping(value = "/batchDelete")
+ @ResponseBody
+ public Object delete(@RequestParam("personIds") List personIds) {
+ personService.deleteBatchIds(personIds);
+ return ResponseData.success();
+ }
+
+ /**
+ * 修改人员管理
+ */
+ @RequestMapping(value = "/update")
+ @ResponseBody
+ public Object update(Person person) {
+ personService.updateById(person);
+ return ResponseData.success();
+ }
+
+ /**
+ * 人员管理详情
+ */
+ @RequestMapping(value = "/detail/{personId}")
+ @ResponseBody
+ public Object detail(@PathVariable("personId") String personId) {
+ return ResponseData.success(personService.selectById(personId));
+ }
+}
diff --git a/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/dao/PersonMapper.java b/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/dao/PersonMapper.java
new file mode 100644
index 0000000..c2a324b
--- /dev/null
+++ b/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/dao/PersonMapper.java
@@ -0,0 +1,16 @@
+package com.casic.missiles.modular.system.dao;
+
+import com.casic.missiles.modular.system.model.Person;
+import com.baomidou.mybatisplus.mapper.BaseMapper;
+
+/**
+ *
+ * 人员数据表 Mapper 接口
+ *
+ *
+ * @author lwh123
+ * @since 2019-12-03
+ */
+public interface PersonMapper extends BaseMapper {
+
+}
diff --git a/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/dao/mapping/PersonMapper.xml b/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/dao/mapping/PersonMapper.xml
new file mode 100644
index 0000000..f556815
--- /dev/null
+++ b/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/dao/mapping/PersonMapper.xml
@@ -0,0 +1,24 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ ID AS id, DELFLAG AS delflag, CREATETIME AS createtime, UPDATETIME AS updatetime, NAME AS name, SEX AS sex, DEPTID AS deptid, ID_CARD AS idCard, REMARKS AS remarks, PERSON_TYPE AS personType
+
+
+
diff --git a/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/model/Person.java b/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/model/Person.java
new file mode 100644
index 0000000..4a8d915
--- /dev/null
+++ b/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/model/Person.java
@@ -0,0 +1,176 @@
+package com.casic.missiles.modular.system.model;
+
+import java.io.Serializable;
+
+import java.util.Date;
+import com.baomidou.mybatisplus.annotations.TableId;
+import com.baomidou.mybatisplus.annotations.TableField;
+import com.baomidou.mybatisplus.activerecord.Model;
+import com.baomidou.mybatisplus.annotations.TableName;
+import com.casic.missiles.modular.metadata.base.DataMetaModel;
+
+import java.io.Serializable;
+
+/**
+ *
+ * 人员数据表
+ *
+ *
+ * @author lwh123
+ * @since 2019-12-03
+ */
+@TableName("sys_person")
+public class Person extends DataMetaModel {
+
+ private static final long serialVersionUID = 1L;
+
+ @TableId("ID")
+ private Long id;
+ /**
+ * 状态(0：有效 1：删除）
+ */
+ @TableField("DELFLAG")
+ private String delflag;
+ /**
+ * 创建时间
+ */
+ @TableField("CREATETIME")
+ private Date createtime;
+ /**
+ * 修改时间
+ */
+ @TableField("UPDATETIME")
+ private Date updatetime;
+ /**
+ * 姓名
+ */
+ @TableField("NAME")
+ private String name;
+ /**
+ * 性别
+ */
+ @TableField("SEX")
+ private String sex;
+ /**
+ * 所属部门
+ */
+ @TableField("DEPTID")
+ private Long deptid;
+ /**
+ * 身份证号
+ */
+ @TableField("ID_CARD")
+ private String idCard;
+ /**
+ * 备注信息
+ */
+ @TableField("REMARKS")
+ private String remarks;
+ /**
+ * 人员类型
+ */
+ @TableField("PERSON_TYPE")
+ private String personType;
+
+
+ public Long getId() {
+ return id;
+ }
+
+ public void setId(Long id) {
+ this.id = id;
+ }
+
+ public String getDelflag() {
+ return delflag;
+ }
+
+ public void setDelflag(String delflag) {
+ this.delflag = delflag;
+ }
+
+ public Date getCreatetime() {
+ return createtime;
+ }
+
+ public void setCreatetime(Date createtime) {
+ this.createtime = createtime;
+ }
+
+ public Date getUpdatetime() {
+ return updatetime;
+ }
+
+ public void setUpdatetime(Date updatetime) {
+ this.updatetime = updatetime;
+ }
+
+ public String getName() {
+ return name;
+ }
+
+ public void setName(String name) {
+ this.name = name;
+ }
+
+ public String getSex() {
+ return sex;
+ }
+
+ public void setSex(String sex) {
+ this.sex = sex;
+ }
+
+ public Long getDeptid() {
+ return deptid;
+ }
+
+ public void setDeptid(Long deptid) {
+ this.deptid = deptid;
+ }
+
+ public String getIdCard() {
+ return idCard;
+ }
+
+ public void setIdCard(String idCard) {
+ this.idCard = idCard;
+ }
+
+ public String getRemarks() {
+ return remarks;
+ }
+
+ public void setRemarks(String remarks) {
+ this.remarks = remarks;
+ }
+
+ public String getPersonType() {
+ return personType;
+ }
+
+ public void setPersonType(String personType) {
+ this.personType = personType;
+ }
+
+ @Override
+ protected Serializable pkVal() {
+ return this.id;
+ }
+
+ @Override
+ public String toString() {
+ return "Person{" +
+ "id=" + id +
+ ", delflag=" + delflag +
+ ", createtime=" + createtime +
+ ", updatetime=" + updatetime +
+ ", name=" + name +
+ ", sex=" + sex +
+ ", deptid=" + deptid +
+ ", idCard=" + idCard +
+ ", remarks=" + remarks +
+ ", personType=" + personType +
+ "}";
+ }
+}
diff --git a/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/service/IPersonService.java b/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/service/IPersonService.java
new file mode 100644
index 0000000..c58c236
--- /dev/null
+++ b/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/service/IPersonService.java
@@ -0,0 +1,16 @@
+package com.casic.missiles.modular.system.service;
+
+import com.casic.missiles.modular.system.model.Person;
+import com.baomidou.mybatisplus.service.IService;
+
+/**
+ *
+ * 人员数据表 服务类
+ *
+ *
+ * @author lwh123
+ * @since 2019-12-03
+ */
+public interface IPersonService extends IService {
+
+}
diff --git a/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/service/impl/PersonServiceImpl.java b/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/service/impl/PersonServiceImpl.java
new file mode 100644
index 0000000..4eb8734
--- /dev/null
+++ b/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/service/impl/PersonServiceImpl.java
@@ -0,0 +1,20 @@
+package com.casic.missiles.modular.system.service.impl;
+
+import com.casic.missiles.modular.system.model.Person;
+import com.casic.missiles.modular.system.dao.PersonMapper;
+import com.casic.missiles.modular.system.service.IPersonService;
+import com.baomidou.mybatisplus.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ *
+ * 人员数据表 服务实现类
+ *
+ *
+ * @author lwh123
+ * @since 2019-12-03
+ */
+@Service
+public class PersonServiceImpl extends ServiceImpl implements IPersonService {
+
+}
diff --git a/casic-web/pom.xml b/casic-web/pom.xml
index 64e5eae..afde795 100644
--- a/casic-web/pom.xml
+++ b/casic-web/pom.xml
@@ -76,7 +76,11 @@
casic-admin-area
${casic.version}
-
+
+ com.casic
+ casic-metadata-core
+ ${casic.version}
+
com.casic
diff --git a/casic-web/src/main/java/com/casic/missiles/CasicApplication.java b/casic-web/src/main/java/com/casic/missiles/CasicApplication.java
index e30a03e..48d4599 100644
--- a/casic-web/src/main/java/com/casic/missiles/CasicApplication.java
+++ b/casic-web/src/main/java/com/casic/missiles/CasicApplication.java
@@ -3,6 +3,7 @@
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
import org.springframework.boot.autoconfigure.SpringBootApplication;
import org.springframework.transaction.annotation.EnableTransactionManagement;
diff --git a/casic-iris-acs/pom.xml b/casic-iris-acs/pom.xml
index 58dc25b..92a10e1 100644
--- a/casic-iris-acs/pom.xml
+++ b/casic-iris-acs/pom.xml
@@ -29,6 +29,12 @@
com.casic
+ casic-metadata-core
+ ${casic.version}
+
+
+
+ com.casic
casic-export-support
1.0.0-SNAPSHOT
@@ -80,6 +86,7 @@
commons-lang3
+
diff --git a/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/controller/PersonController.java b/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/controller/PersonController.java
new file mode 100644
index 0000000..882434e
--- /dev/null
+++ b/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/controller/PersonController.java
@@ -0,0 +1,98 @@
+package com.casic.missiles.modular.system.controller;
+
+import com.baomidou.mybatisplus.mapper.EntityWrapper;
+import com.baomidou.mybatisplus.plugins.Page;
+import com.casic.missiles.core.base.controller.BaseController;
+import com.casic.missiles.core.base.response.ResponseData;
+import com.casic.missiles.core.common.constant.factory.PageFactory;
+import com.casic.missiles.modular.system.model.Person;
+import com.casic.missiles.modular.system.service.IPersonService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+/**
+ * 人员管理控制器
+ *
+ * @author dev
+ * @Date 2019-12-03 17:45:18
+ */
+@RestController
+@RequestMapping("/person")
+public class PersonController extends BaseController {
+
+
+ @Autowired
+ private IPersonService personService;
+
+
+ /**
+ * 获取人员管理列表
+ */
+ @RequestMapping(value = "/list")
+ @ResponseBody
+ public Object list(String condition) {
+ return personService.selectList(null);
+ }
+
+ /**
+ * 获取人员管理分页列表
+ */
+ @RequestMapping(value = "/listPage")
+ @ResponseBody
+ public Object listPage(String condition) {
+ Page page = new PageFactory().defaultPage();
+ EntityWrapper query = new EntityWrapper<>();
+ page = personService.selectPage(page,query);
+ return super.packForBT(page);
+ }
+ /**
+ * 新增人员管理
+ */
+ @RequestMapping(value = "/add")
+ @ResponseBody
+ public Object add(Person person) {
+ personService.insert(person);
+ return ResponseData.success();
+ }
+
+ /**
+ * 删除人员管理
+ */
+ @RequestMapping(value = "/delete")
+ @ResponseBody
+ public Object delete(@RequestParam String personId) {
+ personService.deleteById(personId);
+ return ResponseData.success();
+ }
+
+ /**
+ * 批量删除
+ */
+ @RequestMapping(value = "/batchDelete")
+ @ResponseBody
+ public Object delete(@RequestParam("personIds") List personIds) {
+ personService.deleteBatchIds(personIds);
+ return ResponseData.success();
+ }
+
+ /**
+ * 修改人员管理
+ */
+ @RequestMapping(value = "/update")
+ @ResponseBody
+ public Object update(Person person) {
+ personService.updateById(person);
+ return ResponseData.success();
+ }
+
+ /**
+ * 人员管理详情
+ */
+ @RequestMapping(value = "/detail/{personId}")
+ @ResponseBody
+ public Object detail(@PathVariable("personId") String personId) {
+ return ResponseData.success(personService.selectById(personId));
+ }
+}
diff --git a/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/dao/PersonMapper.java b/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/dao/PersonMapper.java
new file mode 100644
index 0000000..c2a324b
--- /dev/null
+++ b/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/dao/PersonMapper.java
@@ -0,0 +1,16 @@
+package com.casic.missiles.modular.system.dao;
+
+import com.casic.missiles.modular.system.model.Person;
+import com.baomidou.mybatisplus.mapper.BaseMapper;
+
+/**
+ *
+ * 人员数据表 Mapper 接口
+ *
+ *
+ * @author lwh123
+ * @since 2019-12-03
+ */
+public interface PersonMapper extends BaseMapper {
+
+}
diff --git a/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/dao/mapping/PersonMapper.xml b/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/dao/mapping/PersonMapper.xml
new file mode 100644
index 0000000..f556815
--- /dev/null
+++ b/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/dao/mapping/PersonMapper.xml
@@ -0,0 +1,24 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ ID AS id, DELFLAG AS delflag, CREATETIME AS createtime, UPDATETIME AS updatetime, NAME AS name, SEX AS sex, DEPTID AS deptid, ID_CARD AS idCard, REMARKS AS remarks, PERSON_TYPE AS personType
+
+
+
diff --git a/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/model/Person.java b/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/model/Person.java
new file mode 100644
index 0000000..4a8d915
--- /dev/null
+++ b/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/model/Person.java
@@ -0,0 +1,176 @@
+package com.casic.missiles.modular.system.model;
+
+import java.io.Serializable;
+
+import java.util.Date;
+import com.baomidou.mybatisplus.annotations.TableId;
+import com.baomidou.mybatisplus.annotations.TableField;
+import com.baomidou.mybatisplus.activerecord.Model;
+import com.baomidou.mybatisplus.annotations.TableName;
+import com.casic.missiles.modular.metadata.base.DataMetaModel;
+
+import java.io.Serializable;
+
+/**
+ *
+ * 人员数据表
+ *
+ *
+ * @author lwh123
+ * @since 2019-12-03
+ */
+@TableName("sys_person")
+public class Person extends DataMetaModel {
+
+ private static final long serialVersionUID = 1L;
+
+ @TableId("ID")
+ private Long id;
+ /**
+ * 状态(0：有效 1：删除）
+ */
+ @TableField("DELFLAG")
+ private String delflag;
+ /**
+ * 创建时间
+ */
+ @TableField("CREATETIME")
+ private Date createtime;
+ /**
+ * 修改时间
+ */
+ @TableField("UPDATETIME")
+ private Date updatetime;
+ /**
+ * 姓名
+ */
+ @TableField("NAME")
+ private String name;
+ /**
+ * 性别
+ */
+ @TableField("SEX")
+ private String sex;
+ /**
+ * 所属部门
+ */
+ @TableField("DEPTID")
+ private Long deptid;
+ /**
+ * 身份证号
+ */
+ @TableField("ID_CARD")
+ private String idCard;
+ /**
+ * 备注信息
+ */
+ @TableField("REMARKS")
+ private String remarks;
+ /**
+ * 人员类型
+ */
+ @TableField("PERSON_TYPE")
+ private String personType;
+
+
+ public Long getId() {
+ return id;
+ }
+
+ public void setId(Long id) {
+ this.id = id;
+ }
+
+ public String getDelflag() {
+ return delflag;
+ }
+
+ public void setDelflag(String delflag) {
+ this.delflag = delflag;
+ }
+
+ public Date getCreatetime() {
+ return createtime;
+ }
+
+ public void setCreatetime(Date createtime) {
+ this.createtime = createtime;
+ }
+
+ public Date getUpdatetime() {
+ return updatetime;
+ }
+
+ public void setUpdatetime(Date updatetime) {
+ this.updatetime = updatetime;
+ }
+
+ public String getName() {
+ return name;
+ }
+
+ public void setName(String name) {
+ this.name = name;
+ }
+
+ public String getSex() {
+ return sex;
+ }
+
+ public void setSex(String sex) {
+ this.sex = sex;
+ }
+
+ public Long getDeptid() {
+ return deptid;
+ }
+
+ public void setDeptid(Long deptid) {
+ this.deptid = deptid;
+ }
+
+ public String getIdCard() {
+ return idCard;
+ }
+
+ public void setIdCard(String idCard) {
+ this.idCard = idCard;
+ }
+
+ public String getRemarks() {
+ return remarks;
+ }
+
+ public void setRemarks(String remarks) {
+ this.remarks = remarks;
+ }
+
+ public String getPersonType() {
+ return personType;
+ }
+
+ public void setPersonType(String personType) {
+ this.personType = personType;
+ }
+
+ @Override
+ protected Serializable pkVal() {
+ return this.id;
+ }
+
+ @Override
+ public String toString() {
+ return "Person{" +
+ "id=" + id +
+ ", delflag=" + delflag +
+ ", createtime=" + createtime +
+ ", updatetime=" + updatetime +
+ ", name=" + name +
+ ", sex=" + sex +
+ ", deptid=" + deptid +
+ ", idCard=" + idCard +
+ ", remarks=" + remarks +
+ ", personType=" + personType +
+ "}";
+ }
+}
diff --git a/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/service/IPersonService.java b/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/service/IPersonService.java
new file mode 100644
index 0000000..c58c236
--- /dev/null
+++ b/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/service/IPersonService.java
@@ -0,0 +1,16 @@
+package com.casic.missiles.modular.system.service;
+
+import com.casic.missiles.modular.system.model.Person;
+import com.baomidou.mybatisplus.service.IService;
+
+/**
+ *
+ * 人员数据表 服务类
+ *
+ *
+ * @author lwh123
+ * @since 2019-12-03
+ */
+public interface IPersonService extends IService {
+
+}
diff --git a/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/service/impl/PersonServiceImpl.java b/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/service/impl/PersonServiceImpl.java
new file mode 100644
index 0000000..4eb8734
--- /dev/null
+++ b/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/service/impl/PersonServiceImpl.java
@@ -0,0 +1,20 @@
+package com.casic.missiles.modular.system.service.impl;
+
+import com.casic.missiles.modular.system.model.Person;
+import com.casic.missiles.modular.system.dao.PersonMapper;
+import com.casic.missiles.modular.system.service.IPersonService;
+import com.baomidou.mybatisplus.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ *
+ * 人员数据表 服务实现类
+ *
+ *
+ * @author lwh123
+ * @since 2019-12-03
+ */
+@Service
+public class PersonServiceImpl extends ServiceImpl implements IPersonService {
+
+}
diff --git a/casic-web/pom.xml b/casic-web/pom.xml
index 64e5eae..afde795 100644
--- a/casic-web/pom.xml
+++ b/casic-web/pom.xml
@@ -76,7 +76,11 @@
casic-admin-area
${casic.version}
-
+
+ com.casic
+ casic-metadata-core
+ ${casic.version}
+
com.casic
diff --git a/casic-web/src/main/java/com/casic/missiles/CasicApplication.java b/casic-web/src/main/java/com/casic/missiles/CasicApplication.java
index e30a03e..48d4599 100644
--- a/casic-web/src/main/java/com/casic/missiles/CasicApplication.java
+++ b/casic-web/src/main/java/com/casic/missiles/CasicApplication.java
@@ -3,6 +3,7 @@
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
import org.springframework.boot.autoconfigure.SpringBootApplication;
import org.springframework.transaction.annotation.EnableTransactionManagement;
diff --git a/casic-web/src/main/java/com/casic/missiles/controller/TableTestController.java b/casic-web/src/main/java/com/casic/missiles/controller/TableTestController.java
new file mode 100644
index 0000000..274647f
--- /dev/null
+++ b/casic-web/src/main/java/com/casic/missiles/controller/TableTestController.java
@@ -0,0 +1,44 @@
+package com.casic.missiles.controller;
+
+import com.casic.missiles.core.base.controller.BaseController;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.RequestMapping;
+
+/**
+ * 仅为mock登录使用
+ */
+@Controller
+@RequestMapping("/test")
+public class TableTestController extends BaseController {
+ /* private static final Logger logger = LoggerFactory.getLogger(TableTestController.class);
+
+ @Autowired
+ private IMetadataCommonService metadataCommonService;
+
+ *//**
+ * 获取mockToken
+ *//*
+ @PostMapping("/add")
+ @ResponseBody
+ public Object add(@RequestParam Map map) {
+ map.put("id", IdWorker.getId());
+ map.put("targetId", 123L);
+ metadataCommonService.insertMetaData("SysPersonExt", map);
+ return ResponseData.success();
+ }
+
+
+ @PostMapping("/update")
+ @ResponseBody
+ public Object update(@RequestParam Map map) {
+ metadataCommonService.updateMetaData("SysPersonExt", map);
+ return ResponseData.success();
+ }
+
+ @PostMapping("/detail")
+ @ResponseBody
+ public Object detail(Long id) {
+ return ResponseData.success(metadataCommonService.selectOneMetaData("SysPersonExt", id));
+ }*/
+
+}
diff --git a/casic-iris-acs/pom.xml b/casic-iris-acs/pom.xml
index 58dc25b..92a10e1 100644
--- a/casic-iris-acs/pom.xml
+++ b/casic-iris-acs/pom.xml
@@ -29,6 +29,12 @@
com.casic
+ casic-metadata-core
+ ${casic.version}
+
+
+
+ com.casic
casic-export-support
1.0.0-SNAPSHOT
@@ -80,6 +86,7 @@
commons-lang3
+
diff --git a/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/controller/PersonController.java b/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/controller/PersonController.java
new file mode 100644
index 0000000..882434e
--- /dev/null
+++ b/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/controller/PersonController.java
@@ -0,0 +1,98 @@
+package com.casic.missiles.modular.system.controller;
+
+import com.baomidou.mybatisplus.mapper.EntityWrapper;
+import com.baomidou.mybatisplus.plugins.Page;
+import com.casic.missiles.core.base.controller.BaseController;
+import com.casic.missiles.core.base.response.ResponseData;
+import com.casic.missiles.core.common.constant.factory.PageFactory;
+import com.casic.missiles.modular.system.model.Person;
+import com.casic.missiles.modular.system.service.IPersonService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+/**
+ * 人员管理控制器
+ *
+ * @author dev
+ * @Date 2019-12-03 17:45:18
+ */
+@RestController
+@RequestMapping("/person")
+public class PersonController extends BaseController {
+
+
+ @Autowired
+ private IPersonService personService;
+
+
+ /**
+ * 获取人员管理列表
+ */
+ @RequestMapping(value = "/list")
+ @ResponseBody
+ public Object list(String condition) {
+ return personService.selectList(null);
+ }
+
+ /**
+ * 获取人员管理分页列表
+ */
+ @RequestMapping(value = "/listPage")
+ @ResponseBody
+ public Object listPage(String condition) {
+ Page page = new PageFactory().defaultPage();
+ EntityWrapper query = new EntityWrapper<>();
+ page = personService.selectPage(page,query);
+ return super.packForBT(page);
+ }
+ /**
+ * 新增人员管理
+ */
+ @RequestMapping(value = "/add")
+ @ResponseBody
+ public Object add(Person person) {
+ personService.insert(person);
+ return ResponseData.success();
+ }
+
+ /**
+ * 删除人员管理
+ */
+ @RequestMapping(value = "/delete")
+ @ResponseBody
+ public Object delete(@RequestParam String personId) {
+ personService.deleteById(personId);
+ return ResponseData.success();
+ }
+
+ /**
+ * 批量删除
+ */
+ @RequestMapping(value = "/batchDelete")
+ @ResponseBody
+ public Object delete(@RequestParam("personIds") List personIds) {
+ personService.deleteBatchIds(personIds);
+ return ResponseData.success();
+ }
+
+ /**
+ * 修改人员管理
+ */
+ @RequestMapping(value = "/update")
+ @ResponseBody
+ public Object update(Person person) {
+ personService.updateById(person);
+ return ResponseData.success();
+ }
+
+ /**
+ * 人员管理详情
+ */
+ @RequestMapping(value = "/detail/{personId}")
+ @ResponseBody
+ public Object detail(@PathVariable("personId") String personId) {
+ return ResponseData.success(personService.selectById(personId));
+ }
+}
diff --git a/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/dao/PersonMapper.java b/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/dao/PersonMapper.java
new file mode 100644
index 0000000..c2a324b
--- /dev/null
+++ b/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/dao/PersonMapper.java
@@ -0,0 +1,16 @@
+package com.casic.missiles.modular.system.dao;
+
+import com.casic.missiles.modular.system.model.Person;
+import com.baomidou.mybatisplus.mapper.BaseMapper;
+
+/**
+ *
+ * 人员数据表 Mapper 接口
+ *
+ *
+ * @author lwh123
+ * @since 2019-12-03
+ */
+public interface PersonMapper extends BaseMapper {
+
+}
diff --git a/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/dao/mapping/PersonMapper.xml b/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/dao/mapping/PersonMapper.xml
new file mode 100644
index 0000000..f556815
--- /dev/null
+++ b/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/dao/mapping/PersonMapper.xml
@@ -0,0 +1,24 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ ID AS id, DELFLAG AS delflag, CREATETIME AS createtime, UPDATETIME AS updatetime, NAME AS name, SEX AS sex, DEPTID AS deptid, ID_CARD AS idCard, REMARKS AS remarks, PERSON_TYPE AS personType
+
+
+
diff --git a/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/model/Person.java b/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/model/Person.java
new file mode 100644
index 0000000..4a8d915
--- /dev/null
+++ b/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/model/Person.java
@@ -0,0 +1,176 @@
+package com.casic.missiles.modular.system.model;
+
+import java.io.Serializable;
+
+import java.util.Date;
+import com.baomidou.mybatisplus.annotations.TableId;
+import com.baomidou.mybatisplus.annotations.TableField;
+import com.baomidou.mybatisplus.activerecord.Model;
+import com.baomidou.mybatisplus.annotations.TableName;
+import com.casic.missiles.modular.metadata.base.DataMetaModel;
+
+import java.io.Serializable;
+
+/**
+ *
+ * 人员数据表
+ *
+ *
+ * @author lwh123
+ * @since 2019-12-03
+ */
+@TableName("sys_person")
+public class Person extends DataMetaModel {
+
+ private static final long serialVersionUID = 1L;
+
+ @TableId("ID")
+ private Long id;
+ /**
+ * 状态(0：有效 1：删除）
+ */
+ @TableField("DELFLAG")
+ private String delflag;
+ /**
+ * 创建时间
+ */
+ @TableField("CREATETIME")
+ private Date createtime;
+ /**
+ * 修改时间
+ */
+ @TableField("UPDATETIME")
+ private Date updatetime;
+ /**
+ * 姓名
+ */
+ @TableField("NAME")
+ private String name;
+ /**
+ * 性别
+ */
+ @TableField("SEX")
+ private String sex;
+ /**
+ * 所属部门
+ */
+ @TableField("DEPTID")
+ private Long deptid;
+ /**
+ * 身份证号
+ */
+ @TableField("ID_CARD")
+ private String idCard;
+ /**
+ * 备注信息
+ */
+ @TableField("REMARKS")
+ private String remarks;
+ /**
+ * 人员类型
+ */
+ @TableField("PERSON_TYPE")
+ private String personType;
+
+
+ public Long getId() {
+ return id;
+ }
+
+ public void setId(Long id) {
+ this.id = id;
+ }
+
+ public String getDelflag() {
+ return delflag;
+ }
+
+ public void setDelflag(String delflag) {
+ this.delflag = delflag;
+ }
+
+ public Date getCreatetime() {
+ return createtime;
+ }
+
+ public void setCreatetime(Date createtime) {
+ this.createtime = createtime;
+ }
+
+ public Date getUpdatetime() {
+ return updatetime;
+ }
+
+ public void setUpdatetime(Date updatetime) {
+ this.updatetime = updatetime;
+ }
+
+ public String getName() {
+ return name;
+ }
+
+ public void setName(String name) {
+ this.name = name;
+ }
+
+ public String getSex() {
+ return sex;
+ }
+
+ public void setSex(String sex) {
+ this.sex = sex;
+ }
+
+ public Long getDeptid() {
+ return deptid;
+ }
+
+ public void setDeptid(Long deptid) {
+ this.deptid = deptid;
+ }
+
+ public String getIdCard() {
+ return idCard;
+ }
+
+ public void setIdCard(String idCard) {
+ this.idCard = idCard;
+ }
+
+ public String getRemarks() {
+ return remarks;
+ }
+
+ public void setRemarks(String remarks) {
+ this.remarks = remarks;
+ }
+
+ public String getPersonType() {
+ return personType;
+ }
+
+ public void setPersonType(String personType) {
+ this.personType = personType;
+ }
+
+ @Override
+ protected Serializable pkVal() {
+ return this.id;
+ }
+
+ @Override
+ public String toString() {
+ return "Person{" +
+ "id=" + id +
+ ", delflag=" + delflag +
+ ", createtime=" + createtime +
+ ", updatetime=" + updatetime +
+ ", name=" + name +
+ ", sex=" + sex +
+ ", deptid=" + deptid +
+ ", idCard=" + idCard +
+ ", remarks=" + remarks +
+ ", personType=" + personType +
+ "}";
+ }
+}
diff --git a/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/service/IPersonService.java b/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/service/IPersonService.java
new file mode 100644
index 0000000..c58c236
--- /dev/null
+++ b/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/service/IPersonService.java
@@ -0,0 +1,16 @@
+package com.casic.missiles.modular.system.service;
+
+import com.casic.missiles.modular.system.model.Person;
+import com.baomidou.mybatisplus.service.IService;
+
+/**
+ *
+ * 人员数据表 服务类
+ *
+ *
+ * @author lwh123
+ * @since 2019-12-03
+ */
+public interface IPersonService extends IService {
+
+}
diff --git a/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/service/impl/PersonServiceImpl.java b/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/service/impl/PersonServiceImpl.java
new file mode 100644
index 0000000..4eb8734
--- /dev/null
+++ b/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/service/impl/PersonServiceImpl.java
@@ -0,0 +1,20 @@
+package com.casic.missiles.modular.system.service.impl;
+
+import com.casic.missiles.modular.system.model.Person;
+import com.casic.missiles.modular.system.dao.PersonMapper;
+import com.casic.missiles.modular.system.service.IPersonService;
+import com.baomidou.mybatisplus.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ *
+ * 人员数据表 服务实现类
+ *
+ *
+ * @author lwh123
+ * @since 2019-12-03
+ */
+@Service
+public class PersonServiceImpl extends ServiceImpl implements IPersonService {
+
+}
diff --git a/casic-web/pom.xml b/casic-web/pom.xml
index 64e5eae..afde795 100644
--- a/casic-web/pom.xml
+++ b/casic-web/pom.xml
@@ -76,7 +76,11 @@
casic-admin-area
${casic.version}
-
+
+ com.casic
+ casic-metadata-core
+ ${casic.version}
+
com.casic
diff --git a/casic-web/src/main/java/com/casic/missiles/CasicApplication.java b/casic-web/src/main/java/com/casic/missiles/CasicApplication.java
index e30a03e..48d4599 100644
--- a/casic-web/src/main/java/com/casic/missiles/CasicApplication.java
+++ b/casic-web/src/main/java/com/casic/missiles/CasicApplication.java
@@ -3,6 +3,7 @@
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
import org.springframework.boot.autoconfigure.SpringBootApplication;
import org.springframework.transaction.annotation.EnableTransactionManagement;
diff --git a/casic-web/src/main/java/com/casic/missiles/controller/TableTestController.java b/casic-web/src/main/java/com/casic/missiles/controller/TableTestController.java
new file mode 100644
index 0000000..274647f
--- /dev/null
+++ b/casic-web/src/main/java/com/casic/missiles/controller/TableTestController.java
@@ -0,0 +1,44 @@
+package com.casic.missiles.controller;
+
+import com.casic.missiles.core.base.controller.BaseController;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.RequestMapping;
+
+/**
+ * 仅为mock登录使用
+ */
+@Controller
+@RequestMapping("/test")
+public class TableTestController extends BaseController {
+ /* private static final Logger logger = LoggerFactory.getLogger(TableTestController.class);
+
+ @Autowired
+ private IMetadataCommonService metadataCommonService;
+
+ *//**
+ * 获取mockToken
+ *//*
+ @PostMapping("/add")
+ @ResponseBody
+ public Object add(@RequestParam Map map) {
+ map.put("id", IdWorker.getId());
+ map.put("targetId", 123L);
+ metadataCommonService.insertMetaData("SysPersonExt", map);
+ return ResponseData.success();
+ }
+
+
+ @PostMapping("/update")
+ @ResponseBody
+ public Object update(@RequestParam Map map) {
+ metadataCommonService.updateMetaData("SysPersonExt", map);
+ return ResponseData.success();
+ }
+
+ @PostMapping("/detail")
+ @ResponseBody
+ public Object detail(Long id) {
+ return ResponseData.success(metadataCommonService.selectOneMetaData("SysPersonExt", id));
+ }*/
+
+}
diff --git a/casic-web/src/main/resources/application.yml b/casic-web/src/main/resources/application.yml
index 70cc33b..dd644ca 100644
--- a/casic-web/src/main/resources/application.yml
+++ b/casic-web/src/main/resources/application.yml
@@ -15,4 +15,7 @@
casic:
kaptcha-open: true #是否开启登录时验证码 (true/false)
file-upload-path: d:/tmp #文件上传目录(不配置的话为java.io.tmpdir目录)
- nologin-urls: /user/login,/kaptcha,/config/baseConfig
\ No newline at end of file
+ nologin-urls: /user/login,/kaptcha,/config/baseConfig
+mybatis-plus:
+ global-config:
+ sql-injector: com.casic.missiles.modular.metadata.inject.MetaSqlInject
\ No newline at end of file
diff --git a/casic-iris-acs/pom.xml b/casic-iris-acs/pom.xml
index 58dc25b..92a10e1 100644
--- a/casic-iris-acs/pom.xml
+++ b/casic-iris-acs/pom.xml
@@ -29,6 +29,12 @@
com.casic
+ casic-metadata-core
+ ${casic.version}
+
+
+
+ com.casic
casic-export-support
1.0.0-SNAPSHOT
@@ -80,6 +86,7 @@
commons-lang3
+
diff --git a/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/controller/PersonController.java b/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/controller/PersonController.java
new file mode 100644
index 0000000..882434e
--- /dev/null
+++ b/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/controller/PersonController.java
@@ -0,0 +1,98 @@
+package com.casic.missiles.modular.system.controller;
+
+import com.baomidou.mybatisplus.mapper.EntityWrapper;
+import com.baomidou.mybatisplus.plugins.Page;
+import com.casic.missiles.core.base.controller.BaseController;
+import com.casic.missiles.core.base.response.ResponseData;
+import com.casic.missiles.core.common.constant.factory.PageFactory;
+import com.casic.missiles.modular.system.model.Person;
+import com.casic.missiles.modular.system.service.IPersonService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+/**
+ * 人员管理控制器
+ *
+ * @author dev
+ * @Date 2019-12-03 17:45:18
+ */
+@RestController
+@RequestMapping("/person")
+public class PersonController extends BaseController {
+
+
+ @Autowired
+ private IPersonService personService;
+
+
+ /**
+ * 获取人员管理列表
+ */
+ @RequestMapping(value = "/list")
+ @ResponseBody
+ public Object list(String condition) {
+ return personService.selectList(null);
+ }
+
+ /**
+ * 获取人员管理分页列表
+ */
+ @RequestMapping(value = "/listPage")
+ @ResponseBody
+ public Object listPage(String condition) {
+ Page page = new PageFactory().defaultPage();
+ EntityWrapper query = new EntityWrapper<>();
+ page = personService.selectPage(page,query);
+ return super.packForBT(page);
+ }
+ /**
+ * 新增人员管理
+ */
+ @RequestMapping(value = "/add")
+ @ResponseBody
+ public Object add(Person person) {
+ personService.insert(person);
+ return ResponseData.success();
+ }
+
+ /**
+ * 删除人员管理
+ */
+ @RequestMapping(value = "/delete")
+ @ResponseBody
+ public Object delete(@RequestParam String personId) {
+ personService.deleteById(personId);
+ return ResponseData.success();
+ }
+
+ /**
+ * 批量删除
+ */
+ @RequestMapping(value = "/batchDelete")
+ @ResponseBody
+ public Object delete(@RequestParam("personIds") List personIds) {
+ personService.deleteBatchIds(personIds);
+ return ResponseData.success();
+ }
+
+ /**
+ * 修改人员管理
+ */
+ @RequestMapping(value = "/update")
+ @ResponseBody
+ public Object update(Person person) {
+ personService.updateById(person);
+ return ResponseData.success();
+ }
+
+ /**
+ * 人员管理详情
+ */
+ @RequestMapping(value = "/detail/{personId}")
+ @ResponseBody
+ public Object detail(@PathVariable("personId") String personId) {
+ return ResponseData.success(personService.selectById(personId));
+ }
+}
diff --git a/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/dao/PersonMapper.java b/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/dao/PersonMapper.java
new file mode 100644
index 0000000..c2a324b
--- /dev/null
+++ b/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/dao/PersonMapper.java
@@ -0,0 +1,16 @@
+package com.casic.missiles.modular.system.dao;
+
+import com.casic.missiles.modular.system.model.Person;
+import com.baomidou.mybatisplus.mapper.BaseMapper;
+
+/**
+ *
+ * 人员数据表 Mapper 接口
+ *
+ *
+ * @author lwh123
+ * @since 2019-12-03
+ */
+public interface PersonMapper extends BaseMapper {
+
+}
diff --git a/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/dao/mapping/PersonMapper.xml b/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/dao/mapping/PersonMapper.xml
new file mode 100644
index 0000000..f556815
--- /dev/null
+++ b/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/dao/mapping/PersonMapper.xml
@@ -0,0 +1,24 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ ID AS id, DELFLAG AS delflag, CREATETIME AS createtime, UPDATETIME AS updatetime, NAME AS name, SEX AS sex, DEPTID AS deptid, ID_CARD AS idCard, REMARKS AS remarks, PERSON_TYPE AS personType
+
+
+
diff --git a/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/model/Person.java b/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/model/Person.java
new file mode 100644
index 0000000..4a8d915
--- /dev/null
+++ b/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/model/Person.java
@@ -0,0 +1,176 @@
+package com.casic.missiles.modular.system.model;
+
+import java.io.Serializable;
+
+import java.util.Date;
+import com.baomidou.mybatisplus.annotations.TableId;
+import com.baomidou.mybatisplus.annotations.TableField;
+import com.baomidou.mybatisplus.activerecord.Model;
+import com.baomidou.mybatisplus.annotations.TableName;
+import com.casic.missiles.modular.metadata.base.DataMetaModel;
+
+import java.io.Serializable;
+
+/**
+ *
+ * 人员数据表
+ *
+ *
+ * @author lwh123
+ * @since 2019-12-03
+ */
+@TableName("sys_person")
+public class Person extends DataMetaModel {
+
+ private static final long serialVersionUID = 1L;
+
+ @TableId("ID")
+ private Long id;
+ /**
+ * 状态(0：有效 1：删除）
+ */
+ @TableField("DELFLAG")
+ private String delflag;
+ /**
+ * 创建时间
+ */
+ @TableField("CREATETIME")
+ private Date createtime;
+ /**
+ * 修改时间
+ */
+ @TableField("UPDATETIME")
+ private Date updatetime;
+ /**
+ * 姓名
+ */
+ @TableField("NAME")
+ private String name;
+ /**
+ * 性别
+ */
+ @TableField("SEX")
+ private String sex;
+ /**
+ * 所属部门
+ */
+ @TableField("DEPTID")
+ private Long deptid;
+ /**
+ * 身份证号
+ */
+ @TableField("ID_CARD")
+ private String idCard;
+ /**
+ * 备注信息
+ */
+ @TableField("REMARKS")
+ private String remarks;
+ /**
+ * 人员类型
+ */
+ @TableField("PERSON_TYPE")
+ private String personType;
+
+
+ public Long getId() {
+ return id;
+ }
+
+ public void setId(Long id) {
+ this.id = id;
+ }
+
+ public String getDelflag() {
+ return delflag;
+ }
+
+ public void setDelflag(String delflag) {
+ this.delflag = delflag;
+ }
+
+ public Date getCreatetime() {
+ return createtime;
+ }
+
+ public void setCreatetime(Date createtime) {
+ this.createtime = createtime;
+ }
+
+ public Date getUpdatetime() {
+ return updatetime;
+ }
+
+ public void setUpdatetime(Date updatetime) {
+ this.updatetime = updatetime;
+ }
+
+ public String getName() {
+ return name;
+ }
+
+ public void setName(String name) {
+ this.name = name;
+ }
+
+ public String getSex() {
+ return sex;
+ }
+
+ public void setSex(String sex) {
+ this.sex = sex;
+ }
+
+ public Long getDeptid() {
+ return deptid;
+ }
+
+ public void setDeptid(Long deptid) {
+ this.deptid = deptid;
+ }
+
+ public String getIdCard() {
+ return idCard;
+ }
+
+ public void setIdCard(String idCard) {
+ this.idCard = idCard;
+ }
+
+ public String getRemarks() {
+ return remarks;
+ }
+
+ public void setRemarks(String remarks) {
+ this.remarks = remarks;
+ }
+
+ public String getPersonType() {
+ return personType;
+ }
+
+ public void setPersonType(String personType) {
+ this.personType = personType;
+ }
+
+ @Override
+ protected Serializable pkVal() {
+ return this.id;
+ }
+
+ @Override
+ public String toString() {
+ return "Person{" +
+ "id=" + id +
+ ", delflag=" + delflag +
+ ", createtime=" + createtime +
+ ", updatetime=" + updatetime +
+ ", name=" + name +
+ ", sex=" + sex +
+ ", deptid=" + deptid +
+ ", idCard=" + idCard +
+ ", remarks=" + remarks +
+ ", personType=" + personType +
+ "}";
+ }
+}
diff --git a/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/service/IPersonService.java b/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/service/IPersonService.java
new file mode 100644
index 0000000..c58c236
--- /dev/null
+++ b/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/service/IPersonService.java
@@ -0,0 +1,16 @@
+package com.casic.missiles.modular.system.service;
+
+import com.casic.missiles.modular.system.model.Person;
+import com.baomidou.mybatisplus.service.IService;
+
+/**
+ *
+ * 人员数据表 服务类
+ *
+ *
+ * @author lwh123
+ * @since 2019-12-03
+ */
+public interface IPersonService extends IService {
+
+}
diff --git a/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/service/impl/PersonServiceImpl.java b/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/service/impl/PersonServiceImpl.java
new file mode 100644
index 0000000..4eb8734
--- /dev/null
+++ b/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/service/impl/PersonServiceImpl.java
@@ -0,0 +1,20 @@
+package com.casic.missiles.modular.system.service.impl;
+
+import com.casic.missiles.modular.system.model.Person;
+import com.casic.missiles.modular.system.dao.PersonMapper;
+import com.casic.missiles.modular.system.service.IPersonService;
+import com.baomidou.mybatisplus.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ *
+ * 人员数据表 服务实现类
+ *
+ *
+ * @author lwh123
+ * @since 2019-12-03
+ */
+@Service
+public class PersonServiceImpl extends ServiceImpl implements IPersonService {
+
+}
diff --git a/casic-web/pom.xml b/casic-web/pom.xml
index 64e5eae..afde795 100644
--- a/casic-web/pom.xml
+++ b/casic-web/pom.xml
@@ -76,7 +76,11 @@
casic-admin-area
${casic.version}
-
+
+ com.casic
+ casic-metadata-core
+ ${casic.version}
+
com.casic
diff --git a/casic-web/src/main/java/com/casic/missiles/CasicApplication.java b/casic-web/src/main/java/com/casic/missiles/CasicApplication.java
index e30a03e..48d4599 100644
--- a/casic-web/src/main/java/com/casic/missiles/CasicApplication.java
+++ b/casic-web/src/main/java/com/casic/missiles/CasicApplication.java
@@ -3,6 +3,7 @@
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
import org.springframework.boot.autoconfigure.SpringBootApplication;
import org.springframework.transaction.annotation.EnableTransactionManagement;
diff --git a/casic-web/src/main/java/com/casic/missiles/controller/TableTestController.java b/casic-web/src/main/java/com/casic/missiles/controller/TableTestController.java
new file mode 100644
index 0000000..274647f
--- /dev/null
+++ b/casic-web/src/main/java/com/casic/missiles/controller/TableTestController.java
@@ -0,0 +1,44 @@
+package com.casic.missiles.controller;
+
+import com.casic.missiles.core.base.controller.BaseController;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.RequestMapping;
+
+/**
+ * 仅为mock登录使用
+ */
+@Controller
+@RequestMapping("/test")
+public class TableTestController extends BaseController {
+ /* private static final Logger logger = LoggerFactory.getLogger(TableTestController.class);
+
+ @Autowired
+ private IMetadataCommonService metadataCommonService;
+
+ *//**
+ * 获取mockToken
+ *//*
+ @PostMapping("/add")
+ @ResponseBody
+ public Object add(@RequestParam Map map) {
+ map.put("id", IdWorker.getId());
+ map.put("targetId", 123L);
+ metadataCommonService.insertMetaData("SysPersonExt", map);
+ return ResponseData.success();
+ }
+
+
+ @PostMapping("/update")
+ @ResponseBody
+ public Object update(@RequestParam Map map) {
+ metadataCommonService.updateMetaData("SysPersonExt", map);
+ return ResponseData.success();
+ }
+
+ @PostMapping("/detail")
+ @ResponseBody
+ public Object detail(Long id) {
+ return ResponseData.success(metadataCommonService.selectOneMetaData("SysPersonExt", id));
+ }*/
+
+}
diff --git a/casic-web/src/main/resources/application.yml b/casic-web/src/main/resources/application.yml
index 70cc33b..dd644ca 100644
--- a/casic-web/src/main/resources/application.yml
+++ b/casic-web/src/main/resources/application.yml
@@ -15,4 +15,7 @@
casic:
kaptcha-open: true #是否开启登录时验证码 (true/false)
file-upload-path: d:/tmp #文件上传目录(不配置的话为java.io.tmpdir目录)
- nologin-urls: /user/login,/kaptcha,/config/baseConfig
\ No newline at end of file
+ nologin-urls: /user/login,/kaptcha,/config/baseConfig
+mybatis-plus:
+ global-config:
+ sql-injector: com.casic.missiles.modular.metadata.inject.MetaSqlInject
\ No newline at end of file
diff --git a/casic-web/src/main/resources/config/application-test.yml b/casic-web/src/main/resources/config/application-test.yml
index 2c78b0c..046e7bb 100644
--- a/casic-web/src/main/resources/config/application-test.yml
+++ b/casic-web/src/main/resources/config/application-test.yml
@@ -1,9 +1,9 @@
server:
- port: 8093
+ port: 8094
################### spring配置 ###################
spring:
datasource:
- url: jdbc:mysql://192.168.0.212:3306/casic_iris?autoReconnect=true&useUnicode=true&characterEncoding=utf8&useSSL=false&allowMultiQueries=true&zeroDateTimeBehavior=convertToNull
+ url: jdbc:mysql://192.168.8.225:3306/casic_iris?autoReconnect=true&useUnicode=true&characterEncoding=utf8&useSSL=false&allowMultiQueries=true&zeroDateTimeBehavior=convertToNull
username: root
password: root
initial-size: 2