yu
/
CostumingPlatform
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source
zhc4dev
赵玉瑞 2 years ago
parent 364e25558e 6010ca75d7
commit 11fb217ab9
20 changed files with 177 additions and 107 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 15
      ant-design-vue-jeecg/src/views/collecttype/admin/CollectTypeList.vue
  2. 18
      ant-design-vue-jeecg/src/views/collecttype/admin/modules/CollectTypeModal.vue
  3. 16
      ant-design-vue-jeecg/src/views/customercollectgoods/admin/CustomercollectgoodsList.vue
  4. 32
      ant-design-vue-jeecg/src/views/customercollectgoods/admin/modules/CustomercollectgoodsForm.vue
  5. 33
      ant-design-vue-jeecg/src/views/device/ZyDeviceList.vue
  6. 7
      ant-design-vue-jeecg/src/views/erp/fabric/ZyFabricList.vue
  7. 2
      ant-design-vue-jeecg/src/views/process/modules/ZyOperationtoolList.vue
  8. 2
      ant-design-vue-jeecg/src/views/process/modules/ZyProcessActionList.vue
  9. 2
      ant-design-vue-jeecg/src/views/process/modules/ZyProcessFabricList.vue
  10. 2
      ant-design-vue-jeecg/src/views/process/modules/ZyProcessMachineList.vue
  11. 2
      ant-design-vue-jeecg/src/views/process/modules/list/ZyMachine.vue
  12. 9
      jeecg-boot/jeecg-boot-module-erp/src/main/java/org/jeecg/modules/demo/fabric/controller/ZyFabricController.java
  13. 2
      jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/pro/entity/ZyProcessMachine.java
  14. 2
      jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/pro/mapper/ZyProcessMachineMapper.java
  15. 38
      jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/collecttype/entity/CollectType.java
  16. 48
      jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/customercollectgoods/entity/Customercollectgoods.java
  17. 17
      jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/device/controller/ZyDeviceController.java
  18. 33
      jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/device/entity/ZyDevice.java
  19. 2
      jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/product/pdmachine/entity/ProductMachine.java
  20. 2
      jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/product/pdmachine/mapper/ProductMachineMapper.java

15
ant-design-vue-jeecg/src/views/collecttype/admin/CollectTypeList.vue
Unescape View File

@ -4,6 +4,21 @@
<div class="table-page-search-wrapper">
<a-form layout="inline" @keyup.enter.native="searchQuery">
<a-row :gutter="24">
<a-col :xl="6" :lg="7" :md="8" :sm="24">
<a-form-item label="收藏分类名">
<a-input placeholder="请输入收藏分类名" v-model="queryParam.collectTypeName"></a-input>
</a-form-item>
</a-col>
<a-col :xl="6" :lg="7" :md="8" :sm="24">
<span style="float: left;overflow: hidden;" class="table-page-search-submitButtons">
<a-button type="primary" @click="searchQuery" icon="search">查询</a-button>
<a-button type="primary" @click="searchReset" icon="reload" style="margin-left: 8px">重置</a-button>
<a @click="handleToggleSearch" style="margin-left: 8px">
{{ toggleSearchStatus ? '收起' : '展开' }}
<a-icon :type="toggleSearchStatus ? 'up' : 'down'"/>
</a>
</span>
</a-col>
</a-row>
</a-form>
</div>

18
ant-design-vue-jeecg/src/views/collecttype/admin/modules/CollectTypeModal.vue
Unescape View File

