Skip to content

S
sample-form-platform
Commit 7b2c98e6 authored by 赵啸非's avatar 赵啸非
Browse files
Options

添加样表设备列表

parent d929f9e6
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 345 additions and 1147 deletions
doc/api.md
View file @ 7b2c98e6
......@@ -2574,6 +2574,8 @@ dict|object|字典对象
:---|:---|:---|:------
page|Integer|否|当前页
size|Integer|否|每页条数，值为-1，查询所有记录
deviceId|Long|否|设备id
deviceCode|String|否|设备编码
**请求样例:**
```
......@@ -2596,25 +2598,19 @@ data|object|数据对象
 current_page|Integer|当前页
 data|array|结果集列表|数组
  id|Long|主键，自增长
  siteId|Long|站点ID
  deviceId|Long|设备id
  deviceCode|String|设备编码
  deviceName|String|设备名称
  matterId|Long|事项id
  matterCode|String|事项编码
  matterName|String|事项名称
  siteId|Long|站点ID
  deptId|Long|部门ID
  deptCode|String|部门编号
  deptName|String|部门名称
  materialName|String|材料名
  materiaFullName|String|材料全名
  materialId|Long|材料id
  source|Integer|事项来源(0.政务网，1.自定义)
  isRecommend|Integer|是否推荐(0.未推荐，1.推荐)
  sort|Integer|排序
  sampleName|String|样表名称
  samplePath|String|样表地址
  preViewPath|String|样表预览地址
  createTime|Date|创建时间
  createUserId|Long|创建用户
  updateTime|Date|修改时间
......@@ -2659,28 +2655,23 @@ code|Integer|结果码（-1.失败，1.成功）
msg|String|消息
data|object|数据对象
 id|Long|主键，自增长
 siteId|Long|站点ID
 deviceId|Long|设备id
 deviceCode|String|设备编码
 deviceName|String|设备名称
 matterId|Long|事项id
 matterCode|String|事项编码
 matterName|String|事项名称
 siteId|Long|站点ID
 deptId|Long|部门ID
 deptCode|String|部门编号
 deptName|String|部门名称
 materialName|String|材料名
 materiaFullName|String|材料全名
 materialId|Long|材料id
 source|Integer|事项来源(0.政务网，1.自定义)
 isRecommend|Integer|是否推荐(0.未推荐，1.推荐)
 sort|Integer|排序
 sampleName|String|样表名称
 samplePath|String|样表地址
 preViewPath|String|样表预览地址
 createTime|Date|创建时间
 createUserId|Long|创建用户
 updateTime|Date|修改时间
 matterDatumList|Arrays|材料列表
dict|object|字典对象
 source|object|字典属性对象，详见附录
 isRecommend|object|字典属性对象，详见附录
......@@ -2690,29 +2681,24 @@ dict|object|字典对象
{
"code": 1,
"data": {
"id":7287,
"deviceId":4805,
"deviceCode":"ezsu52",
"deviceName":"gio16r",
"matterId":8179,
"matterCode":"wuz4op",
"matterName":"3j5eg0",
"siteId":9985,
"deptId":3702,
"deptCode":"dvslci",
"deptName":"urebgs",
"materialName":"znzxp8",
"materiaFullName":"ar03ng",
"materialId":3055,
"source":6317,
"isRecommend":1887,
"sort":5527,
"sampleName":"f6e961",
"samplePath":"67xnm5",
"preViewPath":"r6w3s6",
"createTime":"2023-03-22",
"createUserId":8413,
"updateTime":"2023-03-22"
"id":2918,
"siteId":2722,
"deviceId":7656,
"deviceCode":"2chaii",
"deviceName":"g9qyjr",
"matterId":7754,
"matterCode":"ddi0db",
"matterName":"4ttn0d",
"deptId":9159,
"deptCode":"zkv745",
"deptName":"wa75ev",
"source":4828,
"isRecommend":7338,
"sort":7624,
"createTime":"2023-03-23",
"createUserId":7824,
"updateTime":"2023-03-23"
"matterDatumList":[...]
}
}
```
......@@ -2731,17 +2717,18 @@ dict|object|字典对象
参数名称|类型|必填|描述
:---|:---|:---|:-------
deviceId|Long|否|设备id
matterId|Lon;g|否|事项id
siteId|Long|否|站点ID
materialId|Long|否|材料id
deviceId|Long|否|设备id
matterId|Long|否|事项id
sort|Integer|否|排序
**请求样例:**
```
{
"deviceId":9730,
"matterId":5750,
"materialId":8061
"siteId":3,
"deviceId":2646,
"matterId":418,
"sort":0,
}
```
......@@ -2755,25 +2742,19 @@ data|object|数据对象
 id|Long|保存后主键id
 entity|object|保存更新实体
  id|Long|主键，自增长
  siteId|Long|站点ID
  deviceId|Long|设备id
  deviceCode|String|设备编码
  deviceName|String|设备名称
  matterId|Long|事项id
  matterCode|String|事项编码
  matterName|String|事项名称
  siteId|Long|站点ID
  deptId|Long|部门ID
  deptCode|String|部门编号
  deptName|String|部门名称
  materialName|String|材料名
  materiaFullName|String|材料全名
  materialId|Long|材料id
  source|Integer|事项来源(0.政务网，1.自定义)
  isRecommend|Integer|是否推荐(0.未推荐，1.推荐)
  sort|Integer|排序
  sampleName|String|样表名称
  samplePath|String|样表地址
  preViewPath|String|样表预览地址
  createTime|Date|创建时间
  createUserId|Long|创建用户
  updateTime|Date|修改时间
