diff --git a/ant-design-vue-jeecg/src/views/device/ZyDeviceList.vue b/ant-design-vue-jeecg/src/views/device/ZyDeviceList.vue index 337229fd..ae6f70a5 100644 --- a/ant-design-vue-jeecg/src/views/device/ZyDeviceList.vue +++ b/ant-design-vue-jeecg/src/views/device/ZyDeviceList.vue @@ -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", diff --git a/ant-design-vue-jeecg/src/views/erp/fabric/ZyFabricList.vue b/ant-design-vue-jeecg/src/views/erp/fabric/ZyFabricList.vue index 40347003..86acf01d 100644 --- a/ant-design-vue-jeecg/src/views/erp/fabric/ZyFabricList.vue +++ b/ant-design-vue-jeecg/src/views/erp/fabric/ZyFabricList.vue @@ -24,7 +24,7 @@ - 查询 重置 - - {{ toggleSearchStatus ? '收起' : '展开' }} - - diff --git a/ant-design-vue-jeecg/src/views/erp/fabric/modules/ZyFabricTypeForm.vue b/ant-design-vue-jeecg/src/views/erp/fabric/modules/ZyFabricTypeForm.vue index 22aa1bf0..1336eaef 100644 --- a/ant-design-vue-jeecg/src/views/erp/fabric/modules/ZyFabricTypeForm.vue +++ b/ant-design-vue-jeecg/src/views/erp/fabric/modules/ZyFabricTypeForm.vue @@ -74,7 +74,13 @@ created () { //使用随机的时候到后期数据量大时有可能出现问题，建议使用一套规则，后期需要添加循环判断，存在就让它重新生成，这里只写了两层，理论上是while循环 // this.model.nums=randomString(4) - var n=4 + + + this.modelDefault = JSON.parse(JSON.stringify(this.model)); + }, + methods: { + add () { + var n=4 getAction(this.url.weiyi,{id:this.model.nums}).then((res)=>{ var num=parseInt(res.message,10)+1 num=num.toString() @@ -83,14 +89,9 @@ } this.model.nums=num; console.log(num) - }) - - //备份model原始值 - console.log(this.model.nums) - this.modelDefault = JSON.parse(JSON.stringify(this.model)); - }, - methods: { - add () { + }) + //备份model原始值 + console.log(this.model.nums) this.edit(this.modelDefault); }, edit (record) { diff --git a/ant-design-vue-jeecg/src/views/process/modules/ZyOperationtoolList.vue b/ant-design-vue-jeecg/src/views/process/modules/ZyOperationtoolList.vue index 9f62c1b2..32409666 100644 --- a/ant-design-vue-jeecg/src/views/process/modules/ZyOperationtoolList.vue +++ b/ant-design-vue-jeecg/src/views/process/modules/ZyOperationtoolList.vue @@ -12,7 +12,7 @@ 查询 - + 重置 diff --git a/ant-design-vue-jeecg/src/views/process/modules/ZyProcessActionList.vue b/ant-design-vue-jeecg/src/views/process/modules/ZyProcessActionList.vue index e1b67cad..e652faba 100644 --- a/ant-design-vue-jeecg/src/views/process/modules/ZyProcessActionList.vue +++ b/ant-design-vue-jeecg/src/views/process/modules/ZyProcessActionList.vue @@ -12,7 +12,7 @@ 查询 - + 重置 diff --git a/ant-design-vue-jeecg/src/views/process/modules/ZyProcessComponentModal.vue b/ant-design-vue-jeecg/src/views/process/modules/ZyProcessComponentModal.vue index de5478d1..3b000b78 100644 --- a/ant-design-vue-jeecg/src/views/process/modules/ZyProcessComponentModal.vue +++ b/ant-design-vue-jeecg/src/views/process/modules/ZyProcessComponentModal.vue @@ -8,28 +8,44 @@ :okButtonProps="{ class:{'jee-hidden': disableSubmit} }" @cancel="handleCancel" cancelText="关闭"> - + + + \ No newline at end of file diff --git a/ant-design-vue-jeecg/src/views/zyProcessModular/ZyProcessModularList.vue b/ant-design-vue-jeecg/src/views/zyProcessModular/ZyProcessModularList.vue index d785390a..11a34200 100644 --- a/ant-design-vue-jeecg/src/views/zyProcessModular/ZyProcessModularList.vue +++ b/ant-design-vue-jeecg/src/views/zyProcessModular/ZyProcessModularList.vue @@ -216,13 +216,14 @@ export default { this.biaoTi = record.modularName+"模块工序管理"; //console.log(topicid); this.queryParam.modularId = this.model.id; - console.log("子弹窗拿到的ID++++++："+ this.queryParam.modularId); + //console.log("子弹窗拿到的ID++++++："+ this.queryParam.modularId); this.loadData(); this.visible = true; }, showModal1() { this.visible = true; }, + //进入弹窗是筛选list 重置也是 不是完整的无条件List 这个就是 valueChange(value) { if (value) this.loadData() }, diff --git a/ant-design-vue-jeecg/src/views/zyProcessModular/modules/ZyProcessList.vue b/ant-design-vue-jeecg/src/views/zyProcessModular/modules/ZyProcessList.vue new file mode 100644 index 00000000..ec9eed15 --- /dev/null +++ b/ant-design-vue-jeecg/src/views/zyProcessModular/modules/ZyProcessList.vue @@ -0,0 +1,293 @@ + + + + \ No newline at end of file diff --git a/ant-design-vue-jeecg/src/views/zyProcessModular/modules/ZyProcessModularModal.vue b/ant-design-vue-jeecg/src/views/zyProcessModular/modules/ZyProcessModularModal.vue index 68726fcc..bcce3f12 100644 --- a/ant-design-vue-jeecg/src/views/zyProcessModular/modules/ZyProcessModularModal.vue +++ b/ant-design-vue-jeecg/src/views/zyProcessModular/modules/ZyProcessModularModal.vue @@ -8,28 +8,44 @@ :okButtonProps="{ class:{'jee-hidden': disableSubmit} }" @cancel="handleCancel" cancelText="关闭"> - + + + \ No newline at end of file diff --git a/ant-design-vue-jeecg/src/views/zydevice/devicetype/modules/ZyDevicetypeForm.vue b/ant-design-vue-jeecg/src/views/zydevice/devicetype/modules/ZyDevicetypeForm.vue new file mode 100644 index 00000000..958bdbe3 --- /dev/null +++ b/ant-design-vue-jeecg/src/views/zydevice/devicetype/modules/ZyDevicetypeForm.vue @@ -0,0 +1,127 @@ + + + \ No newline at end of file diff --git a/ant-design-vue-jeecg/src/views/zydevice/devicetype/modules/ZyDevicetypeModal.vue b/ant-design-vue-jeecg/src/views/zydevice/devicetype/modules/ZyDevicetypeModal.vue new file mode 100644 index 00000000..80c6d220 --- /dev/null +++ b/ant-design-vue-jeecg/src/views/zydevice/devicetype/modules/ZyDevicetypeModal.vue @@ -0,0 +1,60 @@ + + + \ No newline at end of file diff --git a/ant-design-vue-jeecg/src/views/zydevice/devicetype/modules/ZyDevicetypeModal__Style#Drawer.vue b/ant-design-vue-jeecg/src/views/zydevice/devicetype/modules/ZyDevicetypeModal__Style#Drawer.vue new file mode 100644 index 00000000..cdd4f819 --- /dev/null +++ b/ant-design-vue-jeecg/src/views/zydevice/devicetype/modules/ZyDevicetypeModal__Style#Drawer.vue @@ -0,0 +1,84 @@ + + + + + \ No newline at end of file diff --git a/jeecg-boot/jeecg-boot-module-erp/src/main/java/org/jeecg/modules/demo/fabric/controller/ZyFabricController.java b/jeecg-boot/jeecg-boot-module-erp/src/main/java/org/jeecg/modules/demo/fabric/controller/ZyFabricController.java index 93b93350..a8d5f3bb 100644 --- a/jeecg-boot/jeecg-boot-module-erp/src/main/java/org/jeecg/modules/demo/fabric/controller/ZyFabricController.java +++ b/jeecg-boot/jeecg-boot-module-erp/src/main/java/org/jeecg/modules/demo/fabric/controller/ZyFabricController.java @@ -89,6 +89,15 @@ public class ZyFabricController extends JeecgController page = new Page<>(pageNo, pageSize); diff --git a/jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/base/controller/ZyProcessController.java b/jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/base/controller/ZyProcessController.java index 41cda422..130ac902 100644 --- a/jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/base/controller/ZyProcessController.java +++ b/jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/base/controller/ZyProcessController.java @@ -101,6 +101,44 @@ public class ZyProcessController extends JeecgController queryPageListScreenTwo(ZyProcess zyProcess, + @RequestParam(name = "clothsTypeId", required = true) String clothsTypeId, + @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo, + @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize, + HttpServletRequest req) { + //根据clothsTypeId 查到服装类型的编号 在根据编号进行筛选 + String nums = zyProcessService.getNums(clothsTypeId); + QueryWrapper queryWrappers = QueryGenerator.initQueryWrapper(zyProcess, req.getParameterMap()); + queryWrappers.eq(StringUtils.hasText(nums), "style_id", nums); + Page page = new Page<>(pageNo, pageSize); + IPage pageList = zyProcessService.page(page, queryWrappers); + return Result.OK(pageList); + } + + /** + * 制衣部件之部件工序中的工序接口 分页列表查询 + * 根据服装类型筛选list中的数据 + */ + @GetMapping(value = "/listScreenThree") + public Result queryPageListScreenThree(ZyProcess zyProcess, + @RequestParam(name = "clothsComponentId", required = true) String clothsComponentId, + @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo, + @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize, + HttpServletRequest req) { + //根据clothsTypeId 查到服装类型的编号 在根据编号进行筛选 + String nums = zyProcessService.getNumsByClothsComponentId(clothsComponentId); + QueryWrapper queryWrappers = QueryGenerator.initQueryWrapper(zyProcess, req.getParameterMap()); + queryWrappers.eq(StringUtils.hasText(nums), "style_id", nums); + Page page = new Page<>(pageNo, pageSize); + IPage pageList = zyProcessService.page(page, queryWrappers); + return Result.OK(pageList); + } + /** * 添加 * diff --git a/jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/base/mapper/ZyProcessMapper.java b/jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/base/mapper/ZyProcessMapper.java index e204f5ab..18b93a63 100644 --- a/jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/base/mapper/ZyProcessMapper.java +++ b/jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/base/mapper/ZyProcessMapper.java @@ -34,4 +34,10 @@ public interface ZyProcessMapper extends BaseMapper { @Select("select nums from zy_cloths_type where id=#{typeId}") String getNums(String typeId); + + @Select("select cloths_type_id from zy_cloths_modular where id=#{clothsTypeId}") + String getClothsTypeId(String clothsTypeId); + + @Select("select cloths_type_id from zy_cloths_component where id=#{clothsComponentId}") + String getClothsComponentId(String clothsComponentId); } diff --git a/jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/base/service/IZyProcessService.java b/jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/base/service/IZyProcessService.java index c2ff14af..15926534 100644 --- a/jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/base/service/IZyProcessService.java +++ b/jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/base/service/IZyProcessService.java @@ -24,4 +24,8 @@ public interface IZyProcessService extends IService { /**根据服装类型筛选list中的数据*/ String screenList(String clothStyleId); + + String getNums(String clothsTypeId); + + String getNumsByClothsComponentId(String clothsComponentId); } diff --git a/jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/base/service/impl/ZyProcessServiceImpl.java b/jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/base/service/impl/ZyProcessServiceImpl.java index 99ce0ab2..01d0557d 100644 --- a/jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/base/service/impl/ZyProcessServiceImpl.java +++ b/jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/base/service/impl/ZyProcessServiceImpl.java @@ -48,17 +48,29 @@ public class ZyProcessServiceImpl extends ServiceImpl list=baseMapper.selectByIds(id); diff --git a/jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/pro/controller/ZyProcessComponentController.java b/jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/pro/controller/ZyProcessComponentController.java index ecac0583..aefddbe9 100644 --- a/jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/pro/controller/ZyProcessComponentController.java +++ b/jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/pro/controller/ZyProcessComponentController.java @@ -1,5 +1,6 @@ package org.jeecg.modules.demo.pro.controller; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; @@ -27,6 +28,7 @@ import org.springframework.web.servlet.ModelAndView; import javax.annotation.Resource; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; +import java.time.LocalDateTime; import java.util.ArrayList; import java.util.Arrays; import java.util.List; @@ -131,8 +133,22 @@ public class ZyProcessComponentController extends JeecgController add(@RequestBody ZyProcessComponent zyProcessComponent) { - zyProcessComponentService.save(zyProcessComponent); - return Result.OK("添加成功！"); + //System.err.println("zyProcessComponent"+ zyProcessComponent+ LocalDateTime.now()); + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); + queryWrapper.eq(ZyProcessComponent::getComponentId,zyProcessComponent.getComponentId()); + String[] processIds = zyProcessComponent.getProcessId().split(","); + for (String processId : processIds) { + queryWrapper.eq( ZyProcessComponent::getProcessId,processId); + int count = zyProcessComponentService.count(queryWrapper); + if (count >= 1){ + return Result.error("存在已添加过的数据！"); + } + zyProcessComponent.setId(null); + zyProcessComponent.setProcessId(processId); + //System.out.println(""+zyProcessComponent + LocalDateTime.now()); + zyProcessComponentService.save(zyProcessComponent); + } + return Result.OK("添加成功"); } /** diff --git a/jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/pro/entity/ZyProcessMachine.java b/jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/pro/entity/ZyProcessMachine.java index 70f8a171..02bc86ef 100644 --- a/jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/pro/entity/ZyProcessMachine.java +++ b/jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/pro/entity/ZyProcessMachine.java @@ -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; /**创建时间*/ diff --git a/jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/pro/mapper/ZyProcessMachineMapper.java b/jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/pro/mapper/ZyProcessMachineMapper.java index 6518595e..d6a2a5ff 100644 --- a/jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/pro/mapper/ZyProcessMachineMapper.java +++ b/jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/pro/mapper/ZyProcessMachineMapper.java @@ -21,6 +21,6 @@ public interface ZyProcessMachineMapper extends BaseMapper { @Select("") IPage page(Page page, @Param("p") String processId, @Param("m") String machineId); - @Select("") + @Select("") IPage page1(Page page, @Param("p") String s, @Param("m") String t); } diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/device/controller/ZyDeviceController.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/device/controller/ZyDeviceController.java index 08872cc5..41ebe983 100644 --- a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/device/controller/ZyDeviceController.java +++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/device/controller/ZyDeviceController.java @@ -102,12 +102,25 @@ public class ZyDeviceController extends JeecgController queryPageList1(ZyDevice zyDevice, + @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, + @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, + HttpServletRequest req) throws WriterException, IOException { + QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(zyDevice, req.getParameterMap()); + Page page = new Page(pageNo, pageSize); + IPage pageList = zyDeviceService.page(page, queryWrapper); + return Result.OK(pageList); + } - /** + + /** * 添加 * * @param zyDevice diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/device/entity/ZyDevice.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/device/entity/ZyDevice.java index 7b239682..889f74f0 100644 --- a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/device/entity/ZyDevice.java +++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/device/entity/ZyDevice.java @@ -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; } diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/devicetype/controller/ZyDevicetypeController.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/devicetype/controller/ZyDevicetypeController.java deleted file mode 100644 index 34961978..00000000 --- a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/devicetype/controller/ZyDevicetypeController.java +++ /dev/null @@ -1,542 +0,0 @@ -package org.jeecg.modules.devicetype.controller; - -import com.google.zxing.BarcodeFormat; -import com.google.zxing.EncodeHintType; -import com.google.zxing.MultiFormatWriter; -import com.google.zxing.WriterException; -import com.google.zxing.client.j2se.MatrixToImageWriter; -import com.google.zxing.common.BitMatrix; -import com.google.zxing.qrcode.QRCodeWriter; -import com.google.zxing.qrcode.decoder.ErrorCorrectionLevel; -import org.jeecg.common.system.query.QueryGenerator; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import lombok.extern.slf4j.Slf4j; -import org.jeecg.common.system.base.controller.JeecgController; -import org.jeecg.common.api.vo.Result; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.*; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import org.springframework.web.servlet.ModelAndView; - -import java.io.ByteArrayOutputStream; -import java.util.*; - -import org.jeecg.common.util.oConvertUtils; -import org.jeecg.modules.devicetype.entity.ZyTypeparameters; -import org.jeecg.modules.devicetype.entity.ZyOperationparameters; -import org.jeecg.modules.devicetype.entity.ZyDevicetype; -import org.jeecg.modules.devicetype.service.IZyDevicetypeService; -import org.jeecg.modules.devicetype.service.IZyTypeparametersService; -import org.jeecg.modules.devicetype.service.IZyOperationparametersService; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; -import org.jeecg.common.aspect.annotation.AutoLog; -import org.apache.shiro.SecurityUtils; -import org.jeecg.common.system.vo.LoginUser; -import org.jeecgframework.poi.excel.ExcelImportUtil; -import org.jeecgframework.poi.excel.def.NormalExcelConstants; -import org.jeecgframework.poi.excel.entity.ExportParams; -import org.jeecgframework.poi.excel.entity.ImportParams; -import org.jeecgframework.poi.excel.view.JeecgEntityExcelView; -import org.springframework.web.multipart.MultipartFile; -import org.springframework.web.multipart.MultipartHttpServletRequest; -import java.io.IOException; -import java.util.stream.Collectors; - - /** - * @Description: 设备类型 - * @Author: jeecg-boot - * @Date: 2021-11-11 - * @Version: V1.0 - */ -@Api(tags="设备类型") -@RestController -@RequestMapping("/devicetype/zyDevicetype") -@Slf4j -public class ZyDevicetypeController extends JeecgController { - - @Autowired - private IZyDevicetypeService zyDevicetypeService; - - @Autowired - private IZyTypeparametersService zyTypeparametersService; - - @Autowired - private IZyOperationparametersService zyOperationparametersService; - - - /*---------------------------------主表处理-begin-------------------------------------*/ - - /** - * 分页列表查询 - * @param zyDevicetype - * @param pageNo - * @param pageSize - * @param req - * @return - */ - @AutoLog(value = "设备类型-分页列表查询") - @ApiOperation(value="设备类型-分页列表查询", notes="设备类型-分页列表查询") - @GetMapping(value = "/list") - public Result queryPageList(ZyDevicetype zyDevicetype, - @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, - @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, - HttpServletRequest req) throws WriterException, IOException { - QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(zyDevicetype, req.getParameterMap()); - Page page = new Page(pageNo, pageSize); - IPage pageList = zyDevicetypeService.page(page, queryWrapper); - - MultiFormatWriter multiFormatWriter = new MultiFormatWriter(); - @SuppressWarnings("rawtypes") - Map hints = new HashMap(); - //设置UTF-8， 防止中文乱码 - hints.put(EncodeHintType.CHARACTER_SET, "UTF-8"); - //设置二维码四周白色区域的大小 - hints.put(EncodeHintType.MARGIN, 1); - //设置二维码的容错性 - hints.put(EncodeHintType.ERROR_CORRECTION, ErrorCorrectionLevel.H); - //width:图片完整的宽;height:图片完整的高 - //因为要在二维码下方附上文字，所以把图片设置为长方形（高大于宽） - int width = 150; - int height = 150; - //画二维码，记得调用multiFormatWriter.encode()时最后要带上hints参数，不然上面设置无效 - QRCodeWriter qrCodeWriter = new QRCodeWriter(); - List img= new ArrayList<>(); - String content=""; - //批量生成二维码 - for (int i=0;i queryPageList1(ZyDevicetype zyDevicetype, - @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, - @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, - HttpServletRequest req) { - QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(zyDevicetype, req.getParameterMap()); - Page page = new Page(pageNo, pageSize); - IPage pageList = zyDevicetypeService.page(page, queryWrapper); - return Result.OK(pageList); - } - - - /** - * 通过id查询 - * - * @param id - * @return - */ - @AutoLog(value = "设备类型-通过id查询") - @ApiOperation(value="设备类型-通过id查询", notes="设备类型-通过id查询") - @GetMapping(value = "/queryById") - public Result queryById(@RequestParam(name="id",required=true) String id) { - ZyDevicetype zyDevicetype = zyDevicetypeService.getById(id); - if(zyDevicetype==null) { - return Result.error("未找到对应数据"); - } - return Result.OK(zyDevicetype); - - } - - /** - * 通过id查询 - * - * @param id - * @return - */ - @AutoLog(value = "类型参数通过主表ID查询") - @ApiOperation(value="类型参数主表ID查询", notes="类型参数-通主表ID查询") - @GetMapping(value = "/queryZyTypeparametersByMainId") - public Result queryZyTypeparametersListByMainId(@RequestParam(name="id",required=true) String id) { - List zyTypeparametersList = zyTypeparametersService.selectByMainId(id); - return Result.OK(zyTypeparametersList); - } - /** - * 通过id查询 - * - * @param id - * @return - */ - @AutoLog(value = "运行参数通过主表ID查询") - @ApiOperation(value="运行参数主表ID查询", notes="运行参数-通主表ID查询") - @GetMapping(value = "/queryZyOperationparametersByMainId") - public Result queryZyOperationparametersListByMainId(@RequestParam(name="id",required=true) String id) { - List zyOperationparametersList = zyOperationparametersService.selectByMainId(id); - return Result.OK(zyOperationparametersList); - } - - - - - - /** - * 添加 - * @param zyDevicetype - * @return - */ - @AutoLog(value = "设备类型-添加") - @ApiOperation(value="设备类型-添加", notes="设备类型-添加") - @PostMapping(value = "/add") - public Result add(@RequestBody ZyDevicetype zyDevicetype) { - zyDevicetypeService.save(zyDevicetype); - return Result.OK("添加成功！"); - } - - /** - * 编辑 - * @param zyDevicetype - * @return - */ - @AutoLog(value = "设备类型-编辑") - @ApiOperation(value="设备类型-编辑", notes="设备类型-编辑") - @PutMapping(value = "/edit") - public Result edit(@RequestBody ZyDevicetype zyDevicetype) { - zyDevicetypeService.updateById(zyDevicetype); - return Result.OK("编辑成功!"); - } - - /** - * 通过id删除 - * @param id - * @return - */ - @AutoLog(value = "设备类型-通过id删除") - @ApiOperation(value="设备类型-通过id删除", notes="设备类型-通过id删除") - @DeleteMapping(value = "/delete") - public Result delete(@RequestParam(name="id",required=true) String id) { - zyDevicetypeService.delMain(id); - return Result.OK("删除成功!"); - } - - /** - * 批量删除 - * @param ids - * @return - */ - @AutoLog(value = "设备类型-批量删除") - @ApiOperation(value="设备类型-批量删除", notes="设备类型-批量删除") - @DeleteMapping(value = "/deleteBatch") - public Result deleteBatch(@RequestParam(name="ids",required=true) String ids) { - this.zyDevicetypeService.delBatchMain(Arrays.asList(ids.split(","))); - return Result.OK("批量删除成功!"); - } - - /** - * 导出 - * @return - */ - @RequestMapping(value = "/exportXls") - public ModelAndView exportXls(HttpServletRequest request, ZyDevicetype zyDevicetype) { - return super.exportXls(request, zyDevicetype, ZyDevicetype.class, "设备类型"); - } - - /** - * 导入 - * @return - */ - @RequestMapping(value = "/importExcel", method = RequestMethod.POST) - public Result importExcel(HttpServletRequest request, HttpServletResponse response) { - return super.importExcel(request, response, ZyDevicetype.class); - } - /*---------------------------------主表处理-end-------------------------------------*/ - - - /*--------------------------------子表处理-类型参数-begin----------------------------------------------*/ - /** - * 通过主表ID查询 - * @return - */ - @AutoLog(value = "类型参数-通过主表ID查询") - @ApiOperation(value="类型参数-通过主表ID查询", notes="类型参数-通过主表ID查询") - @GetMapping(value = "/listZyTypeparametersByMainId") - public Result listZyTypeparametersByMainId(ZyTypeparameters zyTypeparameters, - @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo, - @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize, - HttpServletRequest req) { - QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(zyTypeparameters, req.getParameterMap()); - Page page = new Page(pageNo, pageSize); - IPage pageList = zyTypeparametersService.page(page, queryWrapper); - return Result.OK(pageList); - } - - /** - * 添加 - * @param zyTypeparameters - * @return - */ - @AutoLog(value = "类型参数-添加") - @ApiOperation(value="类型参数-添加", notes="类型参数-添加") - @PostMapping(value = "/addZyTypeparameters") - public Result addZyTypeparameters(@RequestBody ZyTypeparameters zyTypeparameters) { - zyTypeparametersService.save(zyTypeparameters); - return Result.OK("添加成功！"); - } - - /** - * 编辑 - * @param zyTypeparameters - * @return - */ - @AutoLog(value = "类型参数-编辑") - @ApiOperation(value="类型参数-编辑", notes="类型参数-编辑") - @PutMapping(value = "/editZyTypeparameters") - public Result editZyTypeparameters(@RequestBody ZyTypeparameters zyTypeparameters) { - zyTypeparametersService.updateById(zyTypeparameters); - return Result.OK("编辑成功!"); - } - - /** - * 通过id删除 - * @param id - * @return - */ - @AutoLog(value = "类型参数-通过id删除") - @ApiOperation(value="类型参数-通过id删除", notes="类型参数-通过id删除") - @DeleteMapping(value = "/deleteZyTypeparameters") - public Result deleteZyTypeparameters(@RequestParam(name="id",required=true) String id) { - zyTypeparametersService.removeById(id); - return Result.OK("删除成功!"); - } - - /** - * 批量删除 - * @param ids - * @return - */ - @AutoLog(value = "类型参数-批量删除") - @ApiOperation(value="类型参数-批量删除", notes="类型参数-批量删除") - @DeleteMapping(value = "/deleteBatchZyTypeparameters") - public Result deleteBatchZyTypeparameters(@RequestParam(name="ids",required=true) String ids) { - this.zyTypeparametersService.removeByIds(Arrays.asList(ids.split(","))); - return Result.OK("批量删除成功!"); - } - - /** - * 导出 - * @return - */ - @RequestMapping(value = "/exportZyTypeparameters") - public ModelAndView exportZyTypeparameters(HttpServletRequest request, ZyTypeparameters zyTypeparameters) { - // Step.1 组装查询条件 - QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(zyTypeparameters, request.getParameterMap()); - LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); - - // Step.2 获取导出数据 - List pageList = zyTypeparametersService.list(queryWrapper); - List exportList = null; - - // 过滤选中数据 - String selections = request.getParameter("selections"); - if (oConvertUtils.isNotEmpty(selections)) { - List selectionList = Arrays.asList(selections.split(",")); - exportList = pageList.stream().filter(item -> selectionList.contains(item.getId())).collect(Collectors.toList()); - } else { - exportList = pageList; - } - - // Step.3 AutoPoi 导出Excel - ModelAndView mv = new ModelAndView(new JeecgEntityExcelView()); - mv.addObject(NormalExcelConstants.FILE_NAME, "类型参数"); //此处设置的filename无效 ,前端会重更新设置一下 - mv.addObject(NormalExcelConstants.CLASS, ZyTypeparameters.class); - mv.addObject(NormalExcelConstants.PARAMS, new ExportParams("类型参数报表", "导出人:" + sysUser.getRealname(), "类型参数")); - mv.addObject(NormalExcelConstants.DATA_LIST, exportList); - return mv; - } - - /** - * 导入 - * @return - */ - @RequestMapping(value = "/importZyTypeparameters/{mainId}") - public Result importZyTypeparameters(HttpServletRequest request, HttpServletResponse response, @PathVariable("mainId") String mainId) { - MultipartHttpServletRequest multipartRequest = (MultipartHttpServletRequest) request; - Map fileMap = multipartRequest.getFileMap(); - for (Map.Entry entity : fileMap.entrySet()) { - MultipartFile file = entity.getValue();// 获取上传文件对象 - ImportParams params = new ImportParams(); - params.setTitleRows(2); - params.setHeadRows(1); - params.setNeedSave(true); - try { - List list = ExcelImportUtil.importExcel(file.getInputStream(), ZyTypeparameters.class, params); - for (ZyTypeparameters temp : list) { - temp.setTypeid(mainId); - } - long start = System.currentTimeMillis(); - zyTypeparametersService.saveBatch(list); - log.info("消耗时间" + (System.currentTimeMillis() - start) + "毫秒"); - return Result.OK("文件导入成功！数据行数：" + list.size()); - } catch (Exception e) { - log.error(e.getMessage(), e); - return Result.error("文件导入失败:" + e.getMessage()); - } finally { - try { - file.getInputStream().close(); - } catch (IOException e) { - e.printStackTrace(); - } - } - } - return Result.error("文件导入失败！"); - } - - /*--------------------------------子表处理-类型参数-end----------------------------------------------*/ - - /*--------------------------------子表处理-运行参数-begin----------------------------------------------*/ - /** - * 通过主表ID查询 - * @return - */ - @AutoLog(value = "运行参数-通过主表ID查询") - @ApiOperation(value="运行参数-通过主表ID查询", notes="运行参数-通过主表ID查询") - @GetMapping(value = "/listZyOperationparametersByMainId") - public Result listZyOperationparametersByMainId(ZyOperationparameters zyOperationparameters, - @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo, - @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize, - HttpServletRequest req) { - QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(zyOperationparameters, req.getParameterMap()); - Page page = new Page(pageNo, pageSize); - IPage pageList = zyOperationparametersService.page(page, queryWrapper); - return Result.OK(pageList); - } - - /** - * 添加 - * @param zyOperationparameters - * @return - */ - @AutoLog(value = "运行参数-添加") - @ApiOperation(value="运行参数-添加", notes="运行参数-添加") - @PostMapping(value = "/addZyOperationparameters") - public Result addZyOperationparameters(@RequestBody ZyOperationparameters zyOperationparameters) { - zyOperationparametersService.save(zyOperationparameters); - return Result.OK("添加成功！"); - } - - /** - * 编辑 - * @param zyOperationparameters - * @return - */ - @AutoLog(value = "运行参数-编辑") - @ApiOperation(value="运行参数-编辑", notes="运行参数-编辑") - @PutMapping(value = "/editZyOperationparameters") - public Result editZyOperationparameters(@RequestBody ZyOperationparameters zyOperationparameters) { - zyOperationparametersService.updateById(zyOperationparameters); - return Result.OK("编辑成功!"); - } - - /** - * 通过id删除 - * @param id - * @return - */ - @AutoLog(value = "运行参数-通过id删除") - @ApiOperation(value="运行参数-通过id删除", notes="运行参数-通过id删除") - @DeleteMapping(value = "/deleteZyOperationparameters") - public Result deleteZyOperationparameters(@RequestParam(name="id",required=true) String id) { - zyOperationparametersService.removeById(id); - return Result.OK("删除成功!"); - } - - /** - * 批量删除 - * @param ids - * @return - */ - @AutoLog(value = "运行参数-批量删除") - @ApiOperation(value="运行参数-批量删除", notes="运行参数-批量删除") - @DeleteMapping(value = "/deleteBatchZyOperationparameters") - public Result deleteBatchZyOperationparameters(@RequestParam(name="ids",required=true) String ids) { - this.zyOperationparametersService.removeByIds(Arrays.asList(ids.split(","))); - return Result.OK("批量删除成功!"); - } - - /** - * 导出 - * @return - */ - @RequestMapping(value = "/exportZyOperationparameters") - public ModelAndView exportZyOperationparameters(HttpServletRequest request, ZyOperationparameters zyOperationparameters) { - // Step.1 组装查询条件 - QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(zyOperationparameters, request.getParameterMap()); - LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); - - // Step.2 获取导出数据 - List pageList = zyOperationparametersService.list(queryWrapper); - List exportList = null; - - // 过滤选中数据 - String selections = request.getParameter("selections"); - if (oConvertUtils.isNotEmpty(selections)) { - List selectionList = Arrays.asList(selections.split(",")); - exportList = pageList.stream().filter(item -> selectionList.contains(item.getId())).collect(Collectors.toList()); - } else { - exportList = pageList; - } - - // Step.3 AutoPoi 导出Excel - ModelAndView mv = new ModelAndView(new JeecgEntityExcelView()); - mv.addObject(NormalExcelConstants.FILE_NAME, "运行参数"); //此处设置的filename无效 ,前端会重更新设置一下 - mv.addObject(NormalExcelConstants.CLASS, ZyOperationparameters.class); - mv.addObject(NormalExcelConstants.PARAMS, new ExportParams("运行参数报表", "导出人:" + sysUser.getRealname(), "运行参数")); - mv.addObject(NormalExcelConstants.DATA_LIST, exportList); - return mv; - } - - /** - * 导入 - * @return - */ - @RequestMapping(value = "/importZyOperationparameters/{mainId}") - public Result importZyOperationparameters(HttpServletRequest request, HttpServletResponse response, @PathVariable("mainId") String mainId) { - MultipartHttpServletRequest multipartRequest = (MultipartHttpServletRequest) request; - Map fileMap = multipartRequest.getFileMap(); - for (Map.Entry entity : fileMap.entrySet()) { - MultipartFile file = entity.getValue();// 获取上传文件对象 - ImportParams params = new ImportParams(); - params.setTitleRows(2); - params.setHeadRows(1); - params.setNeedSave(true); - try { - List list = ExcelImportUtil.importExcel(file.getInputStream(), ZyOperationparameters.class, params); - for (ZyOperationparameters temp : list) { - temp.setTypeid(mainId); - } - long start = System.currentTimeMillis(); - zyOperationparametersService.saveBatch(list); - log.info("消耗时间" + (System.currentTimeMillis() - start) + "毫秒"); - return Result.OK("文件导入成功！数据行数：" + list.size()); - } catch (Exception e) { - log.error(e.getMessage(), e); - return Result.error("文件导入失败:" + e.getMessage()); - } finally { - try { - file.getInputStream().close(); - } catch (IOException e) { - e.printStackTrace(); - } - } - } - return Result.error("文件导入失败！"); - } - - /*--------------------------------子表处理-运行参数-end----------------------------------------------*/ - - - - -} diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/devicetype/entity/ZyDevicetype.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/devicetype/entity/ZyDevicetype.java deleted file mode 100644 index 7a027512..00000000 --- a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/devicetype/entity/ZyDevicetype.java +++ /dev/null @@ -1,101 +0,0 @@ -package org.jeecg.modules.devicetype.entity; - -import java.io.Serializable; -import java.io.UnsupportedEncodingException; -import java.util.Date; -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import org.jeecgframework.poi.excel.annotation.Excel; -import lombok.Data; -import com.fasterxml.jackson.annotation.JsonFormat; -import org.springframework.format.annotation.DateTimeFormat; -import org.jeecg.common.aspect.annotation.Dict; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; - -/** - * @Description: 设备类型 - * @Author: jeecg-boot - * @Date: 2021-11-11 - * @Version: V1.0 - */ -@Data -@TableName("zy_devicetype") -@ApiModel(value="zy_devicetype对象", description="设备类型") -public class ZyDevicetype implements Serializable { - private static final long serialVersionUID = 1L; - - /**主键*/ - @TableId(type = IdType.ASSIGN_ID) - @ApiModelProperty(value = "主键") - private String id; - /**创建人*/ - @ApiModelProperty(value = "创建人") - private String createBy; - /**创建日期*/ - @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") - @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") - @ApiModelProperty(value = "创建日期") - private Date createTime; - /**更新人*/ - @ApiModelProperty(value = "更新人") - private String updateBy; - /**更新日期*/ - @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") - @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") - @ApiModelProperty(value = "更新日期") - private Date updateTime; - /**所属部门*/ - @ApiModelProperty(value = "所属部门") - private String sysOrgCode; - /**父级节点*/ - @Excel(name = "父级节点", width = 15) - @ApiModelProperty(value = "父级节点") - private String pid; - /**是否有子节点*/ - @Excel(name = "是否有子节点", width = 15, dicCode = "yn") - @Dict(dicCode = "yn") - @ApiModelProperty(value = "是否有子节点") - private String hasChild; - /**类型编号*/ - @Excel(name = "类型编号", width = 15) - @ApiModelProperty(value = "类型编号") - private String code; - /**类型名称*/ - @Excel(name = "类型名称", width = 15) - @ApiModelProperty(value = "类型名称") - private String name; - /**类型图片*/ - @Excel(name = "类型图片", width = 15) - @ApiModelProperty(value = "类型图片") - private String img; - /**类型品牌*/ - @Excel(name = "类型品牌", width = 15) - @ApiModelProperty(value = "类型品牌") - private String brand; - /**型号*/ - @Excel(name = "型号", width = 15) - @ApiModelProperty(value = "型号") - private String model; - /**生产厂商*/ - @Excel(name = "生产厂商", width = 15) - @ApiModelProperty(value = "生产厂商") - private String manufacturer; - /**供货商*/ - @Excel(name = "供货商", width = 15) - @ApiModelProperty(value = "供货商") - private String supplier; - /**联系人*/ - @Excel(name = "联系人", width = 15) - @ApiModelProperty(value = "联系人") - private String contact; - /**产地*/ - @Excel(name = "产地", width = 15) - @ApiModelProperty(value = "产地") - private String place; - /**二维码*/ - @Excel(name = "二维码", width = 15) - @ApiModelProperty(value = "二维码") - private String erweima; -} diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/devicetype/entity/ZyTypeparameters.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/devicetype/entity/ZyTypeparameters.java deleted file mode 100644 index ca01d74e..00000000 --- a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/devicetype/entity/ZyTypeparameters.java +++ /dev/null @@ -1,63 +0,0 @@ -package org.jeecg.modules.devicetype.entity; - -import java.io.Serializable; -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import org.jeecg.common.aspect.annotation.Dict; -import lombok.Data; -import com.fasterxml.jackson.annotation.JsonFormat; -import org.springframework.format.annotation.DateTimeFormat; -import org.jeecgframework.poi.excel.annotation.Excel; -import java.util.Date; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import java.io.UnsupportedEncodingException; - -/** - * @Description: 类型参数 - * @Author: jeecg-boot - * @Date: 2021-11-11 - * @Version: V1.0 - */ -@Data -@TableName("zy_typeparameters") -@ApiModel(value="zy_typeparameters对象", description="类型参数") -public class ZyTypeparameters implements Serializable { - private static final long serialVersionUID = 1L; - - /**主键*/ - @TableId(type = IdType.ASSIGN_ID) - @ApiModelProperty(value = "主键") - private String id; - /**创建人*/ - @ApiModelProperty(value = "创建人") - private String createBy; - /**创建日期*/ - @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") - @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") - @ApiModelProperty(value = "创建日期") - private Date createTime; - /**更新人*/ - @ApiModelProperty(value = "更新人") - private String updateBy; - /**更新日期*/ - @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") - @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") - @ApiModelProperty(value = "更新日期") - private Date updateTime; - /**所属部门*/ - @ApiModelProperty(value = "所属部门") - private String sysOrgCode; - /**设备类型*/ - @ApiModelProperty(value = "设备类型") - private String typeid; - /**参数名*/ - @Excel(name = "参数名", width = 15) - @ApiModelProperty(value = "参数名") - private String parametersname; - /**参数值*/ - @Excel(name = "参数值", width = 15) - @ApiModelProperty(value = "参数值") - private String parametersvalue; -} diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/devicetype/mapper/ZyOperationparametersMapper.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/devicetype/mapper/ZyOperationparametersMapper.java deleted file mode 100644 index 452193c7..00000000 --- a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/devicetype/mapper/ZyOperationparametersMapper.java +++ /dev/null @@ -1,20 +0,0 @@ -package org.jeecg.modules.devicetype.mapper; - -import java.util.List; -import org.jeecg.modules.devicetype.entity.ZyOperationparameters; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import org.apache.ibatis.annotations.Param; - -/** - * @Description: 运行参数 - * @Author: jeecg-boot - * @Date: 2021-11-11 - * @Version: V1.0 - */ -public interface ZyOperationparametersMapper extends BaseMapper { - - public boolean deleteByMainId(@Param("mainId") String mainId); - - public List selectByMainId(@Param("mainId") String mainId); - -} diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/devicetype/mapper/ZyTypeparametersMapper.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/devicetype/mapper/ZyTypeparametersMapper.java deleted file mode 100644 index 1ced8664..00000000 --- a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/devicetype/mapper/ZyTypeparametersMapper.java +++ /dev/null @@ -1,20 +0,0 @@ -package org.jeecg.modules.devicetype.mapper; - -import java.util.List; -import org.jeecg.modules.devicetype.entity.ZyTypeparameters; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import org.apache.ibatis.annotations.Param; - -/** - * @Description: 类型参数 - * @Author: jeecg-boot - * @Date: 2021-11-11 - * @Version: V1.0 - */ -public interface ZyTypeparametersMapper extends BaseMapper { - - public boolean deleteByMainId(@Param("mainId") String mainId); - - public List selectByMainId(@Param("mainId") String mainId); - -} diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/devicetype/mapper/xml/ZyOperationparametersMapper.xml b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/devicetype/mapper/xml/ZyOperationparametersMapper.xml deleted file mode 100644 index 67527b02..00000000 --- a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/devicetype/mapper/xml/ZyOperationparametersMapper.xml +++ /dev/null @@ -1,18 +0,0 @@ - - - - - - DELETE - FROM zy_operationparameters - WHERE - typeid = #{mainId} - - - - diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/devicetype/mapper/xml/ZyTypeparametersMapper.xml b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/devicetype/mapper/xml/ZyTypeparametersMapper.xml deleted file mode 100644 index 84ec4c4c..00000000 --- a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/devicetype/mapper/xml/ZyTypeparametersMapper.xml +++ /dev/null @@ -1,18 +0,0 @@ - - - - - - DELETE - FROM zy_typeparameters - WHERE - typeid = #{mainId} - - - - diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/devicetype/service/IZyDevicetypeService.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/devicetype/service/IZyDevicetypeService.java deleted file mode 100644 index 3fd34199..00000000 --- a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/devicetype/service/IZyDevicetypeService.java +++ /dev/null @@ -1,32 +0,0 @@ -package org.jeecg.modules.devicetype.service; - -import org.jeecg.modules.devicetype.entity.ZyTypeparameters; -import org.jeecg.modules.devicetype.entity.ZyOperationparameters; -import org.jeecg.modules.devicetype.entity.ZyDevicetype; -import com.baomidou.mybatisplus.extension.service.IService; -import org.springframework.beans.factory.annotation.Autowired; -import java.io.Serializable; -import java.util.Collection; -import java.util.List; - -/** - * @Description: 设备类型 - * @Author: jeecg-boot - * @Date: 2021-11-11 - * @Version: V1.0 - */ -public interface IZyDevicetypeService extends IService { - - /** - * 删除一对多 - */ - public void delMain (String id); - - /** - * 批量删除一对多 - */ - public void delBatchMain (Collection idList); - - - List selectByid(String id); -} diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/devicetype/service/IZyOperationparametersService.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/devicetype/service/IZyOperationparametersService.java deleted file mode 100644 index ecec47dc..00000000 --- a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/devicetype/service/IZyOperationparametersService.java +++ /dev/null @@ -1,16 +0,0 @@ -package org.jeecg.modules.devicetype.service; - -import org.jeecg.modules.devicetype.entity.ZyOperationparameters; -import com.baomidou.mybatisplus.extension.service.IService; -import java.util.List; - -/** - * @Description: 运行参数 - * @Author: jeecg-boot - * @Date: 2021-11-11 - * @Version: V1.0 - */ -public interface IZyOperationparametersService extends IService { - - public List selectByMainId(String mainId); -} diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/devicetype/service/IZyTypeparametersService.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/devicetype/service/IZyTypeparametersService.java deleted file mode 100644 index d1a42fc3..00000000 --- a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/devicetype/service/IZyTypeparametersService.java +++ /dev/null @@ -1,16 +0,0 @@ -package org.jeecg.modules.devicetype.service; - -import org.jeecg.modules.devicetype.entity.ZyTypeparameters; -import com.baomidou.mybatisplus.extension.service.IService; -import java.util.List; - -/** - * @Description: 类型参数 - * @Author: jeecg-boot - * @Date: 2021-11-11 - * @Version: V1.0 - */ -public interface IZyTypeparametersService extends IService { - - public List selectByMainId(String mainId); -} diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/devicetype/service/impl/ZyDevicetypeServiceImpl.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/devicetype/service/impl/ZyDevicetypeServiceImpl.java deleted file mode 100644 index 7734cdfe..00000000 --- a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/devicetype/service/impl/ZyDevicetypeServiceImpl.java +++ /dev/null @@ -1,57 +0,0 @@ -package org.jeecg.modules.devicetype.service.impl; - -import org.jeecg.modules.devicetype.entity.ZyDevicetype; -import org.jeecg.modules.devicetype.entity.ZyTypeparameters; -import org.jeecg.modules.devicetype.entity.ZyOperationparameters; -import org.jeecg.modules.devicetype.mapper.ZyTypeparametersMapper; -import org.jeecg.modules.devicetype.mapper.ZyOperationparametersMapper; -import org.jeecg.modules.devicetype.mapper.ZyDevicetypeMapper; -import org.jeecg.modules.devicetype.service.IZyDevicetypeService; -import org.springframework.stereotype.Service; -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.transaction.annotation.Transactional; -import java.io.Serializable; -import java.util.List; -import java.util.Collection; - -/** - * @Description: 设备类型 - * @Author: jeecg-boot - * @Date: 2021-11-11 - * @Version: V1.0 - */ -@Service -public class ZyDevicetypeServiceImpl extends ServiceImpl implements IZyDevicetypeService { - - @Autowired - private ZyDevicetypeMapper zyDevicetypeMapper; - @Autowired - private ZyTypeparametersMapper zyTypeparametersMapper; - @Autowired - private ZyOperationparametersMapper zyOperationparametersMapper; - - @Override - @Transactional - public void delMain(String id) { - zyTypeparametersMapper.deleteByMainId(id); - zyOperationparametersMapper.deleteByMainId(id); - zyDevicetypeMapper.deleteById(id); - } - - @Override - @Transactional - public void delBatchMain(Collection idList) { - for(Serializable id:idList) { - zyTypeparametersMapper.deleteByMainId(id.toString()); - zyOperationparametersMapper.deleteByMainId(id.toString()); - zyDevicetypeMapper.deleteById(id); - } - } - - @Override - public List selectByid(String id) { - return zyDevicetypeMapper.selectByid(id); - } - -} diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/devicetype/service/impl/ZyOperationparametersServiceImpl.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/devicetype/service/impl/ZyOperationparametersServiceImpl.java deleted file mode 100644 index 3335cf83..00000000 --- a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/devicetype/service/impl/ZyOperationparametersServiceImpl.java +++ /dev/null @@ -1,27 +0,0 @@ -package org.jeecg.modules.devicetype.service.impl; - -import org.jeecg.modules.devicetype.entity.ZyOperationparameters; -import org.jeecg.modules.devicetype.mapper.ZyOperationparametersMapper; -import org.jeecg.modules.devicetype.service.IZyOperationparametersService; -import org.springframework.stereotype.Service; -import java.util.List; -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import org.springframework.beans.factory.annotation.Autowired; - -/** - * @Description: 运行参数 - * @Author: jeecg-boot - * @Date: 2021-11-11 - * @Version: V1.0 - */ -@Service -public class ZyOperationparametersServiceImpl extends ServiceImpl implements IZyOperationparametersService { - - @Autowired - private ZyOperationparametersMapper zyOperationparametersMapper; - - @Override - public List selectByMainId(String mainId) { - return zyOperationparametersMapper.selectByMainId(mainId); - } -} diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/devicetype/service/impl/ZyTypeparametersServiceImpl.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/devicetype/service/impl/ZyTypeparametersServiceImpl.java deleted file mode 100644 index b2f58bc1..00000000 --- a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/devicetype/service/impl/ZyTypeparametersServiceImpl.java +++ /dev/null @@ -1,27 +0,0 @@ -package org.jeecg.modules.devicetype.service.impl; - -import org.jeecg.modules.devicetype.entity.ZyTypeparameters; -import org.jeecg.modules.devicetype.mapper.ZyTypeparametersMapper; -import org.jeecg.modules.devicetype.service.IZyTypeparametersService; -import org.springframework.stereotype.Service; -import java.util.List; -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import org.springframework.beans.factory.annotation.Autowired; - -/** - * @Description: 类型参数 - * @Author: jeecg-boot - * @Date: 2021-11-11 - * @Version: V1.0 - */ -@Service -public class ZyTypeparametersServiceImpl extends ServiceImpl implements IZyTypeparametersService { - - @Autowired - private ZyTypeparametersMapper zyTypeparametersMapper; - - @Override - public List selectByMainId(String mainId) { - return zyTypeparametersMapper.selectByMainId(mainId); - } -} diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/product/pdmachine/entity/ProductMachine.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/product/pdmachine/entity/ProductMachine.java index 05e7ec14..34911d5e 100644 --- a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/product/pdmachine/entity/ProductMachine.java +++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/product/pdmachine/entity/ProductMachine.java @@ -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) diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/product/pdmachine/mapper/ProductMachineMapper.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/product/pdmachine/mapper/ProductMachineMapper.java index 9584a5b0..238dbf64 100644 --- a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/product/pdmachine/mapper/ProductMachineMapper.java +++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/product/pdmachine/mapper/ProductMachineMapper.java @@ -18,7 +18,7 @@ import org.jeecg.modules.product.pdmachine.entity.ProductMachine; */ public interface ProductMachineMapper extends BaseMapper { - @Select("select id from zy_devicetype where name like #{s}") + @Select("select id from zy_device where name like #{s}") List find(String s); @Update("update product_machine set sort=sort+1 where id=#{id}") diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/zyProcessModular/controller/ZyProcessModularController.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/zyProcessModular/controller/ZyProcessModularController.java index 31b61641..d1e88aa1 100644 --- a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/zyProcessModular/controller/ZyProcessModularController.java +++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/zyProcessModular/controller/ZyProcessModularController.java @@ -1,5 +1,6 @@ package org.jeecg.modules.zyProcessModular.controller; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; @@ -18,6 +19,7 @@ import org.springframework.web.servlet.ModelAndView; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; +import java.time.LocalDateTime; import java.util.Arrays; /** @@ -66,8 +68,22 @@ public class ZyProcessModularController extends JeecgController add(@RequestBody ZyProcessModular zyProcessModular) { - zyProcessModularService.save(zyProcessModular); + public Result add(@RequestBody ZyProcessModular zyProcessModular) { + //System.err.println("zyProcessModular"+ zyProcessModular+ LocalDateTime.now()); + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); + queryWrapper.eq( ZyProcessModular::getModularId,zyProcessModular.getModularId()); + String[] processIds = zyProcessModular.getProcessId().split(","); + for (String processId : processIds) { + queryWrapper.eq( ZyProcessModular::getProcessId,processId); + int count = zyProcessModularService.count(queryWrapper); + if (count >= 1){ + return Result.error("存在已添加过的数据！"); + } + zyProcessModular.setId(null); + zyProcessModular.setProcessId(processId); + //System.out.println(""+zyProcessModular + LocalDateTime.now()); + zyProcessModularService.save(zyProcessModular); + } return Result.OK("添加成功！"); } diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/zydevice/devicetype/controller/ZyDevicetypeController.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/zydevice/devicetype/controller/ZyDevicetypeController.java new file mode 100644 index 00000000..04b4ea08 --- /dev/null +++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/zydevice/devicetype/controller/ZyDevicetypeController.java @@ -0,0 +1,198 @@ +package org.jeecg.modules.zydevice.devicetype.controller; + +import java.util.Arrays; +import java.util.List; +import java.util.Map; +import java.util.stream.Collectors; +import java.io.IOException; +import java.io.UnsupportedEncodingException; +import java.net.URLDecoder; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import org.jeecg.common.api.vo.Result; +import org.jeecg.common.system.query.QueryGenerator; +import org.jeecg.common.util.oConvertUtils; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import lombok.extern.slf4j.Slf4j; + +import org.jeecg.modules.zydevice.devicetype.entity.ZyDevicetype; +import org.jeecg.modules.zydevice.devicetype.service.IZyDevicetypeService; +import org.jeecgframework.poi.excel.ExcelImportUtil; +import org.jeecgframework.poi.excel.def.NormalExcelConstants; +import org.jeecgframework.poi.excel.entity.ExportParams; +import org.jeecgframework.poi.excel.entity.ImportParams; +import org.jeecgframework.poi.excel.view.JeecgEntityExcelView; +import org.jeecg.common.system.base.controller.JeecgController; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; +import org.springframework.web.multipart.MultipartFile; +import org.springframework.web.multipart.MultipartHttpServletRequest; +import org.springframework.web.servlet.ModelAndView; +import com.alibaba.fastjson.JSON; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.jeecg.common.aspect.annotation.AutoLog; + + /** + * @Description: 设备类型 + * @Author: jeecg-boot + * @Date: 2023-01-04 + * @Version: V1.0 + */ +@Api(tags="设备类型") +@RestController +@RequestMapping("/devicetype/zyDevicetype") +@Slf4j +public class ZyDevicetypeController extends JeecgController { + @Autowired + private IZyDevicetypeService zyDevicetypeService; + + /** + * 分页列表查询 + * + * @param zyDevicetype + * @param pageNo + * @param pageSize + * @param req + * @return + */ + @AutoLog(value = "设备类型-分页列表查询") + @ApiOperation(value="设备类型-分页列表查询", notes="设备类型-分页列表查询") + @GetMapping(value = "/list") + public Result queryPageList(ZyDevicetype zyDevicetype, + @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, + @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, + HttpServletRequest req) { + QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(zyDevicetype, req.getParameterMap()); + queryWrapper.orderByDesc("code"); + Page page = new Page(pageNo, pageSize); + IPage pageList = zyDevicetypeService.page(page, queryWrapper); + return Result.OK(pageList); + } + + /** + * 添加 + * + * @param zyDevicetype + * @return + */ + @AutoLog(value = "设备类型-添加") + @ApiOperation(value="设备类型-添加", notes="设备类型-添加") + @PostMapping(value = "/add") + public Result add(@RequestBody ZyDevicetype zyDevicetype) { + QueryWrapper queryWrapper=new QueryWrapper(); + queryWrapper.eq("name",zyDevicetype.getName()); + int a=zyDevicetypeService.count(queryWrapper); + if(a==0){ + zyDevicetypeService.save(zyDevicetype); + return Result.OK("添加成功！");} + else{ + return Result.error("添加失败，该设备名称已存在！"); + } + } + + /** + * 编辑 + * + * @param zyDevicetype + * @return + */ + @AutoLog(value = "设备类型-编辑") + @ApiOperation(value="设备类型-编辑", notes="设备类型-编辑") + @PutMapping(value = "/edit") + public Result edit(@RequestBody ZyDevicetype zyDevicetype) { + QueryWrapper queryWrapper=new QueryWrapper(); + queryWrapper.eq("name",zyDevicetype.getName()); + int a=zyDevicetypeService.count(queryWrapper); + if(a==0){ + zyDevicetypeService.updateById(zyDevicetype); + return Result.OK("编辑成功!");} + else{ + return Result.error("编辑失败，设备名重复！！"); + } + } + + /** + * 通过id删除 + * + * @param id + * @return + */ + @AutoLog(value = "设备类型-通过id删除") + @ApiOperation(value="设备类型-通过id删除", notes="设备类型-通过id删除") + @DeleteMapping(value = "/delete") + public Result delete(@RequestParam(name="id",required=true) String id) { + zyDevicetypeService.removeById(id); + return Result.OK("删除成功!"); + } + + /** + * 批量删除 + * + * @param ids + * @return + */ + @AutoLog(value = "设备类型-批量删除") + @ApiOperation(value="设备类型-批量删除", notes="设备类型-批量删除") + @DeleteMapping(value = "/deleteBatch") + public Result deleteBatch(@RequestParam(name="ids",required=true) String ids) { + this.zyDevicetypeService.removeByIds(Arrays.asList(ids.split(","))); + return Result.OK("批量删除成功!"); + } + + /** + * 通过id查询 + * + * @param id + * @return + */ + @AutoLog(value = "设备类型-通过id查询") + @ApiOperation(value="设备类型-通过id查询", notes="设备类型-通过id查询") + @GetMapping(value = "/queryById") + public Result queryById(@RequestParam(name="id",required=true) String id) { + ZyDevicetype zyDevicetype = zyDevicetypeService.getById(id); + if(zyDevicetype==null) { + return Result.error("未找到对应数据"); + } + return Result.OK(zyDevicetype); + } + + /** + * 导出excel + * + * @param request + * @param zyDevicetype + */ + @RequestMapping(value = "/exportXls") + public ModelAndView exportXls(HttpServletRequest request, ZyDevicetype zyDevicetype) { + return super.exportXls(request, zyDevicetype, ZyDevicetype.class, "设备类型"); + } + + /** + * 通过excel导入数据 + * + * @param request + * @param response + * @return + */ + @RequestMapping(value = "/importExcel", method = RequestMethod.POST) + public Result importExcel(HttpServletRequest request, HttpServletResponse response) { + return super.importExcel(request, response, ZyDevicetype.class); + } + + @AutoLog(value = "唯一") + @ApiOperation(value="设备类型-分页列表查询", notes="设备类型-分页列表查询") + @GetMapping(value = "/weiyi") + public Result weiyi() { + String lastCode=zyDevicetypeService.findCode(); + if(lastCode==null||lastCode.equals("")){ + return Result.OK("0"); + } + return Result.OK(lastCode.substring(1)); + } + + + } diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/devicetype/entity/ZyOperationparameters.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/zydevice/devicetype/entity/ZyDevicetype.java similarity index 63% rename from jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/devicetype/entity/ZyOperationparameters.java rename to jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/zydevice/devicetype/entity/ZyDevicetype.java index eae4b063..cab4bfb5 100644 --- a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/devicetype/entity/ZyOperationparameters.java +++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/zydevice/devicetype/entity/ZyDevicetype.java @@ -1,29 +1,36 @@ -package org.jeecg.modules.devicetype.entity; +package org.jeecg.modules.zydevice.devicetype.entity; + + import java.io.Serializable; +import java.io.UnsupportedEncodingException; +import java.util.Date; +import java.math.BigDecimal; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; -import org.jeecg.common.aspect.annotation.Dict; import lombok.Data; import com.fasterxml.jackson.annotation.JsonFormat; import org.springframework.format.annotation.DateTimeFormat; import org.jeecgframework.poi.excel.annotation.Excel; -import java.util.Date; +import org.jeecg.common.aspect.annotation.Dict; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; -import java.io.UnsupportedEncodingException; +import lombok.EqualsAndHashCode; +import lombok.experimental.Accessors; /** - * @Description: 运行参数 + * @Description: 设备类型 * @Author: jeecg-boot - * @Date: 2021-11-11 + * @Date: 2023-01-04 * @Version: V1.0 */ @Data -@TableName("zy_operationparameters") -@ApiModel(value="zy_operationparameters对象", description="运行参数") -public class ZyOperationparameters implements Serializable { +@TableName("zy_devicetype") +@Accessors(chain = true) +@EqualsAndHashCode(callSuper = false) +@ApiModel(value="zy_devicetype对象", description="设备类型") +public class ZyDevicetype implements Serializable { private static final long serialVersionUID = 1L; /**主键*/ @@ -46,18 +53,16 @@ public class ZyOperationparameters implements Serializable { @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") @ApiModelProperty(value = "更新日期") private Date updateTime; - /**所属部门*/ - @ApiModelProperty(value = "所属部门") - private String sysOrgCode; - /**设备类型*/ - @ApiModelProperty(value = "设备类型") - private String typeid; - /**参数名*/ - @Excel(name = "参数名", width = 15) - @ApiModelProperty(value = "参数名") - private String parametersname; - /**参数值*/ - @Excel(name = "参数值", width = 15) - @ApiModelProperty(value = "参数值") - private String parametersvalue; + /**类型编号*/ + @Excel(name = "类型编号", width = 15) + @ApiModelProperty(value = "类型编号") + private String code; + /**类型名称*/ + @Excel(name = "类型名称", width = 15) + @ApiModelProperty(value = "类型名称") + private String name; + /**类型图片*/ + @Excel(name = "类型图片", width = 15) + @ApiModelProperty(value = "类型图片") + private String img; } diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/devicetype/mapper/ZyDevicetypeMapper.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/zydevice/devicetype/mapper/ZyDevicetypeMapper.java similarity index 52% rename from jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/devicetype/mapper/ZyDevicetypeMapper.java rename to jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/zydevice/devicetype/mapper/ZyDevicetypeMapper.java index 92704dba..a8bad6e7 100644 --- a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/devicetype/mapper/ZyDevicetypeMapper.java +++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/zydevice/devicetype/mapper/ZyDevicetypeMapper.java @@ -1,20 +1,21 @@ -package org.jeecg.modules.devicetype.mapper; +package org.jeecg.modules.zydevice.devicetype.mapper; import java.util.List; import org.apache.ibatis.annotations.Param; -import org.apache.ibatis.annotations.Select; -import org.jeecg.modules.devicetype.entity.ZyDevicetype; + import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.apache.ibatis.annotations.Select; +import org.jeecg.modules.zydevice.devicetype.entity.ZyDevicetype; /** * @Description: 设备类型 * @Author: jeecg-boot - * @Date: 2021-11-11 + * @Date: 2023-01-04 * @Version: V1.0 */ public interface ZyDevicetypeMapper extends BaseMapper { - @Select("select * from zy_devicetype where id in (select machine_id from zy_process_machine where process_id=#{id})") - List selectByid(String id); + @Select("select code from zy_devicetype order by code desc limit 0,1") + String findCode(); } diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/devicetype/mapper/xml/ZyDevicetypeMapper.xml b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/zydevice/devicetype/mapper/xml/ZyDevicetypeMapper.xml similarity index 61% rename from jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/devicetype/mapper/xml/ZyDevicetypeMapper.xml rename to jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/zydevice/devicetype/mapper/xml/ZyDevicetypeMapper.xml index ca4713f8..3bf493e1 100644 --- a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/devicetype/mapper/xml/ZyDevicetypeMapper.xml +++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/zydevice/devicetype/mapper/xml/ZyDevicetypeMapper.xml @@ -1,5 +1,5 @@ - + - + \ No newline at end of file diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/zydevice/devicetype/service/IZyDevicetypeService.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/zydevice/devicetype/service/IZyDevicetypeService.java new file mode 100644 index 00000000..c99b8b08 --- /dev/null +++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/zydevice/devicetype/service/IZyDevicetypeService.java @@ -0,0 +1,16 @@ +package org.jeecg.modules.zydevice.devicetype.service; + + +import com.baomidou.mybatisplus.extension.service.IService; +import org.jeecg.modules.zydevice.devicetype.entity.ZyDevicetype; + +/** + * @Description: 设备类型 + * @Author: jeecg-boot + * @Date: 2023-01-04 + * @Version: V1.0 + */ +public interface IZyDevicetypeService extends IService { + + String findCode(); +} diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/zydevice/devicetype/service/impl/ZyDevicetypeServiceImpl.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/zydevice/devicetype/service/impl/ZyDevicetypeServiceImpl.java new file mode 100644 index 00000000..73c0f626 --- /dev/null +++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/zydevice/devicetype/service/impl/ZyDevicetypeServiceImpl.java @@ -0,0 +1,27 @@ +package org.jeecg.modules.zydevice.devicetype.service.impl; + + +import org.jeecg.modules.zydevice.devicetype.entity.ZyDevicetype; +import org.jeecg.modules.zydevice.devicetype.mapper.ZyDevicetypeMapper; +import org.jeecg.modules.zydevice.devicetype.service.IZyDevicetypeService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; + +/** + * @Description: 设备类型 + * @Author: jeecg-boot + * @Date: 2023-01-04 + * @Version: V1.0 + */ +@Service +public class ZyDevicetypeServiceImpl extends ServiceImpl implements IZyDevicetypeService { + + @Autowired + ZyDevicetypeMapper zyDevicetypeMapper; + @Override + public String findCode() { + return zyDevicetypeMapper.findCode(); + } +} diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/zystylefabric/controller/ZyStyleFabricController.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/zystylefabric/controller/ZyStyleFabricController.java index ec6de5b1..fb4a3d8f 100644 --- a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/zystylefabric/controller/ZyStyleFabricController.java +++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/zystylefabric/controller/ZyStyleFabricController.java @@ -110,7 +110,7 @@ public class ZyStyleFabricController extends JeecgController= 1) - return Result.error("存在以添加过的数据！！！"); + return Result.error("存在已添加过的数据！！！"); zyStyleFabricService.save(zyStyleFabric); } return Result.OK("添加成功！");