@ -11,21 +11,21 @@
<a-spin :spinning="confirmLoading">
<a-form-model ref="form" :model="model" :rules="validatorRules">
<a-form-model-item label="收藏分类名" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="collectTypeName">
<a-input v-model="model.collectTypeName" placeholder="请输入收藏分类名" ></a-input>
<a-input v-model="model.collectTypeName" placeholder="请输入顶级收藏夹" ></a-input>
</a-form-model-item>
<a-form-model-item label="父级节点" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="pid">
<a-form-model-item label="上级收藏夹" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="pid">
<j-tree-select
ref="treeSelect"
placeholder="请选择父级节点"
placeholder="请选择上级收藏夹"
v-model="model.pid"
dict="collect_type,collect_type_name,id"
pidField="pid"
pidValue="0"
hasChildField="has_child"
>
>
</j-tree-select>
</a-form-model-item>
</a-form-model>
</a-spin>
</j-modal>
@ -37,7 +37,7 @@
import { validateDuplicateValue } from '@/utils/util'
export default {
name: "CollectTypeModal",
components: {
components: {
},
data () {
return {
@ -64,7 +64,7 @@
},
expandedRowKeys:[],
pidField:"pid"
}
},
created () {
@ -146,8 +146,8 @@
}
}
}
}
}
</script>

16
ant-design-vue-jeecg/src/views/customercollectgoods/admin/CustomercollectgoodsList.vue
Unescape View File

@ -1,12 +1,12 @@
<template>
<a-card :bordered="false">
<!-- 查询区域 -->
<div class="table-page-search-wrapper">
<div class="table-page-search-wrapper">
<a-form layout="inline" @keyup.enter.native="searchQuery">
<a-row :gutter="24">
<a-col :xl="6" :lg="7" :md="8" :sm="24">
<a-form-item label="用户">
<j-select-user-by-dep placeholder="请选择用户" v-model="queryParam.userId"/>
<j-search-select-tag placeholder="请选择用户" v-model="queryParam.userId" dict="sys_user,realname,id"/>
</a-form-item>
</a-col>
<a-col :xl="6" :lg="7" :md="8" :sm="24">
@ -157,11 +157,6 @@
align:"center",
dataIndex: 'price'
},
{
title:'数量',
align:"center",
dataIndex: 'number'
},
{
title:'收藏夹',
align:"center",
@ -201,10 +196,11 @@
},
getSuperFieldList(){
let fieldList=[];
fieldList.push({type:'sel_user',value:'userId',text:'用户'})
fieldList.push({type:'sel_search',value:'goodsId',text:'商品',dictTable:'', dictText:'', dictCode:''})
fieldList.push({type:'sel_search',value:'userId',text:'用户',dictTable:'sys_user', dictText:'realname', dictCode:'id'})
fieldList.push({type:'popup',value:'username',text:'用户', popup:{code:'findcust',field:'id',orgFields:'id',destFields:'user_id'}})
fieldList.push({type:'sel_search',value:'goodsId',text:'商品',dictTable:'zy_goods', dictText:'goods_name', dictCode:'id'})
fieldList.push({type:'popup',value:'goodsname',text:'商品', popup:{code:'findgoods',field:'id',orgFields:'id',destFields:'goods_id'}})
fieldList.push({type:'string',value:'price',text:'当前单价',dictCode:''})
fieldList.push({type:'string',value:'number',text:'数量',dictCode:''})
fieldList.push({type:'sel_search',value:'collectTypeId',text:'收藏夹',dictTable:'collect_type', dictText:'collect_type_name', dictCode:'id'})
this.superFieldList = fieldList
}

32
ant-design-vue-jeecg/src/views/customercollectgoods/admin/modules/CustomercollectgoodsForm.vue
Unescape View File

@ -4,13 +4,29 @@
<a-form-model ref="form" :model="model" :rules="validatorRules" slot="detail">
<a-row>
<a-col :span="24">
<a-form-model-item label="用户" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="userId">
<j-select-user-by-dep v-model="model.userId" />
<a-form-model-item label="用户" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="username">
<j-popup
v-model="model.username"
field="username"
org-fields="id,realname"
dest-fields="userId,username"
code="findcust"
:multi="true"
@input="popupCallback"
/>
</a-form-model-item>
</a-col>
<a-col :span="24">
<a-form-model-item label="商品" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="goodsId">
<j-search-select-tag v-model="model.goodsId" dict="zy_goods,goods_name,id" />
<a-form-model-item label="商品" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="goodsname">
<j-popup
v-model="model.goodsname"
field="goodsname"
org-fields="id,goods_name,unit_price"
dest-fields="goodsId,goodsname,price"
code="findgoods"
:multi="true"
@input="popupCallback"
/>
</a-form-model-item>
</a-col>
<a-col :span="24">
@ -18,11 +34,6 @@
<a-input v-model="model.price" placeholder="请输入当前单价" ></a-input>
</a-form-model-item>
</a-col>
<a-col :span="24">
<a-form-model-item label="数量" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="number">
<a-input v-model="model.number" placeholder="请输入数量" ></a-input>
</a-form-model-item>
</a-col>
<a-col :span="24">
<a-form-model-item label="收藏夹" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="collectTypeId">
<j-search-select-tag v-model="model.collectTypeId" dict="collect_type,collect_type_name,id" />
@ -119,6 +130,9 @@
})
},
popupCallback(value,row){
this.model = Object.assign(this.model, row);
},
}
}
</script>

33
ant-design-vue-jeecg/src/views/device/ZyDeviceList.vue
Unescape View File

@ -130,6 +130,26 @@
return parseInt(index)+1;
}
},
{
title:'设备类型',
align:"center",
dataIndex: 'typeCode_dictText'
},
{
title:'设备型号',
align:"center",
dataIndex: 'modelId_dictText'
},
{
title:'设备品牌',
align:"center",
dataIndex: 'brandId_dictText'
},
{
title:'设备名称',
align:"center",
dataIndex: 'name'
},
{
title:'设备图片',
align:"center",
@ -139,14 +159,10 @@
{
title:'设备二维码',
align:"center",
dataIndex: 'erweima',
dataIndex: 'qrcode',
scopedSlots: {customRender: 'imgeSlot'}
},
{
title:'设备类型',
align:"center",
dataIndex: 'typeid_dictText'
},
{
title:'设备编号',
align:"center",
@ -165,11 +181,6 @@
align:"center",
dataIndex: 'agent_dictText'
},
{
title:'存放位置',
align:"center",
dataIndex: 'adress'
},
{
title:'设备状态',
align:"center",

7
ant-design-vue-jeecg/src/views/erp/fabric/ZyFabricList.vue
Unescape View File

@ -24,7 +24,7 @@
<a-input placeholder="名称" v-model="queryParam.name"></a-input>
</a-form-item>
</a-col>
<template v-if="toggleSearchStatus">
<a-col :xl="6" :lg="7" :md="8" :sm="24">
<a-form-item label="颜色">
<a-input placeholder="请输入颜色" v-model="queryParam.color"></a-input>
@ -40,15 +40,10 @@
<j-search-select-tag placeholder="请选择材质" v-model="queryParam.material" dict="material"/>
</a-form-item>
</a-col>
</template>
<a-col :xl="6" :lg="7" :md="8" :sm="24">
<span style="float: left;overflow: hidden;" class="table-page-search-submitButtons">
<a-button type="primary" @click="searchQuery" icon="search">查询</a-button>
<a-button type="primary" @click="searchReset" icon="reload" style="margin-left: 8px">重置</a-button>
<a @click="handleToggleSearch" style="margin-left: 8px">
{{ toggleSearchStatus ? '收起' : '展开' }}
<a-icon :type="toggleSearchStatus ? 'up' : 'down'"/>
</a>
</span>
</a-col>
</a-row>

2
ant-design-vue-jeecg/src/views/process/modules/ZyOperationtoolList.vue
Unescape View File

@ -12,7 +12,7 @@
<a-col :xl="6" :lg="7" :md="8" :sm="24">
<span style="float: left;overflow: hidden;" class="table-page-search-submitButtons">
<a-button type="primary" @click="searchQuery" icon="search">查询</a-button>
<!-- <a-button type="primary" @click="searchReset" icon="reload" style="margin-left: 8px">重置</a-button>-->
<a-button type="primary" @click="searchReset" icon="reload" style="margin-left: 8px">重置</a-button>
</span>
</a-col>
</a-row>

2
ant-design-vue-jeecg/src/views/process/modules/ZyProcessActionList.vue
Unescape View File

@ -12,7 +12,7 @@
<a-col :xl="6" :lg="7" :md="8" :sm="24">
<span style="float: left;overflow: hidden;" class="table-page-search-submitButtons">
<a-button type="primary" @click="searchQuery" icon="search">查询</a-button>
<!-- <a-button type="primary" @click="searchReset" icon="reload" style="margin-left: 8px">重置</a-button>-->
<a-button type="primary" @click="searchReset" icon="reload" style="margin-left: 8px">重置</a-button>
</span>
</a-col>
</a-row>

2
ant-design-vue-jeecg/src/views/process/modules/ZyProcessFabricList.vue
Unescape View File

@ -17,7 +17,7 @@
<a-col :xl="6" :lg="7" :md="8" :sm="24">
<span style="float: left;overflow: hidden;" class="table-page-search-submitButtons">
<a-button type="primary" @click="searchQuery" icon="search">查询</a-button>
<!-- <a-button type="primary" @click="searchReset" icon="reload" style="margin-left: 8px">重置</a-button>-->
<a-button type="primary" @click="searchReset" icon="reload" style="margin-left: 8px">重置</a-button>
</span>
</a-col>
</a-row>

2
ant-design-vue-jeecg/src/views/process/modules/ZyProcessMachineList.vue
Unescape View File

@ -17,7 +17,7 @@
<a-col :xl="6" :lg="7" :md="8" :sm="24">
<span style="float: left;overflow: hidden;" class="table-page-search-submitButtons">
<a-button type="primary" @click="searchQuery" icon="search">查询</a-button>
<!-- <a-button type="primary" @click="searchReset" icon="reload" style="margin-left: 8px">重置</a-button>-->
<a-button type="primary" @click="searchReset" icon="reload" style="margin-left: 8px">重置</a-button>
</span>
</a-col>
</a-row>

2
ant-design-vue-jeecg/src/views/process/modules/list/ZyMachine.vue
Unescape View File

@ -142,7 +142,7 @@
// }
],
url: {
list: "/devicetype/zyDevicetype/list1",
list: "/device/zyDevice/list1",
importExcelUrl: "base/zyClothAction/importExcel",
},

9
jeecg-boot/jeecg-boot-module-erp/src/main/java/org/jeecg/modules/demo/fabric/controller/ZyFabricController.java
Unescape View File

@ -89,6 +89,15 @@ public class ZyFabricController extends JeecgController<ZyFabric, IZyFabricServi
if(zyFabric.getName()!=null&&!zyFabric.getName().equals("")){
queryWrapper.like("name",zyFabric.getName());
}
if(zyFabric.getColor()!=null&&!zyFabric.getColor().equals("")){
queryWrapper.like("color",zyFabric.getColor());
}
if(zyFabric.getPattern()!=null&&!zyFabric.getPattern().equals("")){
queryWrapper.like("pattern",zyFabric.getPattern());
}
if(zyFabric.getMaterial()!=null&&!zyFabric.getMaterial().equals("")){
queryWrapper.like("material",zyFabric.getMaterial());
}
queryWrapper.orderByDesc("create_time");
// QueryWrapper queryWrapper = new QueryWrapper();
Page<ZyFabric> page = new Page<>(pageNo, pageSize);

2
jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/pro/entity/ZyProcessMachine.java
Unescape View File

@ -41,7 +41,7 @@ public class ZyProcessMachine implements Serializable {
private String processId;
/**机器*/
@Excel(name = "机器", width = 15, dictTable = "zy_devicetype", dicText = "name", dicCode = "id")
@Dict(dictTable = "zy_devicetype", dicText = "name", dicCode = "id")
@Dict(dictTable = "zy_device", dicText = "name", dicCode = "id")
@ApiModelProperty(value = "机器")
private String machineId;
/**创建时间*/

2
jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/pro/mapper/ZyProcessMachineMapper.java
Unescape View File

@ -21,6 +21,6 @@ public interface ZyProcessMachineMapper extends BaseMapper<ZyProcessMachine> {
@Select("<script>select * from zy_process_machine <where><if test=\" p != null\">process_id in (select id from zy_process where process_name like #{p})</if><if test=\" m != null\"> and machine_id in (select id from zy_devicetype where name like #{m})</if></where></script>")
IPage<ZyProcessMachine> page(Page<ZyProcessMachine> page, @Param("p") String processId, @Param("m") String machineId);
@Select("<script>select a.*,b.process_code,c.code from zy_process_machine as a,zy_process as b,zy_devicetype as c <where> a.process_id=b.id and a.machine_id=c.id and a.process_id=#{p} <if test=\" m != null\"> and machine_id in (select id from zy_devicetype where name like #{m})</if></where></script>")
@Select("<script>select a.*,b.process_code,c.code from zy_process_machine as a,zy_process as b,zy_device as c <where> a.process_id=b.id and a.machine_id=c.id and a.process_id=#{p} <if test=\" m != null\"> and machine_id in (select id from zy_device where name like #{m})</if></where></script>")
IPage<ZyProcessMachine> page1(Page<ZyProcessMachine> page, @Param("p") String s, @Param("m") String t);
}

38
jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/collecttype/entity/CollectType.java
Unescape View File

@ -27,44 +27,44 @@ import java.io.UnsupportedEncodingException;
public class CollectType implements Serializable {
private static final long serialVersionUID = 1L;
/**主键*/
@TableId(type = IdType.ASSIGN_ID)
/**主键*/
@TableId(type = IdType.ASSIGN_ID)
@ApiModelProperty(value = "主键")
private java.lang.String id;
/**创建人*/
/**创建人*/
@ApiModelProperty(value = "创建人")
private java.lang.String createBy;
/**创建日期*/
@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
/**创建日期*/
@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
@ApiModelProperty(value = "创建日期")
private java.util.Date createTime;
/**更新人*/
/**更新人*/
@ApiModelProperty(value = "更新人")
private java.lang.String updateBy;
/**更新日期*/
@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
/**更新日期*/
@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
@ApiModelProperty(value = "更新日期")
private java.util.Date updateTime;
/**所属部门*/
/**所属部门*/
@ApiModelProperty(value = "所属部门")
private java.lang.String sysOrgCode;
/**用户*/
@Excel(name = "用户", width = 15)
/**用户*/
@Excel(name = "用户", width = 15)
@ApiModelProperty(value = "用户")
private java.lang.String userId;
/**收藏分类名*/
@Excel(name = "收藏分类名", width = 15)
/**收藏分类名*/
@Excel(name = "收藏分类名", width = 15)
@ApiModelProperty(value = "收藏分类名")
private java.lang.String collectTypeName;
/**父级节点*/
@Excel(name = "父级节点", width = 15)
@ApiModelProperty(value = "父级节点")
/**上级收藏夹*/
@Excel(name = "上级收藏夹", width = 15)
@ApiModelProperty(value = "上级收藏夹")
private java.lang.String pid;
/**是否有子节点*/
@Excel(name = "是否有子节点", width = 15, dicCode = "yn")
@Dict(dicCode = "yn")
/**是否有子节点*/
@Excel(name = "是否有子节点", width = 15, dicCode = "yn")
@Dict(dicCode = "yn")
@ApiModelProperty(value = "是否有子节点")
private java.lang.String hasChild;
}

48
jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/customercollectgoods/entity/Customercollectgoods.java
Unescape View File

@ -20,7 +20,7 @@ import lombok.experimental.Accessors;
/**
* @Description: 收藏商品（衣橱）
* @Author: jeecg-boot
* @Date: 2022-12-08
* @Date: 2023-01-04
* @Version: V1.0
*/
@Data
@ -31,50 +31,54 @@ import lombok.experimental.Accessors;
public class Customercollectgoods implements Serializable {
private static final long serialVersionUID = 1L;
/**主键*/
@TableId(type = IdType.ASSIGN_ID)
/**主键*/
@TableId(type = IdType.ASSIGN_ID)
@ApiModelProperty(value = "主键")
private java.lang.String id;
/**创建人*/
/**创建人*/
@ApiModelProperty(value = "创建人")
private java.lang.String createBy;
/**创建日期*/
@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
/**创建日期*/
@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
@ApiModelProperty(value = "创建日期")
private java.util.Date createTime;
/**更新人*/
/**更新人*/
@ApiModelProperty(value = "更新人")
private java.lang.String updateBy;
/**更新日期*/
@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
/**更新日期*/
@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
@ApiModelProperty(value = "更新日期")
private java.util.Date updateTime;
/**所属部门*/
/**所属部门*/
@ApiModelProperty(value = "所属部门")
private java.lang.String sysOrgCode;
/**用户*/
@Excel(name = "用户", width = 15, dictTable = "sys_user", dicText = "realname", dicCode = "username")
@Dict(dictTable = "sys_user", dicText = "realname", dicCode = "username")
/**用户*/
@Excel(name = "用户", width = 15, dictTable = "sys_user", dicText = "realname", dicCode = "id")
@Dict(dictTable = "sys_user", dicText = "realname", dicCode = "id")
@ApiModelProperty(value = "用户")
private java.lang.String userId;
/**用户*/
@Excel(name = "用户", width = 15)
@ApiModelProperty(value = "用户")
private java.lang.String username;
/**商品*/
@Excel(name = "商品", width = 15, dictTable = "zy_goods", dicText = "goods_name", dicCode = "id")
@Dict(dictTable = "zy_goods", dicText = "goods_name", dicCode = "id")
@ApiModelProperty(value = "商品")
private java.lang.String goodsId;
/**当前单价*/
@Excel(name = "当前单价", width = 15)
/**商品*/
@Excel(name = "商品", width = 15)
@ApiModelProperty(value = "商品")
private java.lang.String goodsname;
/**当前单价*/
@Excel(name = "当前单价", width = 15)
@ApiModelProperty(value = "当前单价")
private java.lang.String price;
/**数量*/
@Excel(name = "数量", width = 15)
@ApiModelProperty(value = "数量")
private java.lang.String number;
/**收藏夹*/
@Excel(name = "收藏夹", width = 15, dictTable = "collect_type", dicText = "collect_type_name", dicCode = "id")
@Dict(dictTable = "collect_type", dicText = "collect_type_name", dicCode = "id")
/**收藏夹*/
@Excel(name = "收藏夹", width = 15, dictTable = "collect_type", dicText = "collect_type_name", dicCode = "id")
@Dict(dictTable = "collect_type", dicText = "collect_type_name", dicCode = "id")
@ApiModelProperty(value = "收藏夹")
private java.lang.String collectTypeId;
}

17
jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/device/controller/ZyDeviceController.java
Unescape View File

@ -102,12 +102,25 @@ public class ZyDeviceController extends JeecgController<ZyDevice, IZyDeviceServi
MatrixToImageWriter.writeToStream(bitMatrix, "PNG", outputStream);
Base64.Encoder encoder = Base64.getEncoder();
String text = encoder.encodeToString(outputStream.toByteArray());
pageList.getRecords().get(i).setErweima("data:image/png;base64,"+text);
pageList.getRecords().get(i).setQrcode("data:image/png;base64,"+text);
}
return Result.OK(pageList);
}
@AutoLog(value = "设备信息-分页列表查询")
@ApiOperation(value="设备信息-分页列表查询", notes="设备信息-分页列表查询")
@GetMapping(value = "/list1")
public Result<?> queryPageList1(ZyDevice zyDevice,
@RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
@RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
HttpServletRequest req) throws WriterException, IOException {
QueryWrapper<ZyDevice> queryWrapper = QueryGenerator.initQueryWrapper(zyDevice, req.getParameterMap());
Page<ZyDevice> page = new Page<ZyDevice>(pageNo, pageSize);
IPage<ZyDevice> pageList = zyDeviceService.page(page, queryWrapper);
return Result.OK(pageList);
}
/**
/**
* 添加
*
* @param zyDevice

33
jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/device/entity/ZyDevice.java
Unescape View File

@ -53,16 +53,16 @@ public class ZyDevice implements Serializable {
private Date updateTime;
/**所属部门*/
@ApiModelProperty(value = "所属部门")
private String sysOrgCode;
private String orgCode;
/**设备图片*/
@Excel(name = "设备图片", width = 15)
@ApiModelProperty(value = "设备图片")
private String img;
/**设备类型*/
@Excel(name = "设备类型", width = 15, dictTable = "zy_devicetype", dicText = "name", dicCode = "id")
@Dict(dictTable = "zy_devicetype", dicText = "name", dicCode = "id")
@ApiModelProperty(value = "设备类型")
private String typeid;
// @Excel(name = "设备类型", width = 15, dictTable = "zy_devicetype", dicText = "name", dicCode = "id")
// @Dict(dictTable = "zy_devicetype", dicText = "name", dicCode = "id")
// @ApiModelProperty(value = "设备类型")
// private String typeid;
/**设备编号*/
@Excel(name = "设备编号", width = 15)
@ApiModelProperty(value = "设备编号")
@ -79,9 +79,9 @@ public class ZyDevice implements Serializable {
@ApiModelProperty(value = "经办人")
private String agent;
/**存放位置*/
@Excel(name = "存放位置", width = 15)
@ApiModelProperty(value = "存放位置")
private String adress;
// @Excel(name = "存放位置", width = 15)
// @ApiModelProperty(value = "存放位置")
// private String adress;
/**设备状态*/
@Excel(name = "设备状态", width = 15)
@ApiModelProperty(value = "设备状态")
@ -89,11 +89,11 @@ public class ZyDevice implements Serializable {
/**二维码*/
@Excel(name = "二维码", width = 15)
@ApiModelProperty(value = "二维码")
private String erweima;
private String qrcode;
/**维护周期*/
@Excel(name = "维护周期", width = 15)
@ApiModelProperty(value = "维护周期")
private String maintenancecycle;
private Integer maintenancecycle;
/**管理人*/
@Excel(name = "管理人", width = 15, dictTable = "sys_user", dicText = "realname", dicCode = "username")
@Dict(dictTable = "sys_user", dicText = "realname", dicCode = "username")
@ -109,4 +109,17 @@ public class ZyDevice implements Serializable {
@Excel(name = "3d模型", width = 15)
@ApiModelProperty(value = "3d模型")
private String img3d;
// @Excel(name = "设备品牌", width = 15, dictTable = "sys_user", dicText = "realname", dicCode = "username")
@Dict(dictTable = "zy_devicebrand", dicText = "brand", dicCode = "id")
@ApiModelProperty(value = "设备品牌")
private String brandId;
@Dict(dictTable = "zy_devicemodel", dicText = "model", dicCode = "id")
@ApiModelProperty(value = "设备型号")
private String modelId;
@Dict(dictTable = "zy_devicetype", dicText = "name", dicCode = "id")
@ApiModelProperty(value = "设备类型")
private String typeCode;
@ApiModelProperty(value = "设备名称")
private String name;
}

2
jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/product/pdmachine/entity/ProductMachine.java
Unescape View File

@ -49,7 +49,7 @@ public class ProductMachine implements Serializable {
/**设备d*/
@Excel(name = "设备d", width = 15)
@ApiModelProperty(value = "设备d")
@Dict(dictTable = "zy_devicetype", dicText = "name", dicCode = "id")
@Dict(dictTable = "zy_device", dicText = "name", dicCode = "id")
private String machineId;
/**序号*/
@Excel(name = "序号", width = 15)

2
jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/product/pdmachine/mapper/ProductMachineMapper.java
Unescape View File

@ -18,7 +18,7 @@ import org.jeecg.modules.product.pdmachine.entity.ProductMachine;
*/
public interface ProductMachineMapper extends BaseMapper<ProductMachine> {
@Select("select id from zy_devicetype where name like #{s}")
@Select("select id from zy_device where name like #{s}")
List<String> find(String s);
@Update("update product_machine set sort=sort+1 where id=#{id}")

Write Preview
Loading…
Cancel
Save