......@@ -2822,3 +2803,5 @@ msg|String|消息|-
"code":1,
"msg":"成功"
}
```
sample-form-manager/db/module.sql
View file @ 7b2c98e6
......@@ -290,32 +290,27 @@ CREATE TABLE `mortals_xhx_device` (
-- ----------------------------
DROP TABLE IF EXISTS `mortals_xhx_device_matter_datum`;
CREATE TABLE mortals_xhx_device_matter_datum(
`id` bigint(20) AUTO_INCREMENT COMMENT '主键，自增长',
`deviceId` bigint(20) COMMENT '设备id',
`deviceCode` varchar(255) COMMENT '设备编码',
`deviceName` varchar(255) COMMENT '设备名称',
`matterId` bigint(20) COMMENT '事项id',
`matterCode` varchar(255) COMMENT '事项编码',
`matterName` varchar(255) COMMENT '事项名称',
`siteId` bigint(20) COMMENT '站点ID',
`deptId` bigint(20) COMMENT '部门ID',
`deptCode` varchar(256) COMMENT '部门编号',
`deptName` varchar(256) COMMENT '部门名称',
`materialName` varchar(1024) COMMENT '材料名',
`materiaFullName` varchar(1024) COMMENT '材料全名',
`materialId` bigint(20) COMMENT '材料id',
`source` tinyint(2) COMMENT '事项来源(0.政务网，1.自定义)',
`isRecommend` tinyint(2) COMMENT '是否推荐(0.未推荐，1.推荐)',
`sort` int(4) COMMENT '排序',
`sampleName` varchar(255) COMMENT '样表名称',
`samplePath` varchar(255) COMMENT '样表地址',
`preViewPath` varchar(255) COMMENT '样表预览地址',
`createTime` datetime COMMENT '创建时间',
`createUserId` bigint(20) COMMENT '创建用户',
`updateTime` datetime COMMENT '修改时间',
PRIMARY KEY (`id`)
`id` bigint(20) AUTO_INCREMENT COMMENT '主键，自增长',
`siteId` bigint(20) COMMENT '站点ID',
`deviceId` bigint(20) COMMENT '设备id',
`deviceCode` varchar(255) COMMENT '设备编码',
`deviceName` varchar(255) COMMENT '设备名称',
`matterId` bigint(20) COMMENT '事项id',
`matterCode` varchar(255) COMMENT '事项编码',
`matterName` varchar(255) COMMENT '事项名称',
`deptId` bigint(20) COMMENT '部门ID',
`deptCode` varchar(256) COMMENT '部门编号',
`deptName` varchar(256) COMMENT '部门名称',
`source` tinyint(2) COMMENT '事项来源(0.政务网，1.自定义)',
`isRecommend` tinyint(2) COMMENT '是否推荐(0.未推荐，1.推荐)',
`sort` int(4) COMMENT '排序',
`createTime` datetime COMMENT '创建时间',
`createUserId` bigint(20) COMMENT '创建用户',
`updateTime` datetime COMMENT '修改时间',
PRIMARY KEY (`id`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='设备事项申请材料业务';
sample-form-manager/src/main/java/com/mortals/xhx/module/device/model/DeviceMatterDatumEntity.java
View file @ 7b2c98e6
......@@ -10,12 +10,16 @@ import com.mortals.xhx.module.device.model.vo.DeviceMatterDatumVo;
* 设备事项申请材料业务实体对象
*
* @author zxfei
* @date 2023-03-22
* @date 2023-03-23
*/
public class DeviceMatterDatumEntity extends DeviceMatterDatumVo {
private static final long serialVersionUID = 1L;
/**
* 站点ID
*/
private Long siteId;
/**
* 设备id
*/
......@@ -40,10 +44,6 @@ public class DeviceMatterDatumEntity extends DeviceMatterDatumVo {
* 事项名称
*/
private String matterName;
/**
* 站点ID
*/
private Long siteId;
/**
* 部门ID
*/
......@@ -56,18 +56,6 @@ public class DeviceMatterDatumEntity extends DeviceMatterDatumVo {
* 部门名称
*/
private String deptName;
/**
* 材料名
*/
private String materialName;
/**
* 材料全名
*/
private String materiaFullName;
/**
* 材料id
*/
private Long materialId;
/**
* 事项来源(0.政务网，1.自定义)
*/
......@@ -80,22 +68,24 @@ public class DeviceMatterDatumEntity extends DeviceMatterDatumVo {
* 排序
*/
private Integer sort;
/**
* 样表名称
*/
private String sampleName;
/**
* 样表地址
*/
private String samplePath;
/**
* 样表预览地址
*/
private String preViewPath;
public DeviceMatterDatumEntity(){}
/**
* 获取 站点ID
* @return Long
*/
public Long getSiteId(){
return siteId;
}
/**
* 设置 站点ID
* @param siteId
*/
public void setSiteId(Long siteId){
this.siteId = siteId;
}
/**
* 获取 设备id
* @return Long
......@@ -180,20 +170,6 @@ public class DeviceMatterDatumEntity extends DeviceMatterDatumVo {
public void setMatterName(String matterName){
this.matterName = matterName;
}
/**
* 获取 站点ID
* @return Long
*/
public Long getSiteId(){
return siteId;
}
/**
* 设置 站点ID
* @param siteId
*/
public void setSiteId(Long siteId){
this.siteId = siteId;
}
/**
* 获取 部门ID
* @return Long
......@@ -236,48 +212,6 @@ public class DeviceMatterDatumEntity extends DeviceMatterDatumVo {
public void setDeptName(String deptName){
this.deptName = deptName;
}
/**
* 获取 材料名
* @return String
*/
public String getMaterialName(){
return materialName;
}
/**
* 设置 材料名
* @param materialName
*/
public void setMaterialName(String materialName){
this.materialName = materialName;
}
/**
* 获取 材料全名
* @return String
*/
public String getMateriaFullName(){
return materiaFullName;
}
/**
* 设置 材料全名
* @param materiaFullName
*/
public void setMateriaFullName(String materiaFullName){
this.materiaFullName = materiaFullName;
}
/**
* 获取 材料id
* @return Long
*/
public Long getMaterialId(){
return materialId;
}
/**
* 设置 材料id
* @param materialId
*/
public void setMaterialId(Long materialId){
this.materialId = materialId;
}
/**
* 获取 事项来源(0.政务网，1.自定义)
* @return Integer
......@@ -320,48 +254,6 @@ public class DeviceMatterDatumEntity extends DeviceMatterDatumVo {
public void setSort(Integer sort){
this.sort = sort;
}
/**
* 获取 样表名称
* @return String
*/
public String getSampleName(){
return sampleName;
}
/**
* 设置 样表名称
* @param sampleName
*/
public void setSampleName(String sampleName){
this.sampleName = sampleName;
}
/**
* 获取 样表地址
* @return String
*/
public String getSamplePath(){
return samplePath;
}
/**
* 设置 样表地址
* @param samplePath
*/
public void setSamplePath(String samplePath){
this.samplePath = samplePath;
}
/**
* 获取 样表预览地址
* @return String
*/
public String getPreViewPath(){
return preViewPath;
}
/**
* 设置 样表预览地址
* @param preViewPath
*/
public void setPreViewPath(String preViewPath){
this.preViewPath = preViewPath;
}
......@@ -384,30 +276,26 @@ public class DeviceMatterDatumEntity extends DeviceMatterDatumVo {
public String toString(){
StringBuilder sb = new StringBuilder("");
sb.append(",siteId:").append(getSiteId());
sb.append(",deviceId:").append(getDeviceId());
sb.append(",deviceCode:").append(getDeviceCode());
sb.append(",deviceName:").append(getDeviceName());
sb.append(",matterId:").append(getMatterId());
sb.append(",matterCode:").append(getMatterCode());
sb.append(",matterName:").append(getMatterName());
sb.append(",siteId:").append(getSiteId());
sb.append(",deptId:").append(getDeptId());
sb.append(",deptCode:").append(getDeptCode());
sb.append(",deptName:").append(getDeptName());
sb.append(",materialName:").append(getMaterialName());
sb.append(",materiaFullName:").append(getMateriaFullName());
sb.append(",materialId:").append(getMaterialId());
sb.append(",source:").append(getSource());
sb.append(",isRecommend:").append(getIsRecommend());
sb.append(",sort:").append(getSort());
sb.append(",sampleName:").append(getSampleName());
sb.append(",samplePath:").append(getSamplePath());
sb.append(",preViewPath:").append(getPreViewPath());
return sb.toString();
}
public void initAttrValue(){
this.siteId = null;
this.deviceId = null;
this.deviceCode = null;
......@@ -420,30 +308,16 @@ public class DeviceMatterDatumEntity extends DeviceMatterDatumVo {
this.matterName = null;
this.siteId = null;
this.deptId = null;
this.deptCode = null;
this.deptName = null;
this.materialName = null;
this.materiaFullName = null;
this.materialId = null;
this.source = null;
this.isRecommend = null;
this.sort = null;
this.sampleName = null;
this.samplePath = null;
this.preViewPath = null;
}
}
\ No newline at end of file
sample-form-manager/src/main/java/com/mortals/xhx/module/device/model/vo/DeviceMatterDatumVo.java
View file @ 7b2c98e6
package com.mortals.xhx.module.device.model.vo;
import com.mortals.framework.model.BaseEntityLong;
import com.mortals.xhx.module.device.model.DeviceMatterDatumEntity;
import com.mortals.xhx.module.matter.model.MatterDatumEntity;
import lombok.Data;
import java.util.ArrayList;
import java.util.List;
/**
* 设备事项申请材料业务视图对象
*
* @author zxfei
* @date 2023-02-25
*/
* 设备事项申请材料业务视图对象
*
* @author zxfei
* @date 2023-02-25
*/
@Data
public class DeviceMatterDatumVo extends BaseEntityLong {
private List<MatterDatumEntity> matterDatumList;
}
\ No newline at end of file
sample-form-manager/src/main/java/com/mortals/xhx/module/device/service/impl/DeviceMatterDatumServiceImpl.java
View file @ 7b2c98e6
package com.mortals.xhx.module.device.service.impl;
import com.mortals.framework.model.PageInfo;
import com.mortals.xhx.module.device.model.DeviceEntity;
import com.mortals.xhx.module.device.service.DeviceService;
import com.mortals.xhx.module.matter.model.MatterDatumEntity;
import com.mortals.xhx.module.matter.model.MatterDatumQuery;
import com.mortals.xhx.module.matter.model.MatterEntity;
import com.mortals.xhx.module.matter.service.MatterDatumService;
import com.mortals.xhx.module.matter.service.MatterService;
......@@ -15,6 +17,9 @@ import com.mortals.xhx.module.device.model.DeviceMatterDatumEntity;
import com.mortals.xhx.module.device.service.DeviceMatterDatumService;
import org.springframework.util.ObjectUtils;
import java.util.ArrayList;
import java.util.List;
/**
* DeviceMatterDatumService
* 设备事项申请材料业务 service实现
......@@ -28,9 +33,24 @@ public class DeviceMatterDatumServiceImpl extends AbstractCRUDServiceImpl<Device
@Autowired
private MatterService matterService;
@Autowired
private MatterDatumService matterDatumService;
@Autowired
private DeviceService deviceService;
@Autowired
private MatterDatumService matterDatumService;
@Override
protected void findAfter(DeviceMatterDatumEntity params, PageInfo pageInfo, Context context, List<DeviceMatterDatumEntity> list) throws AppException {
//super.findAfter(params, pageInfo, context, list);
list.forEach(item->{
List<MatterDatumEntity> matterDatumEntities = matterDatumService.find(new MatterDatumQuery().matterId(item.getMatterId()));
if(!ObjectUtils.isEmpty(matterDatumEntities)){
item.setMatterDatumList(matterDatumEntities);
}else{
item.setMatterDatumList(new ArrayList<>());
}
});
}
@Override
protected void saveBefore(DeviceMatterDatumEntity entity, Context context) throws AppException {
......@@ -47,17 +67,6 @@ public class DeviceMatterDatumServiceImpl extends AbstractCRUDServiceImpl<Device
}
}
if(!ObjectUtils.isEmpty(entity.getMaterialId())){
MatterDatumEntity matterDatumEntity = matterDatumService.get(entity.getMaterialId());
if(!ObjectUtils.isEmpty(matterDatumEntity)){
entity.setMaterialName(matterDatumEntity.getMaterialName());
entity.setIsRecommend(matterDatumEntity.getIsRecommend());
entity.setSampleName(matterDatumEntity.getSampleName());
entity.setSamplePath(matterDatumEntity.getSamplePath());
entity.setPreViewPath(matterDatumEntity.getPreViewPath());
entity.setSource(matterDatumEntity.getSource());
}
}
if(!ObjectUtils.isEmpty(entity.getDeviceId())){
DeviceEntity deviceEntity = deviceService.get(entity.getDeviceId());
if(!ObjectUtils.isEmpty(deviceEntity)){
......
sample-form-manager/src/main/java/com/mortals/xhx/module/device/web/DeviceMatterDatumController.java
View file @ 7b2c98e6
package com.mortals.xhx.module.device.web;
import com.mortals.framework.exception.AppException;
import com.mortals.framework.web.BaseCRUDJsonBodyMappingController;
import com.mortals.xhx.base.system.param.service.ParamService;
import com.mortals.xhx.module.matter.model.MatterDatumEntity;
import com.mortals.xhx.module.matter.model.MatterDatumQuery;
import com.mortals.xhx.module.matter.service.MatterDatumService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
......@@ -36,6 +40,9 @@ public class DeviceMatterDatumController extends BaseCRUDJsonBodyMappingControll
@Autowired
private ParamService paramService;
@Autowired
private MatterDatumService matterDatumService;
public DeviceMatterDatumController(){
super.setModuleDesc( "设备事项申请材料业务");
}
......@@ -48,4 +55,10 @@ public class DeviceMatterDatumController extends BaseCRUDJsonBodyMappingControll
}
@Override
protected int infoAfter(Long id, Map<String, Object> model, DeviceMatterDatumEntity entity, Context context) throws AppException {
List<MatterDatumEntity> matterDatumEntities = matterDatumService.find(new MatterDatumQuery().matterId(entity.getMatterId()));
entity.setMatterDatumList(matterDatumEntities);
return super.infoAfter(id, model, entity, context);
}
}
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment