From 73dcc3513ba7f4a58d6f782322acef41b748845a Mon Sep 17 00:00:00 2001 From: chuang <994001556@qq.com> Date: Mon, 13 Feb 2023 10:56:56 +0800 Subject: [PATCH] =?UTF-8?q?=E7=9B=91=E6=8E=A7=E6=B8=85=E5=8D=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mapper/Monitoring_itemMapper.java | 17 - .../Monitoring_itemPaginationExportModel.java | 26 -- .../service/Monitoring_itemService.java | 36 -- .../impl/Monitoring_itemServiceImpl.java | 212 ----------- .../controller/MonitoringitemController.java} | 106 +++--- .../entity/MonitoringitemEntity.java} | 30 +- .../mapper/MonitoringitemMapper.java | 17 + .../monitoringitem/MonitoringitemCrForm.java} | 6 +- .../monitoringitem/MonitoringitemInfoVO.java} | 6 +- .../MonitoringitemListQuery.java} | 9 +- .../monitoringitem/MonitoringitemListVO.java} | 6 +- .../MonitoringitemPagination.java} | 9 +- .../MonitoringitemPaginationExportModel.java} | 9 +- .../monitoringitem/MonitoringitemUpForm.java} | 6 +- .../service/MonitoringitemService.java | 36 ++ .../impl/MonitoringitemServiceImpl.java | 222 ++++++++++++ .../utils/IDUtils.java | 2 +- .../utils/ImouConfig.java | 22 +- .../controller/MonitormanageController.java | 342 ------------------ .../entity/MonitormanageEntity.java | 85 ----- .../mapper/MonitormanageMapper.java | 17 - .../monitormanage/MonitormanageCrForm.java | 64 ---- .../monitormanage/MonitormanageInfoVO.java | 66 ---- .../monitormanage/MonitormanageListQuery.java | 24 -- .../monitormanage/MonitormanageListVO.java | 79 ---- .../MonitormanagePagination.java | 25 -- .../monitormanage/MonitormanageUpForm.java | 76 ---- .../service/MonitormanageService.java | 34 -- .../impl/MonitormanageServiceImpl.java | 222 ------------ .../monitorItem/Monitoring_itemMapper.xml | 2 +- .../basicInformation/inventoryOrd/Form.vue | 6 +- .../basicInformation/monitormanage/Detail.vue | 2 +- .../basicInformation/monitormanage/Form.vue | 6 +- .../basicInformation/monitormanage/index.vue | 12 +- 34 files changed, 400 insertions(+), 1439 deletions(-) delete mode 100644 SC-boot/linkage-scm/src/main/java/jnpf/monitorItem/mapper/Monitoring_itemMapper.java delete mode 100644 SC-boot/linkage-scm/src/main/java/jnpf/monitorItem/model/monitoring_item/Monitoring_itemPaginationExportModel.java delete mode 100644 SC-boot/linkage-scm/src/main/java/jnpf/monitorItem/service/Monitoring_itemService.java delete mode 100644 SC-boot/linkage-scm/src/main/java/jnpf/monitorItem/service/impl/Monitoring_itemServiceImpl.java rename SC-boot/linkage-scm/src/main/java/jnpf/{monitorItem/controller/Monitoring_itemController.java => monitoringitem/controller/MonitoringitemController.java} (74%) rename SC-boot/linkage-scm/src/main/java/jnpf/{monitorItem/entity/Monitoring_itemEntity.java => monitoringitem/entity/MonitoringitemEntity.java} (76%) create mode 100644 SC-boot/linkage-scm/src/main/java/jnpf/monitoringitem/mapper/MonitoringitemMapper.java rename SC-boot/linkage-scm/src/main/java/jnpf/{monitorItem/model/monitoring_item/Monitoring_itemCrForm.java => monitoringitem/model/monitoringitem/MonitoringitemCrForm.java} (92%) rename SC-boot/linkage-scm/src/main/java/jnpf/{monitorItem/model/monitoring_item/Monitoring_itemInfoVO.java => monitoringitem/model/monitoringitem/MonitoringitemInfoVO.java} (93%) rename SC-boot/linkage-scm/src/main/java/jnpf/{monitorItem/model/monitoring_item/Monitoring_itemListQuery.java => monitoringitem/model/monitoringitem/MonitoringitemListQuery.java} (62%) rename SC-boot/linkage-scm/src/main/java/jnpf/{monitorItem/model/monitoring_item/Monitoring_itemListVO.java => monitoringitem/model/monitoringitem/MonitoringitemListVO.java} (93%) rename SC-boot/linkage-scm/src/main/java/jnpf/{monitorItem/model/monitoring_item/Monitoring_itemPagination.java => monitoringitem/model/monitoringitem/MonitoringitemPagination.java} (60%) rename SC-boot/linkage-scm/src/main/java/jnpf/{monitormanage/model/monitormanage/MonitormanagePaginationExportModel.java => monitoringitem/model/monitoringitem/MonitoringitemPaginationExportModel.java} (61%) rename SC-boot/linkage-scm/src/main/java/jnpf/{monitorItem/model/monitoring_item/Monitoring_itemUpForm.java => monitoringitem/model/monitoringitem/MonitoringitemUpForm.java} (92%) create mode 100644 SC-boot/linkage-scm/src/main/java/jnpf/monitoringitem/service/MonitoringitemService.java create mode 100644 SC-boot/linkage-scm/src/main/java/jnpf/monitoringitem/service/impl/MonitoringitemServiceImpl.java rename SC-boot/linkage-scm/src/main/java/jnpf/{monitorItem => monitoringitem}/utils/IDUtils.java (84%) rename SC-boot/linkage-scm/src/main/java/jnpf/{monitorItem => monitoringitem}/utils/ImouConfig.java (95%) delete mode 100644 SC-boot/linkage-scm/src/main/java/jnpf/monitormanage/controller/MonitormanageController.java delete mode 100644 SC-boot/linkage-scm/src/main/java/jnpf/monitormanage/entity/MonitormanageEntity.java delete mode 100644 SC-boot/linkage-scm/src/main/java/jnpf/monitormanage/mapper/MonitormanageMapper.java delete mode 100644 SC-boot/linkage-scm/src/main/java/jnpf/monitormanage/model/monitormanage/MonitormanageCrForm.java delete mode 100644 SC-boot/linkage-scm/src/main/java/jnpf/monitormanage/model/monitormanage/MonitormanageInfoVO.java delete mode 100644 SC-boot/linkage-scm/src/main/java/jnpf/monitormanage/model/monitormanage/MonitormanageListQuery.java delete mode 100644 SC-boot/linkage-scm/src/main/java/jnpf/monitormanage/model/monitormanage/MonitormanageListVO.java delete mode 100644 SC-boot/linkage-scm/src/main/java/jnpf/monitormanage/model/monitormanage/MonitormanagePagination.java delete mode 100644 SC-boot/linkage-scm/src/main/java/jnpf/monitormanage/model/monitormanage/MonitormanageUpForm.java delete mode 100644 SC-boot/linkage-scm/src/main/java/jnpf/monitormanage/service/MonitormanageService.java delete mode 100644 SC-boot/linkage-scm/src/main/java/jnpf/monitormanage/service/impl/MonitormanageServiceImpl.java diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/monitorItem/mapper/Monitoring_itemMapper.java b/SC-boot/linkage-scm/src/main/java/jnpf/monitorItem/mapper/Monitoring_itemMapper.java deleted file mode 100644 index f6c47f51..00000000 --- a/SC-boot/linkage-scm/src/main/java/jnpf/monitorItem/mapper/Monitoring_itemMapper.java +++ /dev/null @@ -1,17 +0,0 @@ -package jnpf.monitorItem.mapper; - - -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import jnpf.monitorItem.entity.Monitoring_itemEntity; - -/** - * - * 监控管理 - * 版本： V3.2.0 - * 版权： LINKAGE-BOOT - * 作者： LINKAGE-BOOT研发团队 - * 日期： 2023-02-07 - */ -public interface Monitoring_itemMapper extends BaseMapper { - -} diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/monitorItem/model/monitoring_item/Monitoring_itemPaginationExportModel.java b/SC-boot/linkage-scm/src/main/java/jnpf/monitorItem/model/monitoring_item/Monitoring_itemPaginationExportModel.java deleted file mode 100644 index e8b23e2b..00000000 --- a/SC-boot/linkage-scm/src/main/java/jnpf/monitorItem/model/monitoring_item/Monitoring_itemPaginationExportModel.java +++ /dev/null @@ -1,26 +0,0 @@ -package jnpf.monitorItem.model.monitoring_item; - -import lombok.Data; -import jnpf.base.Pagination; -import java.util.*; -/** - * - * - * @版本： V3.2.0 - * @版权： LINKAGE-BOOT - * @作者： LINKAGE-BOOT研发团队 - * @日期： 2023-02-07 - */ -@Data -public class Monitoring_itemPaginationExportModel extends Pagination { - - private String selectKey; - - private String json; - - private String dataType; - - - /** 设备名称 */ - private String mName; -} \ No newline at end of file diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/monitorItem/service/Monitoring_itemService.java b/SC-boot/linkage-scm/src/main/java/jnpf/monitorItem/service/Monitoring_itemService.java deleted file mode 100644 index bac56e08..00000000 --- a/SC-boot/linkage-scm/src/main/java/jnpf/monitorItem/service/Monitoring_itemService.java +++ /dev/null @@ -1,36 +0,0 @@ -package jnpf.monitorItem.service; - - -import com.baomidou.mybatisplus.extension.service.IService; -import jnpf.monitorItem.entity.Monitoring_itemEntity; -import jnpf.monitorItem.model.monitoring_item.Monitoring_itemPagination; - -import java.util.List; -/** - * - * 监控管理 - * 版本： V3.2.0 - * 版权： LINKAGE-BOOT - * 作者： LINKAGE-BOOT研发团队 - * 日期： 2023-02-07 - */ -public interface Monitoring_itemService extends IService { - - List getList(Monitoring_itemPagination monitoring_itemPagination); - - List getTypeList(Monitoring_itemPagination monitoring_itemPagination,String dataType); - - - - Monitoring_itemEntity getInfo(String id); - - void delete(Monitoring_itemEntity entity); - - void create(Monitoring_itemEntity entity); - - boolean update( String id, Monitoring_itemEntity entity); - -// 子表方法 - - //列表子表数据方法 -} diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/monitorItem/service/impl/Monitoring_itemServiceImpl.java b/SC-boot/linkage-scm/src/main/java/jnpf/monitorItem/service/impl/Monitoring_itemServiceImpl.java deleted file mode 100644 index a10dfd3b..00000000 --- a/SC-boot/linkage-scm/src/main/java/jnpf/monitorItem/service/impl/Monitoring_itemServiceImpl.java +++ /dev/null @@ -1,212 +0,0 @@ -package jnpf.monitorItem.service.impl; - -import cn.hutool.core.util.ObjectUtil; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import jnpf.monitorItem.entity.Monitoring_itemEntity; -import jnpf.monitorItem.mapper.Monitoring_itemMapper; -import jnpf.monitorItem.model.monitoring_item.Monitoring_itemPagination; -import jnpf.monitorItem.service.Monitoring_itemService; -import jnpf.permission.model.authorize.AuthorizeConditionModel; -import jnpf.permission.service.AuthorizeService; -import jnpf.util.ServletUtil; -import jnpf.util.StringUtil; -import jnpf.util.UserProvider; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; - -import java.lang.reflect.Field; -import java.util.ArrayList; -import java.util.List; - -/** - * - * 监控管理 - * 版本： V3.2.0 - * 版权： LINKAGE-BOOT - * 作者： LINKAGE-BOOT研发团队 - * 日期： 2023-02-07 - */ -@Service -public class Monitoring_itemServiceImpl extends ServiceImpl implements Monitoring_itemService { - - - @Autowired - private UserProvider userProvider; - - @Autowired - private AuthorizeService authorizeService; - - - - - - @Override - public List getList(Monitoring_itemPagination monitoring_itemPagination){ - String userId=userProvider.get().getUserId(); - List AllIdList =new ArrayList(); - int total=0; - int monitoring_itemNum =0; - QueryWrapper monitoring_itemQueryWrapper=new QueryWrapper<>(); - boolean pcPermission = false; - boolean appPermission = false; - boolean isPc = ServletUtil.getHeader("jnpf-origin").equals("pc"); - if(isPc && pcPermission){ - if (!userProvider.get().getIsAdministrator()){ - Object monitoring_itemObj=authorizeService.getCondition(new AuthorizeConditionModel(monitoring_itemQueryWrapper,monitoring_itemPagination.getMenuId(),"monitoring_item")); - if (ObjectUtil.isEmpty(monitoring_itemObj)){ - return new ArrayList<>(); - } else { - monitoring_itemQueryWrapper = (QueryWrapper)monitoring_itemObj; - monitoring_itemNum++; - } - } - } - if(!isPc && appPermission){ - if (!userProvider.get().getIsAdministrator()){ - Object monitoring_itemObj=authorizeService.getCondition(new AuthorizeConditionModel(monitoring_itemQueryWrapper,monitoring_itemPagination.getMenuId(),"monitoring_item")); - if (ObjectUtil.isEmpty(monitoring_itemObj)){ - return new ArrayList<>(); - } else { - monitoring_itemQueryWrapper = (QueryWrapper)monitoring_itemObj; - monitoring_itemNum++; - } - - - } - } - if(StringUtil.isNotEmpty(monitoring_itemPagination.getMName())){ - monitoring_itemNum++; - monitoring_itemQueryWrapper.lambda().like(Monitoring_itemEntity::getMName,monitoring_itemPagination.getMName()); - } - - if(AllIdList.size()>0){ - monitoring_itemQueryWrapper.lambda().in(Monitoring_itemEntity::getId, AllIdList); - } - //排序 - if(StringUtil.isEmpty(monitoring_itemPagination.getSidx())){ - monitoring_itemQueryWrapper.lambda().orderByDesc(Monitoring_itemEntity::getLastModifyTime); - }else{ - try { - String sidx = monitoring_itemPagination.getSidx(); - Monitoring_itemEntity monitoring_itemEntity = new Monitoring_itemEntity(); - Field declaredField = monitoring_itemEntity.getClass().getDeclaredField(sidx); - declaredField.setAccessible(true); - String value = declaredField.getAnnotation(TableField.class).value(); - monitoring_itemQueryWrapper="asc".equals(monitoring_itemPagination.getSort().toLowerCase())?monitoring_itemQueryWrapper.orderByAsc(value):monitoring_itemQueryWrapper.orderByDesc(value); - } catch (NoSuchFieldException e) { - e.printStackTrace(); - } - } - if((total>0 && AllIdList.size()>0) || total==0){ - Page page=new Page<>(monitoring_itemPagination.getCurrentPage(), monitoring_itemPagination.getPageSize()); - IPage userIPage=this.page(page, monitoring_itemQueryWrapper); - return monitoring_itemPagination.setData(userIPage.getRecords(),userIPage.getTotal()); - }else{ - List list = new ArrayList(); - return monitoring_itemPagination.setData(list, list.size()); - } - } - @Override - public List getTypeList(Monitoring_itemPagination monitoring_itemPagination,String dataType){ - String userId=userProvider.get().getUserId(); - List AllIdList =new ArrayList(); - int total=0; - int monitoring_itemNum =0; - QueryWrapper monitoring_itemQueryWrapper=new QueryWrapper<>(); - boolean pcPermission = false; - boolean appPermission = false; - boolean isPc = ServletUtil.getHeader("jnpf-origin").equals("pc"); - if(isPc && pcPermission){ - if (!userProvider.get().getIsAdministrator()){ - Object monitoring_itemObj=authorizeService.getCondition(new AuthorizeConditionModel(monitoring_itemQueryWrapper,monitoring_itemPagination.getMenuId(),"monitoring_item")); - if (ObjectUtil.isEmpty(monitoring_itemObj)){ - return new ArrayList<>(); - } else { - monitoring_itemQueryWrapper = (QueryWrapper)monitoring_itemObj; - monitoring_itemNum++; - } - } - } - if(!isPc && appPermission){ - if (!userProvider.get().getIsAdministrator()){ - Object monitoring_itemObj=authorizeService.getCondition(new AuthorizeConditionModel(monitoring_itemQueryWrapper,monitoring_itemPagination.getMenuId(),"monitoring_item")); - if (ObjectUtil.isEmpty(monitoring_itemObj)){ - return new ArrayList<>(); - } else { - monitoring_itemQueryWrapper = (QueryWrapper)monitoring_itemObj; - monitoring_itemNum++; - } - - - } - } - if(StringUtil.isNotEmpty(monitoring_itemPagination.getMName())){ - monitoring_itemNum++; - monitoring_itemQueryWrapper.lambda().like(Monitoring_itemEntity::getMName,monitoring_itemPagination.getMName()); - } - - if(AllIdList.size()>0){ - monitoring_itemQueryWrapper.lambda().in(Monitoring_itemEntity::getId, AllIdList); - } - //排序 - if(StringUtil.isEmpty(monitoring_itemPagination.getSidx())){ - monitoring_itemQueryWrapper.lambda().orderByDesc(Monitoring_itemEntity::getLastModifyTime); - }else{ - try { - String sidx = monitoring_itemPagination.getSidx(); - Monitoring_itemEntity monitoring_itemEntity = new Monitoring_itemEntity(); - Field declaredField = monitoring_itemEntity.getClass().getDeclaredField(sidx); - declaredField.setAccessible(true); - String value = declaredField.getAnnotation(TableField.class).value(); - monitoring_itemQueryWrapper="asc".equals(monitoring_itemPagination.getSort().toLowerCase())?monitoring_itemQueryWrapper.orderByAsc(value):monitoring_itemQueryWrapper.orderByDesc(value); - } catch (NoSuchFieldException e) { - e.printStackTrace(); - } - } - if("0".equals(dataType)){ - if((total>0 && AllIdList.size()>0) || total==0){ - Page page=new Page<>(monitoring_itemPagination.getCurrentPage(), monitoring_itemPagination.getPageSize()); - IPage userIPage=this.page(page, monitoring_itemQueryWrapper); - return monitoring_itemPagination.setData(userIPage.getRecords(),userIPage.getTotal()); - }else{ - List list = new ArrayList(); - return monitoring_itemPagination.setData(list, list.size()); - } - }else{ - return this.list(monitoring_itemQueryWrapper); - } - } - - @Override - public Monitoring_itemEntity getInfo(String id){ - QueryWrapper queryWrapper=new QueryWrapper<>(); - queryWrapper.lambda().eq(Monitoring_itemEntity::getId,id); - return this.getOne(queryWrapper); - } - - @Override - public void create(Monitoring_itemEntity entity){ - this.save(entity); - } - - @Override - public boolean update(String id, Monitoring_itemEntity entity){ - entity.setId(id); - return this.updateById(entity); - } - @Override - public void delete(Monitoring_itemEntity entity){ - if(entity!=null){ - this.removeById(entity.getId()); - } - } - //子表方法 - - //列表子表数据方法 - - -} \ No newline at end of file diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/monitorItem/controller/Monitoring_itemController.java b/SC-boot/linkage-scm/src/main/java/jnpf/monitoringitem/controller/MonitoringitemController.java similarity index 74% rename from SC-boot/linkage-scm/src/main/java/jnpf/monitorItem/controller/Monitoring_itemController.java rename to SC-boot/linkage-scm/src/main/java/jnpf/monitoringitem/controller/MonitoringitemController.java index 9e30b214..24d15db7 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/monitorItem/controller/Monitoring_itemController.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/monitoringitem/controller/MonitoringitemController.java @@ -1,6 +1,6 @@ -package jnpf.monitorItem.controller; +package jnpf.monitoringitem.controller; import cn.afterturn.easypoi.excel.ExcelExportUtil; import cn.afterturn.easypoi.excel.entity.ExportParams; @@ -17,10 +17,10 @@ import jnpf.base.vo.PageListVO; import jnpf.base.vo.PaginationVO; import jnpf.config.ConfigValueUtil; import jnpf.exception.DataException; -import jnpf.monitorItem.entity.Monitoring_itemEntity; -import jnpf.monitorItem.model.monitoring_item.*; -import jnpf.monitorItem.service.Monitoring_itemService; -import jnpf.monitorItem.utils.ImouConfig; +import jnpf.monitoringitem.entity.MonitoringitemEntity; +import jnpf.monitoringitem.model.monitoringitem.*; +import jnpf.monitoringitem.service.MonitoringitemService; +import jnpf.monitoringitem.utils.ImouConfig; import jnpf.util.*; import jnpf.util.enums.FileTypeEnum; import jnpf.util.file.UploadUtil; @@ -42,17 +42,17 @@ import java.util.Map; /** * - * 监控管理 + * 监控清单 * @版本： V3.2.0 * @版权： LINKAGE-BOOT * @作者： LINKAGE-BOOT研发团队 - * @日期： 2023-02-07 + * @日期： 2023-02-13 */ @Slf4j @RestController -@Api(tags = "监控管理" , value = "example") -@RequestMapping("/api/example/Jg_monitoring_item0") -public class Monitoring_itemController { +@Api(tags = "监控清单" , value = "example") +@RequestMapping("/api/example/Monitoringitem") +public class MonitoringitemController { @Autowired private GeneraterSwapUtil generaterSwapUtil; @@ -64,7 +64,9 @@ public class Monitoring_itemController { private UserProvider userProvider; @Autowired - private Monitoring_itemService monitoring_itemService; + private MonitoringitemService monitoringitemService; + + @ApiOperation("更新摄像头视频流地址") @GetMapping("/updateMonitoring") public ActionResult updateMonitoring() throws Exception { @@ -96,34 +98,34 @@ public class Monitoring_itemController { String deviceId = String.valueOf(flvLive.get("deviceId")); // 设备通道号 String channelId = String.valueOf(flvLive.get("channelId")); - Monitoring_itemEntity monitor = new Monitoring_itemEntity(); + MonitoringitemEntity monitor = new MonitoringitemEntity(); // 设置区域为日照金属 monitor.setMonitoringId("1"); monitor.setMName("NVR-3FA0-"+i); monitor.setSerialnumber(deviceId); monitor.setMStatus("1"); - monitor.setFlvAddress(flv); - monitor.setFlvHdAddress(flvHD); - monitor.setChannelNumber(channelId); + monitor.setFlvaddress(flv); + monitor.setFlvhdaddress(flvHD); + monitor.setChannelnumber(channelId); // boolean save = monitoring_itemService.save(monitor); // 2 查询本地表中此通道是否存在 - LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); - wrapper.eq(Monitoring_itemEntity::getChannelNumber,channelId); - Monitoring_itemEntity one = monitoring_itemService.getOne(wrapper); + LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); + wrapper.eq(MonitoringitemEntity::getChannelnumber,channelId); + MonitoringitemEntity one = monitoringitemService.getOne(wrapper); if (one!=null){ // 3 存在根据返回的id进行更新 monitor.setMName(null); monitor.setLastModifyUserId("1"); monitor.setLastModifyUserName("admin"); monitor.setLastModifyTime(new Date()); - monitoring_itemService.update(monitor,wrapper); + monitoringitemService.update(monitor,wrapper); }else{ // 4 不存在进行保存 monitor.setCreatorTime(new Date()); monitor.setCreatorUserId("1"); monitor.setCreatorUserName("admin"); - monitoring_itemService.save(monitor); + monitoringitemService.save(monitor); } } @@ -131,28 +133,28 @@ public class Monitoring_itemController { } + /** * 列表 * - * @param monitoring_itemPagination + * @param monitoringitemPagination * @return */ - @ApiOperation("列表") @PostMapping("/getList") - public ActionResult list(@RequestBody Monitoring_itemPagination monitoring_itemPagination)throws IOException{ - List list= monitoring_itemService.getList(monitoring_itemPagination); + public ActionResult list(@RequestBody MonitoringitemPagination monitoringitemPagination)throws IOException{ + List list= monitoringitemService.getList(monitoringitemPagination); //处理id字段转名称，若无需转或者为空可删除 - for(Monitoring_itemEntity entity:list){ + for(MonitoringitemEntity entity:list){ entity.setMonitoringId(generaterSwapUtil.getDynName("370933183241262469" ,"m_name" ,"id","" ,entity.getMonitoringId())); } - List listVO=JsonUtil.getJsonToList(list,Monitoring_itemListVO.class); - for(Monitoring_itemListVO monitoring_itemVO:listVO){ + List listVO=JsonUtil.getJsonToList(list,MonitoringitemListVO.class); + for(MonitoringitemListVO monitoringitemVO:listVO){ } PageListVO vo=new PageListVO(); vo.setList(listVO); - PaginationVO page=JsonUtil.getJsonToBean(monitoring_itemPagination,PaginationVO.class); + PaginationVO page=JsonUtil.getJsonToBean(monitoringitemPagination,PaginationVO.class); vo.setPagination(page); return ActionResult.success(vo); } @@ -161,17 +163,17 @@ public class Monitoring_itemController { /** * 创建 * - * @param monitoring_itemCrForm + * @param monitoringitemCrForm * @return */ @PostMapping @Transactional - public ActionResult create(@RequestBody @Valid Monitoring_itemCrForm monitoring_itemCrForm) throws DataException { + public ActionResult create(@RequestBody @Valid MonitoringitemCrForm monitoringitemCrForm) throws DataException { String mainId =RandomUtil.uuId(); UserInfo userInfo=userProvider.get(); - Monitoring_itemEntity entity = JsonUtil.getJsonToBean(monitoring_itemCrForm, Monitoring_itemEntity.class); + MonitoringitemEntity entity = JsonUtil.getJsonToBean(monitoringitemCrForm, MonitoringitemEntity.class); entity.setId(mainId); - monitoring_itemService.save(entity); + monitoringitemService.save(entity); return ActionResult.success("创建成功"); @@ -204,23 +206,23 @@ public class Monitoring_itemController { */ @ApiOperation("导出Excel") @GetMapping("/Actions/Export") - public ActionResult Export(Monitoring_itemPaginationExportModel monitoring_itemPaginationExportModel) throws IOException { - if (StringUtil.isEmpty(monitoring_itemPaginationExportModel.getSelectKey())){ + public ActionResult Export(MonitoringitemPaginationExportModel monitoringitemPaginationExportModel) throws IOException { + if (StringUtil.isEmpty(monitoringitemPaginationExportModel.getSelectKey())){ return ActionResult.fail("请选择导出字段"); } - Monitoring_itemPagination monitoring_itemPagination=JsonUtil.getJsonToBean(monitoring_itemPaginationExportModel, Monitoring_itemPagination.class); - List list= monitoring_itemService.getTypeList(monitoring_itemPagination,monitoring_itemPaginationExportModel.getDataType()); + MonitoringitemPagination monitoringitemPagination=JsonUtil.getJsonToBean(monitoringitemPaginationExportModel, MonitoringitemPagination.class); + List list= monitoringitemService.getTypeList(monitoringitemPagination,monitoringitemPaginationExportModel.getDataType()); //处理id字段转名称，若无需转或者为空可删除 - for(Monitoring_itemEntity entity:list){ + for(MonitoringitemEntity entity:list){ entity.setMonitoringId(generaterSwapUtil.getDynName("370933183241262469" ,"m_name" ,"id","" ,entity.getMonitoringId())); } - List listVO=JsonUtil.getJsonToList(list,Monitoring_itemListVO.class); - for(Monitoring_itemListVO monitoring_itemVO:listVO){ + List listVO=JsonUtil.getJsonToList(list,MonitoringitemListVO.class); + for(MonitoringitemListVO monitoringitemVO:listVO){ } //转换为map输出 List>mapList=JsonUtil.getJsonToListMap(JsonUtil.getObjectToStringDateFormat(listVO,"yyyy-MM-dd HH:mm:ss")); - String[]keys=!StringUtil.isEmpty(monitoring_itemPaginationExportModel.getSelectKey())?monitoring_itemPaginationExportModel.getSelectKey().split(","):new String[0]; + String[]keys=!StringUtil.isEmpty(monitoringitemPaginationExportModel.getSelectKey())?monitoringitemPaginationExportModel.getSelectKey().split(","):new String[0]; UserInfo userInfo=userProvider.get(); DownloadVO vo=this.creatModelExcel(configValueUtil.getTemporaryFilePath(),mapList,keys,userInfo); return ActionResult.success(vo); @@ -328,9 +330,9 @@ public class Monitoring_itemController { * @return */ @GetMapping("/{id}") - public ActionResult info(@PathVariable("id") String id){ - Monitoring_itemEntity entity= monitoring_itemService.getInfo(id); - Monitoring_itemInfoVO vo=JsonUtil.getJsonToBean(entity, Monitoring_itemInfoVO.class); + public ActionResult info(@PathVariable("id") String id){ + MonitoringitemEntity entity= monitoringitemService.getInfo(id); + MonitoringitemInfoVO vo=JsonUtil.getJsonToBean(entity, MonitoringitemInfoVO.class); //子表 //副表 @@ -344,9 +346,9 @@ public class Monitoring_itemController { * @return */ @GetMapping("/detail/{id}") - public ActionResult detailInfo(@PathVariable("id") String id){ - Monitoring_itemEntity entity= monitoring_itemService.getInfo(id); - Monitoring_itemInfoVO vo=JsonUtil.getJsonToBean(entity, Monitoring_itemInfoVO.class); + public ActionResult detailInfo(@PathVariable("id") String id){ + MonitoringitemEntity entity= monitoringitemService.getInfo(id); + MonitoringitemInfoVO vo=JsonUtil.getJsonToBean(entity, MonitoringitemInfoVO.class); //子表数据转换 @@ -369,12 +371,12 @@ public class Monitoring_itemController { */ @PutMapping("/{id}") @Transactional - public ActionResult update(@PathVariable("id") String id,@RequestBody @Valid Monitoring_itemUpForm monitoring_itemUpForm) throws DataException { + public ActionResult update(@PathVariable("id") String id,@RequestBody @Valid MonitoringitemUpForm monitoringitemUpForm) throws DataException { UserInfo userInfo=userProvider.get(); - Monitoring_itemEntity entity= monitoring_itemService.getInfo(id); + MonitoringitemEntity entity= monitoringitemService.getInfo(id); if(entity!=null){ - Monitoring_itemEntity subentity=JsonUtil.getJsonToBean(monitoring_itemUpForm, Monitoring_itemEntity.class); - monitoring_itemService.update(id, subentity); + MonitoringitemEntity subentity=JsonUtil.getJsonToBean(monitoringitemUpForm, MonitoringitemEntity.class); + monitoringitemService.update(id, subentity); return ActionResult.success("更新成功"); }else{ return ActionResult.fail("更新失败，数据不存在"); @@ -392,9 +394,9 @@ public class Monitoring_itemController { @DeleteMapping("/{id}") @Transactional public ActionResult delete(@PathVariable("id") String id){ - Monitoring_itemEntity entity= monitoring_itemService.getInfo(id); + MonitoringitemEntity entity= monitoringitemService.getInfo(id); if(entity!=null){ - monitoring_itemService.delete(entity); + monitoringitemService.delete(entity); } return ActionResult.success("删除成功"); diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/monitorItem/entity/Monitoring_itemEntity.java b/SC-boot/linkage-scm/src/main/java/jnpf/monitoringitem/entity/MonitoringitemEntity.java similarity index 76% rename from SC-boot/linkage-scm/src/main/java/jnpf/monitorItem/entity/Monitoring_itemEntity.java rename to SC-boot/linkage-scm/src/main/java/jnpf/monitoringitem/entity/MonitoringitemEntity.java index fea543fd..1c63b5cd 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/monitorItem/entity/Monitoring_itemEntity.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/monitoringitem/entity/MonitoringitemEntity.java @@ -1,12 +1,13 @@ -package jnpf.monitorItem.entity; +package jnpf.monitoringitem.entity; +import com.alibaba.fastjson.annotation.JSONField; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableLogic; import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; import java.util.Date; +import com.fasterxml.jackson.annotation.JsonProperty; /** @@ -15,11 +16,11 @@ import java.util.Date; * @版本： V3.2.0 * @版权： LINKAGE-BOOT * @作者： LINKAGE-BOOT研发团队 - * @日期： 2023-02-07 + * @日期： 2023-02-13 */ @Data @TableName("jg_monitoring_item0") -public class Monitoring_itemEntity { +public class MonitoringitemEntity { @TableId("ID") private String id; @@ -52,7 +53,6 @@ public class Monitoring_itemEntity { private Date deleteTime; @TableField("DELETE_MARK") - @TableLogic private String deleteMark; @TableField("ORGNIZE_ID") @@ -70,19 +70,19 @@ public class Monitoring_itemEntity { @TableField("SERIALNUMBER") private String serialnumber; - @TableField("M_STATUS") - private String mStatus; + @TableField("FLVADDRESS") + private String flvaddress; - @TableField("flvAddress") - private String flvAddress; + @TableField("FLVHDADDRESS") + private String flvhdaddress; - @TableField("flvHdAddress") - private String flvHdAddress; + @TableField("CHANNELNUMBER") + private String channelnumber; - @TableField("channelNumber") - private String channelNumber; + @TableField("ISENABLE") + private String isenable; - @TableField("isEnable") - private String isEnable; + @TableField("M_STATUS") + private String mStatus; } diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/monitoringitem/mapper/MonitoringitemMapper.java b/SC-boot/linkage-scm/src/main/java/jnpf/monitoringitem/mapper/MonitoringitemMapper.java new file mode 100644 index 00000000..5b86e2d8 --- /dev/null +++ b/SC-boot/linkage-scm/src/main/java/jnpf/monitoringitem/mapper/MonitoringitemMapper.java @@ -0,0 +1,17 @@ +package jnpf.monitoringitem.mapper; + + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import jnpf.monitoringitem.entity.MonitoringitemEntity; + +/** + * + * 监控清单 + * 版本： V3.2.0 + * 版权： LINKAGE-BOOT + * 作者： LINKAGE-BOOT研发团队 + * 日期： 2023-02-13 + */ +public interface MonitoringitemMapper extends BaseMapper { + +} diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/monitorItem/model/monitoring_item/Monitoring_itemCrForm.java b/SC-boot/linkage-scm/src/main/java/jnpf/monitoringitem/model/monitoringitem/MonitoringitemCrForm.java similarity index 92% rename from SC-boot/linkage-scm/src/main/java/jnpf/monitorItem/model/monitoring_item/Monitoring_itemCrForm.java rename to SC-boot/linkage-scm/src/main/java/jnpf/monitoringitem/model/monitoringitem/MonitoringitemCrForm.java index a3b41761..6edc3f3e 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/monitorItem/model/monitoring_item/Monitoring_itemCrForm.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/monitoringitem/model/monitoringitem/MonitoringitemCrForm.java @@ -1,6 +1,6 @@ -package jnpf.monitorItem.model.monitoring_item; +package jnpf.monitoringitem.model.monitoringitem; import lombok.Data; import java.util.List; @@ -14,10 +14,10 @@ import com.fasterxml.jackson.annotation.JsonProperty; * @版本： V3.2.0 * @版权： LINKAGE-BOOT * @作者： LINKAGE-BOOT研发团队 - * @日期： 2023-02-07 + * @日期： 2023-02-13 */ @Data -public class Monitoring_itemCrForm { +public class MonitoringitemCrForm { /** 设备名称 **/ @JsonProperty("mName") diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/monitorItem/model/monitoring_item/Monitoring_itemInfoVO.java b/SC-boot/linkage-scm/src/main/java/jnpf/monitoringitem/model/monitoringitem/MonitoringitemInfoVO.java similarity index 93% rename from SC-boot/linkage-scm/src/main/java/jnpf/monitorItem/model/monitoring_item/Monitoring_itemInfoVO.java rename to SC-boot/linkage-scm/src/main/java/jnpf/monitoringitem/model/monitoringitem/MonitoringitemInfoVO.java index 2eb1e45d..8d4bd65b 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/monitorItem/model/monitoring_item/Monitoring_itemInfoVO.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/monitoringitem/model/monitoringitem/MonitoringitemInfoVO.java @@ -1,7 +1,7 @@ -package jnpf.monitorItem.model.monitoring_item; +package jnpf.monitoringitem.model.monitoringitem; import lombok.Data; import com.fasterxml.jackson.annotation.JsonProperty; @@ -15,10 +15,10 @@ import com.fasterxml.jackson.annotation.JsonFormat; * @版本： V3.2.0 * @版权： LINKAGE-BOOT * @作者： LINKAGE-BOOT研发团队 - * @日期： 2023-02-07 + * @日期： 2023-02-13 */ @Data -public class Monitoring_itemInfoVO{ +public class MonitoringitemInfoVO{ /** 主键 **/ @JsonProperty("id") private String id; diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/monitorItem/model/monitoring_item/Monitoring_itemListQuery.java b/SC-boot/linkage-scm/src/main/java/jnpf/monitoringitem/model/monitoringitem/MonitoringitemListQuery.java similarity index 62% rename from SC-boot/linkage-scm/src/main/java/jnpf/monitorItem/model/monitoring_item/Monitoring_itemListQuery.java rename to SC-boot/linkage-scm/src/main/java/jnpf/monitoringitem/model/monitoringitem/MonitoringitemListQuery.java index ca06399b..46e7cb11 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/monitorItem/model/monitoring_item/Monitoring_itemListQuery.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/monitoringitem/model/monitoringitem/MonitoringitemListQuery.java @@ -1,4 +1,4 @@ -package jnpf.monitorItem.model.monitoring_item; +package jnpf.monitoringitem.model.monitoringitem; import lombok.Data; import java.util.Date; @@ -10,13 +10,16 @@ import java.util.List; * @版本： V3.2.0 * @版权： LINKAGE-BOOT * @作者： LINKAGE-BOOT研发团队 - * @日期： 2023-02-07 + * @日期： 2023-02-13 */ @Data -public class Monitoring_itemListQuery extends Pagination { +public class MonitoringitemListQuery extends Pagination { /** 设备名称 */ private String mName; + + /** 区域 */ + private String monitoringId; /** * 菜单id */ diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/monitorItem/model/monitoring_item/Monitoring_itemListVO.java b/SC-boot/linkage-scm/src/main/java/jnpf/monitoringitem/model/monitoringitem/MonitoringitemListVO.java similarity index 93% rename from SC-boot/linkage-scm/src/main/java/jnpf/monitorItem/model/monitoring_item/Monitoring_itemListVO.java rename to SC-boot/linkage-scm/src/main/java/jnpf/monitoringitem/model/monitoringitem/MonitoringitemListVO.java index febe2353..1ae469e1 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/monitorItem/model/monitoring_item/Monitoring_itemListVO.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/monitoringitem/model/monitoringitem/MonitoringitemListVO.java @@ -1,6 +1,6 @@ -package jnpf.monitorItem.model.monitoring_item; +package jnpf.monitoringitem.model.monitoringitem; import lombok.Data; @@ -15,10 +15,10 @@ import java.math.BigDecimal; * @版本： V3.2.0 * @版权： LINKAGE-BOOT * @作者： LINKAGE-BOOT研发团队 - * @日期： 2023-02-07 + * @日期： 2023-02-13 */ @Data -public class Monitoring_itemListVO{ +public class MonitoringitemListVO{ /** 主键 */ private String id; diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/monitorItem/model/monitoring_item/Monitoring_itemPagination.java b/SC-boot/linkage-scm/src/main/java/jnpf/monitoringitem/model/monitoringitem/MonitoringitemPagination.java similarity index 60% rename from SC-boot/linkage-scm/src/main/java/jnpf/monitorItem/model/monitoring_item/Monitoring_itemPagination.java rename to SC-boot/linkage-scm/src/main/java/jnpf/monitoringitem/model/monitoringitem/MonitoringitemPagination.java index 964b094b..64cea85e 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/monitorItem/model/monitoring_item/Monitoring_itemPagination.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/monitoringitem/model/monitoringitem/MonitoringitemPagination.java @@ -1,4 +1,4 @@ -package jnpf.monitorItem.model.monitoring_item; +package jnpf.monitoringitem.model.monitoringitem; import lombok.Data; @@ -11,13 +11,16 @@ import java.util.List; * @版本： V3.2.0 * @版权： LINKAGE-BOOT * @作者： LINKAGE-BOOT研发团队 - * @日期： 2023-02-07 + * @日期： 2023-02-13 */ @Data -public class Monitoring_itemPagination extends Pagination { +public class MonitoringitemPagination extends Pagination { /** 设备名称 */ private String mName; + + /** 区域 */ + private String monitoringId; /** * 菜单id */ diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/monitormanage/model/monitormanage/MonitormanagePaginationExportModel.java b/SC-boot/linkage-scm/src/main/java/jnpf/monitoringitem/model/monitoringitem/MonitoringitemPaginationExportModel.java similarity index 61% rename from SC-boot/linkage-scm/src/main/java/jnpf/monitormanage/model/monitormanage/MonitormanagePaginationExportModel.java rename to SC-boot/linkage-scm/src/main/java/jnpf/monitoringitem/model/monitoringitem/MonitoringitemPaginationExportModel.java index bf67bcd2..bff5355e 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/monitormanage/model/monitormanage/MonitormanagePaginationExportModel.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/monitoringitem/model/monitoringitem/MonitoringitemPaginationExportModel.java @@ -1,4 +1,4 @@ -package jnpf.monitormanage.model.monitormanage; +package jnpf.monitoringitem.model.monitoringitem; import lombok.Data; import jnpf.base.Pagination; @@ -9,10 +9,10 @@ import java.util.*; * @版本： V3.2.0 * @版权： LINKAGE-BOOT * @作者： LINKAGE-BOOT研发团队 - * @日期： 2023-01-05 + * @日期： 2023-02-13 */ @Data -public class MonitormanagePaginationExportModel extends Pagination { +public class MonitoringitemPaginationExportModel extends Pagination { private String selectKey; @@ -23,4 +23,7 @@ public class MonitormanagePaginationExportModel extends Pagination { /** 设备名称 */ private String mName; + + /** 区域 */ + private String monitoringId; } \ No newline at end of file diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/monitorItem/model/monitoring_item/Monitoring_itemUpForm.java b/SC-boot/linkage-scm/src/main/java/jnpf/monitoringitem/model/monitoringitem/MonitoringitemUpForm.java similarity index 92% rename from SC-boot/linkage-scm/src/main/java/jnpf/monitorItem/model/monitoring_item/Monitoring_itemUpForm.java rename to SC-boot/linkage-scm/src/main/java/jnpf/monitoringitem/model/monitoringitem/MonitoringitemUpForm.java index e3dc794d..cfad96bf 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/monitorItem/model/monitoring_item/Monitoring_itemUpForm.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/monitoringitem/model/monitoringitem/MonitoringitemUpForm.java @@ -1,6 +1,6 @@ -package jnpf.monitorItem.model.monitoring_item; +package jnpf.monitoringitem.model.monitoringitem; import lombok.Data; import java.util.List; @@ -15,10 +15,10 @@ import lombok.Data; * @版本： V3.2.0 * @版权： LINKAGE-BOOT * @作者： LINKAGE-BOOT研发团队 - * @日期： 2023-02-07 + * @日期： 2023-02-13 */ @Data -public class Monitoring_itemUpForm{ +public class MonitoringitemUpForm{ /** 主键 */ private String id; diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/monitoringitem/service/MonitoringitemService.java b/SC-boot/linkage-scm/src/main/java/jnpf/monitoringitem/service/MonitoringitemService.java new file mode 100644 index 00000000..2fe34944 --- /dev/null +++ b/SC-boot/linkage-scm/src/main/java/jnpf/monitoringitem/service/MonitoringitemService.java @@ -0,0 +1,36 @@ +package jnpf.monitoringitem.service; + + +import com.baomidou.mybatisplus.extension.service.IService; +import jnpf.monitoringitem.entity.MonitoringitemEntity; +import jnpf.monitoringitem.model.monitoringitem.MonitoringitemPagination; + +import java.util.List; +/** + * + * 监控清单 + * 版本： V3.2.0 + * 版权： LINKAGE-BOOT + * 作者： LINKAGE-BOOT研发团队 + * 日期： 2023-02-13 + */ +public interface MonitoringitemService extends IService { + + List getList(MonitoringitemPagination monitoringitemPagination); + + List getTypeList(MonitoringitemPagination monitoringitemPagination,String dataType); + + + + MonitoringitemEntity getInfo(String id); + + void delete(MonitoringitemEntity entity); + + void create(MonitoringitemEntity entity); + + boolean update( String id, MonitoringitemEntity entity); + +// 子表方法 + + //列表子表数据方法 +} diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/monitoringitem/service/impl/MonitoringitemServiceImpl.java b/SC-boot/linkage-scm/src/main/java/jnpf/monitoringitem/service/impl/MonitoringitemServiceImpl.java new file mode 100644 index 00000000..04ab7fce --- /dev/null +++ b/SC-boot/linkage-scm/src/main/java/jnpf/monitoringitem/service/impl/MonitoringitemServiceImpl.java @@ -0,0 +1,222 @@ +package jnpf.monitoringitem.service.impl; + +import cn.hutool.core.util.ObjectUtil; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import jnpf.monitoringitem.entity.MonitoringitemEntity; +import jnpf.monitoringitem.mapper.MonitoringitemMapper; +import jnpf.monitoringitem.model.monitoringitem.MonitoringitemPagination; +import jnpf.monitoringitem.service.MonitoringitemService; +import jnpf.permission.model.authorize.AuthorizeConditionModel; +import jnpf.permission.service.AuthorizeService; +import jnpf.util.ServletUtil; +import jnpf.util.StringUtil; +import jnpf.util.UserProvider; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.lang.reflect.Field; +import java.util.ArrayList; +import java.util.List; + +/** + * + * 监控清单 + * 版本： V3.2.0 + * 版权： LINKAGE-BOOT + * 作者： LINKAGE-BOOT研发团队 + * 日期： 2023-02-13 + */ +@Service +public class MonitoringitemServiceImpl extends ServiceImpl implements MonitoringitemService { + + + @Autowired + private UserProvider userProvider; + + @Autowired + private AuthorizeService authorizeService; + + + + + + @Override + public List getList(MonitoringitemPagination monitoringitemPagination){ + String userId=userProvider.get().getUserId(); + List AllIdList =new ArrayList(); + int total=0; + int monitoringitemNum =0; + QueryWrapper monitoringitemQueryWrapper=new QueryWrapper<>(); + boolean pcPermission = false; + boolean appPermission = false; + boolean isPc = ServletUtil.getHeader("jnpf-origin").equals("pc"); + if(isPc && pcPermission){ + if (!userProvider.get().getIsAdministrator()){ + Object monitoringitemObj=authorizeService.getCondition(new AuthorizeConditionModel(monitoringitemQueryWrapper,monitoringitemPagination.getMenuId(),"monitoringitem")); + if (ObjectUtil.isEmpty(monitoringitemObj)){ + return new ArrayList<>(); + } else { + monitoringitemQueryWrapper = (QueryWrapper)monitoringitemObj; + monitoringitemNum++; + } + } + } + if(!isPc && appPermission){ + if (!userProvider.get().getIsAdministrator()){ + Object monitoringitemObj=authorizeService.getCondition(new AuthorizeConditionModel(monitoringitemQueryWrapper,monitoringitemPagination.getMenuId(),"monitoringitem")); + if (ObjectUtil.isEmpty(monitoringitemObj)){ + return new ArrayList<>(); + } else { + monitoringitemQueryWrapper = (QueryWrapper)monitoringitemObj; + monitoringitemNum++; + } + + + } + } + if(StringUtil.isNotEmpty(monitoringitemPagination.getMName())){ + monitoringitemNum++; + monitoringitemQueryWrapper.lambda().like(MonitoringitemEntity::getMName,monitoringitemPagination.getMName()); + } + + if(StringUtil.isNotEmpty(monitoringitemPagination.getMonitoringId())){ + monitoringitemNum++; + monitoringitemQueryWrapper.lambda().eq(MonitoringitemEntity::getMonitoringId,monitoringitemPagination.getMonitoringId()); + } + + if(AllIdList.size()>0){ + monitoringitemQueryWrapper.lambda().in(MonitoringitemEntity::getId, AllIdList); + } + //排序 + if(StringUtil.isEmpty(monitoringitemPagination.getSidx())){ + monitoringitemQueryWrapper.lambda().orderByDesc(MonitoringitemEntity::getCreatorTime); + }else{ + try { + String sidx = monitoringitemPagination.getSidx(); + MonitoringitemEntity monitoringitemEntity = new MonitoringitemEntity(); + Field declaredField = monitoringitemEntity.getClass().getDeclaredField(sidx); + declaredField.setAccessible(true); + String value = declaredField.getAnnotation(TableField.class).value(); + monitoringitemQueryWrapper="asc".equals(monitoringitemPagination.getSort().toLowerCase())?monitoringitemQueryWrapper.orderByAsc(value):monitoringitemQueryWrapper.orderByDesc(value); + } catch (NoSuchFieldException e) { + e.printStackTrace(); + } + } + if((total>0 && AllIdList.size()>0) || total==0){ + Page page=new Page<>(monitoringitemPagination.getCurrentPage(), monitoringitemPagination.getPageSize()); + IPage userIPage=this.page(page, monitoringitemQueryWrapper); + return monitoringitemPagination.setData(userIPage.getRecords(),userIPage.getTotal()); + }else{ + List list = new ArrayList(); + return monitoringitemPagination.setData(list, list.size()); + } + } + @Override + public List getTypeList(MonitoringitemPagination monitoringitemPagination,String dataType){ + String userId=userProvider.get().getUserId(); + List AllIdList =new ArrayList(); + int total=0; + int monitoringitemNum =0; + QueryWrapper monitoringitemQueryWrapper=new QueryWrapper<>(); + boolean pcPermission = false; + boolean appPermission = false; + boolean isPc = ServletUtil.getHeader("jnpf-origin").equals("pc"); + if(isPc && pcPermission){ + if (!userProvider.get().getIsAdministrator()){ + Object monitoringitemObj=authorizeService.getCondition(new AuthorizeConditionModel(monitoringitemQueryWrapper,monitoringitemPagination.getMenuId(),"monitoringitem")); + if (ObjectUtil.isEmpty(monitoringitemObj)){ + return new ArrayList<>(); + } else { + monitoringitemQueryWrapper = (QueryWrapper)monitoringitemObj; + monitoringitemNum++; + } + } + } + if(!isPc && appPermission){ + if (!userProvider.get().getIsAdministrator()){ + Object monitoringitemObj=authorizeService.getCondition(new AuthorizeConditionModel(monitoringitemQueryWrapper,monitoringitemPagination.getMenuId(),"monitoringitem")); + if (ObjectUtil.isEmpty(monitoringitemObj)){ + return new ArrayList<>(); + } else { + monitoringitemQueryWrapper = (QueryWrapper)monitoringitemObj; + monitoringitemNum++; + } + + + } + } + if(StringUtil.isNotEmpty(monitoringitemPagination.getMName())){ + monitoringitemNum++; + monitoringitemQueryWrapper.lambda().like(MonitoringitemEntity::getMName,monitoringitemPagination.getMName()); + } + + if(StringUtil.isNotEmpty(monitoringitemPagination.getMonitoringId())){ + monitoringitemNum++; + monitoringitemQueryWrapper.lambda().eq(MonitoringitemEntity::getMonitoringId,monitoringitemPagination.getMonitoringId()); + } + + if(AllIdList.size()>0){ + monitoringitemQueryWrapper.lambda().in(MonitoringitemEntity::getId, AllIdList); + } + //排序 + if(StringUtil.isEmpty(monitoringitemPagination.getSidx())){ + monitoringitemQueryWrapper.lambda().orderByDesc(MonitoringitemEntity::getCreatorTime); + }else{ + try { + String sidx = monitoringitemPagination.getSidx(); + MonitoringitemEntity monitoringitemEntity = new MonitoringitemEntity(); + Field declaredField = monitoringitemEntity.getClass().getDeclaredField(sidx); + declaredField.setAccessible(true); + String value = declaredField.getAnnotation(TableField.class).value(); + monitoringitemQueryWrapper="asc".equals(monitoringitemPagination.getSort().toLowerCase())?monitoringitemQueryWrapper.orderByAsc(value):monitoringitemQueryWrapper.orderByDesc(value); + } catch (NoSuchFieldException e) { + e.printStackTrace(); + } + } + if("0".equals(dataType)){ + if((total>0 && AllIdList.size()>0) || total==0){ + Page page=new Page<>(monitoringitemPagination.getCurrentPage(), monitoringitemPagination.getPageSize()); + IPage userIPage=this.page(page, monitoringitemQueryWrapper); + return monitoringitemPagination.setData(userIPage.getRecords(),userIPage.getTotal()); + }else{ + List list = new ArrayList(); + return monitoringitemPagination.setData(list, list.size()); + } + }else{ + return this.list(monitoringitemQueryWrapper); + } + } + + @Override + public MonitoringitemEntity getInfo(String id){ + QueryWrapper queryWrapper=new QueryWrapper<>(); + queryWrapper.lambda().eq(MonitoringitemEntity::getId,id); + return this.getOne(queryWrapper); + } + + @Override + public void create(MonitoringitemEntity entity){ + this.save(entity); + } + + @Override + public boolean update(String id, MonitoringitemEntity entity){ + entity.setId(id); + return this.updateById(entity); + } + @Override + public void delete(MonitoringitemEntity entity){ + if(entity!=null){ + this.removeById(entity.getId()); + } + } + //子表方法 + + //列表子表数据方法 + + +} \ No newline at end of file diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/monitorItem/utils/IDUtils.java b/SC-boot/linkage-scm/src/main/java/jnpf/monitoringitem/utils/IDUtils.java similarity index 84% rename from SC-boot/linkage-scm/src/main/java/jnpf/monitorItem/utils/IDUtils.java rename to SC-boot/linkage-scm/src/main/java/jnpf/monitoringitem/utils/IDUtils.java index cb858ebf..e3a6fc55 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/monitorItem/utils/IDUtils.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/monitoringitem/utils/IDUtils.java @@ -1,4 +1,4 @@ -package jnpf.monitorItem.utils; +package jnpf.monitoringitem.utils; import java.util.UUID; diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/monitorItem/utils/ImouConfig.java b/SC-boot/linkage-scm/src/main/java/jnpf/monitoringitem/utils/ImouConfig.java similarity index 95% rename from SC-boot/linkage-scm/src/main/java/jnpf/monitorItem/utils/ImouConfig.java rename to SC-boot/linkage-scm/src/main/java/jnpf/monitoringitem/utils/ImouConfig.java index 04a4c7d8..fcc4dc08 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/monitorItem/utils/ImouConfig.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/monitoringitem/utils/ImouConfig.java @@ -1,10 +1,10 @@ -package jnpf.monitorItem.utils; +package jnpf.monitoringitem.utils; import cn.hutool.json.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import jnpf.monitorItem.entity.Monitoring_itemEntity; -import jnpf.monitorItem.service.Monitoring_itemService; +import jnpf.monitoringitem.entity.MonitoringitemEntity; +import jnpf.monitoringitem.service.MonitoringitemService; import jnpf.util.Md5Util; import lombok.extern.slf4j.Slf4j; import okhttp3.*; @@ -37,7 +37,7 @@ public class ImouConfig { private String id="98a7a257-c4e4-4db3-a2d3-d97a3836b87c"; @Autowired - private Monitoring_itemService monitoring_itemService; + private MonitoringitemService monitoring_itemService; // 设备序列号 private String deviceId="5K0A36BPAZ73FA0"; @@ -72,21 +72,21 @@ public class ImouConfig { String deviceId = String.valueOf(flvLive.get("deviceId")); // 设备通道号 String channelId = String.valueOf(flvLive.get("channelId")); - Monitoring_itemEntity monitor = new Monitoring_itemEntity(); + MonitoringitemEntity monitor = new MonitoringitemEntity(); // 设置区域为日照金属 monitor.setMonitoringId("1"); monitor.setMName("NVR-3FA0-"+i); monitor.setSerialnumber(deviceId); monitor.setMStatus("0"); - monitor.setFlvAddress(flv); - monitor.setFlvHdAddress(flvHD); - monitor.setChannelNumber(channelId); + monitor.setFlvaddress(flv); + monitor.setFlvhdaddress(flvHD); + monitor.setChannelnumber(channelId); // boolean save = monitoring_itemService.save(monitor); // 2 查询本地表中此通道是否存在 - LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); - wrapper.eq(Monitoring_itemEntity::getChannelNumber,channelId); - Monitoring_itemEntity one = monitoring_itemService.getOne(wrapper); + LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); + wrapper.eq(MonitoringitemEntity::getChannelnumber,channelId); + MonitoringitemEntity one = monitoring_itemService.getOne(wrapper); if (one!=null){ // 3 存在根据返回的id进行更新 monitor.setMName(null); diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/monitormanage/controller/MonitormanageController.java b/SC-boot/linkage-scm/src/main/java/jnpf/monitormanage/controller/MonitormanageController.java deleted file mode 100644 index 594b6959..00000000 --- a/SC-boot/linkage-scm/src/main/java/jnpf/monitormanage/controller/MonitormanageController.java +++ /dev/null @@ -1,342 +0,0 @@ - - -package jnpf.monitormanage.controller; -import cn.afterturn.easypoi.excel.ExcelExportUtil; -import cn.afterturn.easypoi.excel.entity.ExportParams; -import cn.afterturn.easypoi.excel.entity.params.ExcelExportEntity; -import cn.afterturn.easypoi.excel.entity.enmus.ExcelType; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; -import jnpf.base.ActionResult; -import jnpf.base.vo.PageListVO; -import jnpf.base.vo.PaginationVO; -import jnpf.base.UserInfo; -import jnpf.base.vo.DownloadVO; -import jnpf.config.ConfigValueUtil; -import jnpf.exception.DataException; -import org.springframework.transaction.annotation.Transactional; -import jnpf.base.entity.ProvinceEntity; -import jnpf.monitormanage.model.monitormanage.*; -import jnpf.monitormanage.model.monitormanage.MonitormanagePagination; -import jnpf.monitormanage.entity.*; -import jnpf.util.*; -import jnpf.base.util.*; -import jnpf.base.vo.ListVO; -import jnpf.util.context.SpringContext; -import cn.hutool.core.util.ObjectUtil; -import lombok.extern.slf4j.Slf4j; -import lombok.Cleanup; -import org.apache.poi.hssf.usermodel.HSSFWorkbook; -import org.apache.poi.ss.usermodel.Workbook; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; -import jnpf.monitormanage.entity.MonitormanageEntity; -import jnpf.monitormanage.service.MonitormanageService; -import org.springframework.web.bind.annotation.*; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.multipart.MultipartFile; -import javax.validation.Valid; -import java.io.FileNotFoundException; -import java.io.FileOutputStream; -import java.io.IOException; -import jnpf.util.GeneraterSwapUtil; -import java.util.*; - -import jnpf.util.file.UploadUtil; -import jnpf.util.enums.FileTypeEnum; - -/** - * - * monitormanage - * @版本： V3.2.0 - * @版权： LINKAGE-BOOT - * @作者： LINKAGE-BOOT研发团队 - * @日期： 2023-01-05 - */ -@Slf4j -@RestController -@Api(tags = "monitormanage" , value = "monitormanage") -@RequestMapping("/api/monitormanage/Monitormanage") -public class MonitormanageController { - - @Autowired - private GeneraterSwapUtil generaterSwapUtil; - - @Autowired - private ConfigValueUtil configValueUtil; - - @Autowired - private UserProvider userProvider; - - @Autowired - private MonitormanageService monitormanageService; - - - - - /** - * 列表 - * - * @param monitormanagePagination - * @return - */ - @PostMapping("/getList") - public ActionResult list(@RequestBody MonitormanagePagination monitormanagePagination)throws IOException{ - List list= monitormanageService.getList(monitormanagePagination); - //处理id字段转名称，若无需转或者为空可删除 - for(MonitormanageEntity entity:list){ - } - List listVO=JsonUtil.getJsonToList(list,MonitormanageListVO.class); - for(MonitormanageListVO monitormanageVO:listVO){ - } - - - PageListVO vo=new PageListVO(); - vo.setList(listVO); - PaginationVO page=JsonUtil.getJsonToBean(monitormanagePagination,PaginationVO.class); - vo.setPagination(page); - return ActionResult.success(vo); - } - - - /** - * 创建 - * - * @param monitormanageCrForm - * @return - */ - @PostMapping - @Transactional - public ActionResult create(@RequestBody @Valid MonitormanageCrForm monitormanageCrForm) throws DataException { - String mainId =RandomUtil.uuId(); - UserInfo userInfo=userProvider.get(); - MonitormanageEntity entity = JsonUtil.getJsonToBean(monitormanageCrForm, MonitormanageEntity.class); - entity.setId(mainId); - monitormanageService.save(entity); - - - return ActionResult.success("创建成功"); -} - - - - /** - * 模板下载 - * - * @return - */ - @ApiOperation("模板下载") - @GetMapping("/templateDownload") - public ActionResult TemplateDownload(){ - UserInfo userInfo=userProvider.get(); - DownloadVO vo=DownloadVO.builder().build(); - try{ - vo.setName("职员信息.xlsx"); - vo.setUrl(UploaderUtil.uploaderFile("/api/Common/DownloadModel?encryption=" ,userInfo.getId()+"#"+"职员信息.xlsx"+"#"+"Temporary")); - }catch(Exception e){ - log.error("信息导出Excel错误:{}" ,e.getMessage()); - } - return ActionResult.success(vo); - } - /** - * 导出Excel - * - * @return - */ - @ApiOperation("导出Excel") - @GetMapping("/Actions/Export") - public ActionResult Export(MonitormanagePaginationExportModel monitormanagePaginationExportModel) throws IOException { - if (StringUtil.isEmpty(monitormanagePaginationExportModel.getSelectKey())){ - return ActionResult.fail("请选择导出字段"); - } - MonitormanagePagination monitormanagePagination=JsonUtil.getJsonToBean(monitormanagePaginationExportModel, MonitormanagePagination.class); - List list= monitormanageService.getTypeList(monitormanagePagination,monitormanagePaginationExportModel.getDataType()); - //处理id字段转名称，若无需转或者为空可删除 - for(MonitormanageEntity entity:list){ - } - List listVO=JsonUtil.getJsonToList(list,MonitormanageListVO.class); - for(MonitormanageListVO monitormanageVO:listVO){ - } - - //转换为map输出 - List>mapList=JsonUtil.getJsonToListMap(JsonUtil.getObjectToStringDateFormat(listVO,"yyyy-MM-dd HH:mm:ss")); - String[]keys=!StringUtil.isEmpty(monitormanagePaginationExportModel.getSelectKey())?monitormanagePaginationExportModel.getSelectKey().split(","):new String[0]; - UserInfo userInfo=userProvider.get(); - DownloadVO vo=this.creatModelExcel(configValueUtil.getTemporaryFilePath(),mapList,keys,userInfo); - return ActionResult.success(vo); - } - //导出表格 - public DownloadVO creatModelExcel(String path,List>list,String[]keys,UserInfo userInfo){ - DownloadVO vo=DownloadVO.builder().build(); - List entitys=new ArrayList<>(); - if(keys.length>0){ - for(String key:keys){ - switch(key){ - case "mName" : - entitys.add(new ExcelExportEntity("设备名称" ,"mName")); - break; - case "serialnumber" : - entitys.add(new ExcelExportEntity("设备序列号" ,"serialnumber")); - break; - case "ip" : - entitys.add(new ExcelExportEntity("ip地址" ,"ip")); - break; - case "port" : - entitys.add(new ExcelExportEntity("端口号" ,"port")); - break; - case "account" : - entitys.add(new ExcelExportEntity("账号" ,"account")); - break; - case "password" : - entitys.add(new ExcelExportEntity("密码" ,"password")); - break; - case "creatorusername" : - entitys.add(new ExcelExportEntity("创建人名称" ,"creatorusername")); - break; - case "creatortime" : - entitys.add(new ExcelExportEntity("创建时间" ,"creatortime")); - break; - case "lastmodifyusername" : - entitys.add(new ExcelExportEntity("修改人名称" ,"lastmodifyusername")); - break; - case "lastmodifytime" : - entitys.add(new ExcelExportEntity("修改时间" ,"lastmodifytime")); - break; - default: - break; - } - } - } - - ExportParams exportParams = new ExportParams(null, "表单信息"); - exportParams.setType(ExcelType.XSSF); - try{ - @Cleanup Workbook workbook = new HSSFWorkbook(); - if (entitys.size()>0){ - workbook = ExcelExportUtil.exportExcel(exportParams, entitys, list); - } - String name = "表单信息" + DateUtil.dateNow("yyyyMMdd") + "_" + RandomUtil.uuId() + ".xlsx"; - - String fileName = configValueUtil.getTemporaryFilePath() + name; - @Cleanup FileOutputStream output = new FileOutputStream(XSSEscape.escapePath(fileName)); - workbook.write(output); - //上传文件 - UploadUtil.uploadFile(configValueUtil.getFileType(), fileName, FileTypeEnum.TEMPORARY, name); - - vo.setName(name); - vo.setUrl(UploaderUtil.uploaderFile(userInfo.getId() + "#" + name + "#" + "Temporary")); - } catch (Exception e) { - log.error("信息导出Excel错误:{}", e.getMessage()); - e.printStackTrace(); - } - return vo; - } - - - /** - * 批量删除 - * - * @param ids - * @return - */ - @DeleteMapping("/batchRemove/{ids}") - @Transactional - public ActionResult batchRemove(@PathVariable("ids") String ids){ - String[] idList = ids.split(","); - int i =0; - for (String allId : idList){ - this.delete(allId); - i++; - } - if (i == 0 ){ - return ActionResult.fail("删除失败"); - } - return ActionResult.success("删除成功"); - } - - - /** - * 信息 - * - * @param id - * @return - */ - @GetMapping("/{id}") - public ActionResult info(@PathVariable("id") String id){ - MonitormanageEntity entity= monitormanageService.getInfo(id); - MonitormanageInfoVO vo=JsonUtil.getJsonToBean(entity, MonitormanageInfoVO.class); - - //子表 - //副表 - return ActionResult.success(vo); - } - - /** - * 表单信息(详情页) - * - * @param id - * @return - */ - @GetMapping("/detail/{id}") - public ActionResult detailInfo(@PathVariable("id") String id){ - MonitormanageEntity entity= monitormanageService.getInfo(id); - MonitormanageInfoVO vo=JsonUtil.getJsonToBean(entity, MonitormanageInfoVO.class); - - //子表数据转换 - - //附表数据转换 - -//添加到详情表单对象中 - - return ActionResult.success(vo); - } - - - - - /** - * 更新 - * - * @param id - * @return - */ - @PutMapping("/{id}") - @Transactional - public ActionResult update(@PathVariable("id") String id,@RequestBody @Valid MonitormanageUpForm monitormanageUpForm) throws DataException { - UserInfo userInfo=userProvider.get(); - MonitormanageEntity entity= monitormanageService.getInfo(id); - if(entity!=null){ - MonitormanageEntity subentity=JsonUtil.getJsonToBean(monitormanageUpForm, MonitormanageEntity.class); - monitormanageService.update(id, subentity); - return ActionResult.success("更新成功"); - }else{ - return ActionResult.fail("更新失败，数据不存在"); - } - } - - - - /** - * 删除 - * - * @param id - * @return - */ - @DeleteMapping("/{id}") - @Transactional - public ActionResult delete(@PathVariable("id") String id){ - MonitormanageEntity entity= monitormanageService.getInfo(id); - if(entity!=null){ - monitormanageService.delete(entity); - - } - return ActionResult.success("删除成功"); - } - - - - - - -} diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/monitormanage/entity/MonitormanageEntity.java b/SC-boot/linkage-scm/src/main/java/jnpf/monitormanage/entity/MonitormanageEntity.java deleted file mode 100644 index 5fba45b5..00000000 --- a/SC-boot/linkage-scm/src/main/java/jnpf/monitormanage/entity/MonitormanageEntity.java +++ /dev/null @@ -1,85 +0,0 @@ -package jnpf.monitormanage.entity; - -import com.alibaba.fastjson.annotation.JSONField; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import lombok.Data; - -import java.util.Date; -import com.fasterxml.jackson.annotation.JsonProperty; - - -/** - * - * 监控清单 - * @版本： V3.2.0 - * @版权： LINKAGE-BOOT - * @作者： LINKAGE-BOOT研发团队 - * @日期： 2023-01-05 - */ -@Data -@TableName("jg_monitoring_item0") -public class MonitormanageEntity { - - @TableId("ID") - private String id; - - @TableField("CREATOR_USER_ID") - private String creatoruserid; - - @TableField("CREATOR_USER_NAME") - private String creatorusername; - - @TableField("CREATOR_TIME") - private Date creatortime; - - @TableField("LAST_MODIFY_USER_ID") - private String lastmodifyuserid; - - @TableField("LAST_MODIFY_USER_NAME") - private String lastmodifyusername; - - @TableField("LAST_MODIFY_TIME") - private Date lastmodifytime; - - @TableField("DELETE_USER_ID") - private String deleteuserid; - - @TableField("DELETE_USER_NAME") - private String deleteusername; - - @TableField("DELETE_TIME") - private Date deletetime; - - @TableField("DELETE_MARK") - private String deletemark; - - @TableField("ORGNIZE_ID") - private String orgnizeId; - - @TableField("DEPARTMENT_ID") - private String departmentId; - - @TableField("MONITORING_ID") - private String monitoringId; - - @TableField("M_NAME") - private String mName; - - @TableField("SERIALNUMBER") - private String serialnumber; - - @TableField("IP") - private String ip; - - @TableField("PORT") - private Integer port; - - @TableField("ACCOUNT") - private String account; - - @TableField("PASSWORD") - private String password; - -} diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/monitormanage/mapper/MonitormanageMapper.java b/SC-boot/linkage-scm/src/main/java/jnpf/monitormanage/mapper/MonitormanageMapper.java deleted file mode 100644 index 3bfe17b0..00000000 --- a/SC-boot/linkage-scm/src/main/java/jnpf/monitormanage/mapper/MonitormanageMapper.java +++ /dev/null @@ -1,17 +0,0 @@ -package jnpf.monitormanage.mapper; - - -import jnpf.monitormanage.entity.MonitormanageEntity; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; - -/** - * - * monitormanage - * 版本： V3.2.0 - * 版权： LINKAGE-BOOT - * 作者： LINKAGE-BOOT研发团队 - * 日期： 2023-01-05 - */ -public interface MonitormanageMapper extends BaseMapper { - -} diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/monitormanage/model/monitormanage/MonitormanageCrForm.java b/SC-boot/linkage-scm/src/main/java/jnpf/monitormanage/model/monitormanage/MonitormanageCrForm.java deleted file mode 100644 index 7f13c31a..00000000 --- a/SC-boot/linkage-scm/src/main/java/jnpf/monitormanage/model/monitormanage/MonitormanageCrForm.java +++ /dev/null @@ -1,64 +0,0 @@ - - -package jnpf.monitormanage.model.monitormanage; - -import lombok.Data; -import java.util.List; -import java.math.BigDecimal; -import com.fasterxml.jackson.annotation.JsonProperty; - - -/** - * - * - * @版本： V3.2.0 - * @版权： LINKAGE-BOOT - * @作者： LINKAGE-BOOT研发团队 - * @日期： 2023-01-05 - */ -@Data -public class MonitormanageCrForm { - - /** 设备名称 **/ - @JsonProperty("mName") - private String mName; - - /** 设备序列号 **/ - @JsonProperty("serialnumber") - private String serialnumber; - - /** ip地址 **/ - @JsonProperty("ip") - private String ip; - - /** 端口号 **/ - @JsonProperty("port") - private String port; - - /** 账号 **/ - @JsonProperty("account") - private String account; - - /** 密码 **/ - @JsonProperty("password") - private String password; - - /** 创建人名称 **/ - @JsonProperty("creatorusername") - private String creatorusername; - - /** 创建时间 **/ - @JsonProperty("creatortime") - private Long creatortime; - - /** 修改人名称 **/ - @JsonProperty("lastmodifyusername") - private String lastmodifyusername; - - /** 修改时间 **/ - @JsonProperty("lastmodifytime") - private Long lastmodifytime; - - - -} \ No newline at end of file diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/monitormanage/model/monitormanage/MonitormanageInfoVO.java b/SC-boot/linkage-scm/src/main/java/jnpf/monitormanage/model/monitormanage/MonitormanageInfoVO.java deleted file mode 100644 index e7962408..00000000 --- a/SC-boot/linkage-scm/src/main/java/jnpf/monitormanage/model/monitormanage/MonitormanageInfoVO.java +++ /dev/null @@ -1,66 +0,0 @@ - - - -package jnpf.monitormanage.model.monitormanage; - -import lombok.Data; -import com.fasterxml.jackson.annotation.JsonProperty; -import java.util.List; -import java.math.BigDecimal; -import java.util.Date; -import com.fasterxml.jackson.annotation.JsonFormat; -/** - * - * - * @版本： V3.2.0 - * @版权： LINKAGE-BOOT - * @作者： LINKAGE-BOOT研发团队 - * @日期： 2023-01-05 - */ -@Data -public class MonitormanageInfoVO{ - /** 主键 **/ - @JsonProperty("id") - private String id; - - /** 设备名称 **/ - @JsonProperty("mName") - private String mName; - - /** 设备序列号 **/ - @JsonProperty("serialnumber") - private String serialnumber; - - /** ip地址 **/ - @JsonProperty("ip") - private String ip; - - /** 端口号 **/ - @JsonProperty("port") - private String port; - - /** 账号 **/ - @JsonProperty("account") - private String account; - - /** 密码 **/ - @JsonProperty("password") - private String password; - - /** 创建人名称 **/ - @JsonProperty("creatorusername") - private String creatorusername; - - /** 创建时间 **/ - @JsonProperty("creatortime") - private Long creatortime; - - /** 修改人名称 **/ - @JsonProperty("lastmodifyusername") - private String lastmodifyusername; - - /** 修改时间 **/ - @JsonProperty("lastmodifytime") - private Long lastmodifytime; - -} \ No newline at end of file diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/monitormanage/model/monitormanage/MonitormanageListQuery.java b/SC-boot/linkage-scm/src/main/java/jnpf/monitormanage/model/monitormanage/MonitormanageListQuery.java deleted file mode 100644 index eb47c997..00000000 --- a/SC-boot/linkage-scm/src/main/java/jnpf/monitormanage/model/monitormanage/MonitormanageListQuery.java +++ /dev/null @@ -1,24 +0,0 @@ -package jnpf.monitormanage.model.monitormanage; - -import lombok.Data; -import java.util.Date; -import jnpf.base.Pagination; -import java.util.List; -/** - * - * - * @版本： V3.2.0 - * @版权： LINKAGE-BOOT - * @作者： LINKAGE-BOOT研发团队 - * @日期： 2023-01-05 - */ -@Data -public class MonitormanageListQuery extends Pagination { - - /** 设备名称 */ - private String mName; - /** - * 菜单id - */ - private String menuId; -} \ No newline at end of file diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/monitormanage/model/monitormanage/MonitormanageListVO.java b/SC-boot/linkage-scm/src/main/java/jnpf/monitormanage/model/monitormanage/MonitormanageListVO.java deleted file mode 100644 index 54d33f34..00000000 --- a/SC-boot/linkage-scm/src/main/java/jnpf/monitormanage/model/monitormanage/MonitormanageListVO.java +++ /dev/null @@ -1,79 +0,0 @@ - - -package jnpf.monitormanage.model.monitormanage; - - -import lombok.Data; -import java.sql.Time; -import java.util.Date; -import com.fasterxml.jackson.annotation.JsonFormat; -import com.fasterxml.jackson.annotation.JsonProperty; -import java.math.BigDecimal; -/** - * - * - * @版本： V3.2.0 - * @版权： LINKAGE-BOOT - * @作者： LINKAGE-BOOT研发团队 - * @日期： 2023-01-05 - */ -@Data -public class MonitormanageListVO{ - - /** 主键 */ - private String id; - - - /** 设备名称 **/ - @JsonProperty("mName") - private String mName; - - - /** 设备序列号 **/ - @JsonProperty("serialnumber") - private String serialnumber; - - - /** ip地址 **/ - @JsonProperty("ip") - private String ip; - - - /** 端口号 **/ - @JsonProperty("port") - private String port; - - - /** 账号 **/ - @JsonProperty("account") - private String account; - - - /** 密码 **/ - @JsonProperty("password") - private String password; - - - /** 创建人名称 **/ - @JsonProperty("creatorusername") - private String creatorusername; - - - /** 创建时间 **/ - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8") - @JsonProperty("creatortime") - private Date creatortime; - - - /** 修改人名称 **/ - @JsonProperty("lastmodifyusername") - private String lastmodifyusername; - - - /** 修改时间 **/ - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8") - @JsonProperty("lastmodifytime") - private Date lastmodifytime; - - -} \ No newline at end of file diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/monitormanage/model/monitormanage/MonitormanagePagination.java b/SC-boot/linkage-scm/src/main/java/jnpf/monitormanage/model/monitormanage/MonitormanagePagination.java deleted file mode 100644 index 5c706926..00000000 --- a/SC-boot/linkage-scm/src/main/java/jnpf/monitormanage/model/monitormanage/MonitormanagePagination.java +++ /dev/null @@ -1,25 +0,0 @@ -package jnpf.monitormanage.model.monitormanage; - - -import lombok.Data; -import jnpf.base.Pagination; -import java.util.List; - -/** - * - * - * @版本： V3.2.0 - * @版权： LINKAGE-BOOT - * @作者： LINKAGE-BOOT研发团队 - * @日期： 2023-01-05 - */ -@Data -public class MonitormanagePagination extends Pagination { - - /** 设备名称 */ - private String mName; - /** - * 菜单id - */ - private String menuId; -} \ No newline at end of file diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/monitormanage/model/monitormanage/MonitormanageUpForm.java b/SC-boot/linkage-scm/src/main/java/jnpf/monitormanage/model/monitormanage/MonitormanageUpForm.java deleted file mode 100644 index 268fdbda..00000000 --- a/SC-boot/linkage-scm/src/main/java/jnpf/monitormanage/model/monitormanage/MonitormanageUpForm.java +++ /dev/null @@ -1,76 +0,0 @@ - - -package jnpf.monitormanage.model.monitormanage; - -import lombok.Data; -import java.util.List; -import java.math.BigDecimal; -import com.fasterxml.jackson.annotation.JsonProperty; - -import lombok.Data; - -/** - * - * - * @版本： V3.2.0 - * @版权： LINKAGE-BOOT - * @作者： LINKAGE-BOOT研发团队 - * @日期： 2023-01-05 - */ -@Data -public class MonitormanageUpForm{ - /** 主键 */ - private String id; - - - /** 设备名称 **/ - @JsonProperty("mName") - private String mName; - - - /** 设备序列号 **/ - @JsonProperty("serialnumber") - private String serialnumber; - - - /** ip地址 **/ - @JsonProperty("ip") - private String ip; - - - /** 端口号 **/ - @JsonProperty("port") - private String port; - - - /** 账号 **/ - @JsonProperty("account") - private String account; - - - /** 密码 **/ - @JsonProperty("password") - private String password; - - - /** 创建人名称 **/ - @JsonProperty("creatorusername") - private String creatorusername; - - - /** 创建时间 **/ - @JsonProperty("creatortime") - private Long creatortime; - - - /** 修改人名称 **/ - @JsonProperty("lastmodifyusername") - private String lastmodifyusername; - - - /** 修改时间 **/ - @JsonProperty("lastmodifytime") - private Long lastmodifytime; - - -} \ No newline at end of file diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/monitormanage/service/MonitormanageService.java b/SC-boot/linkage-scm/src/main/java/jnpf/monitormanage/service/MonitormanageService.java deleted file mode 100644 index 5d87873c..00000000 --- a/SC-boot/linkage-scm/src/main/java/jnpf/monitormanage/service/MonitormanageService.java +++ /dev/null @@ -1,34 +0,0 @@ -package jnpf.monitormanage.service; - -import jnpf.monitormanage.entity.MonitormanageEntity; -import com.baomidou.mybatisplus.extension.service.IService; -import jnpf.monitormanage.model.monitormanage.MonitormanagePagination; -import java.util.*; -/** - * - * monitormanage - * 版本： V3.2.0 - * 版权： LINKAGE-BOOT - * 作者： LINKAGE-BOOT研发团队 - * 日期： 2023-01-05 - */ -public interface MonitormanageService extends IService { - - List getList(MonitormanagePagination monitormanagePagination); - - List getTypeList(MonitormanagePagination monitormanagePagination,String dataType); - - - - MonitormanageEntity getInfo(String id); - - void delete(MonitormanageEntity entity); - - void create(MonitormanageEntity entity); - - boolean update( String id, MonitormanageEntity entity); - -// 子表方法 - - //列表子表数据方法 -} diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/monitormanage/service/impl/MonitormanageServiceImpl.java b/SC-boot/linkage-scm/src/main/java/jnpf/monitormanage/service/impl/MonitormanageServiceImpl.java deleted file mode 100644 index 949de4c8..00000000 --- a/SC-boot/linkage-scm/src/main/java/jnpf/monitormanage/service/impl/MonitormanageServiceImpl.java +++ /dev/null @@ -1,222 +0,0 @@ -package jnpf.monitormanage.service.impl; - -import jnpf.monitormanage.entity.*; -import jnpf.monitormanage.mapper.MonitormanageMapper; -import jnpf.monitormanage.service.*; -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import jnpf.util.RandomUtil; -import java.math.BigDecimal; -import cn.hutool.core.util.ObjectUtil; -import jnpf.permission.model.authorize.AuthorizeConditionModel; - - -import jnpf.monitormanage.model.monitormanage.MonitormanagePagination; - -import jnpf.permission.service.AuthorizeService; -import java.lang.reflect.Field; -import com.baomidou.mybatisplus.annotation.TableField; -import java.util.stream.Collectors; - - - - - - -import org.springframework.stereotype.Service; -import com.baomidou.mybatisplus.core.metadata.IPage; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.transaction.annotation.Transactional; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import java.text.SimpleDateFormat; -import jnpf.util.*; -import java.util.*; - -/** - * - * monitormanage - * 版本： V3.2.0 - * 版权： LINKAGE-BOOT - * 作者： LINKAGE-BOOT研发团队 - * 日期： 2023-01-05 - */ -@Service -public class MonitormanageServiceImpl extends ServiceImpl implements MonitormanageService{ - - - @Autowired - private UserProvider userProvider; - - @Autowired - private AuthorizeService authorizeService; - - - - - - @Override - public List getList(MonitormanagePagination monitormanagePagination){ - String userId=userProvider.get().getUserId(); - List AllIdList =new ArrayList(); - int total=0; - int monitormanageNum =0; - QueryWrapper monitormanageQueryWrapper=new QueryWrapper<>(); - boolean pcPermission = false; - boolean appPermission = false; - boolean isPc = ServletUtil.getHeader("jnpf-origin").equals("pc"); - if(isPc && pcPermission){ - if (!userProvider.get().getIsAdministrator()){ - Object monitormanageObj=authorizeService.getCondition(new AuthorizeConditionModel(monitormanageQueryWrapper,monitormanagePagination.getMenuId(),"monitormanage")); - if (ObjectUtil.isEmpty(monitormanageObj)){ - return new ArrayList<>(); - } else { - monitormanageQueryWrapper = (QueryWrapper)monitormanageObj; - monitormanageNum++; - } - } - } - if(!isPc && appPermission){ - if (!userProvider.get().getIsAdministrator()){ - Object monitormanageObj=authorizeService.getCondition(new AuthorizeConditionModel(monitormanageQueryWrapper,monitormanagePagination.getMenuId(),"monitormanage")); - if (ObjectUtil.isEmpty(monitormanageObj)){ - return new ArrayList<>(); - } else { - monitormanageQueryWrapper = (QueryWrapper)monitormanageObj; - monitormanageNum++; - } - - - } - } - if(StringUtil.isNotEmpty(monitormanagePagination.getMName())){ - monitormanageNum++; - monitormanageQueryWrapper.lambda().like(MonitormanageEntity::getMName,monitormanagePagination.getMName()); - } - - if(AllIdList.size()>0){ - monitormanageQueryWrapper.lambda().in(MonitormanageEntity::getId, AllIdList); - } - //排序 - if(StringUtil.isEmpty(monitormanagePagination.getSidx())){ - monitormanageQueryWrapper.lambda().orderByDesc(MonitormanageEntity::getId); - }else{ - try { - String sidx = monitormanagePagination.getSidx(); - MonitormanageEntity monitormanageEntity = new MonitormanageEntity(); - Field declaredField = monitormanageEntity.getClass().getDeclaredField(sidx); - declaredField.setAccessible(true); - String value = declaredField.getAnnotation(TableField.class).value(); - monitormanageQueryWrapper="asc".equals(monitormanagePagination.getSort().toLowerCase())?monitormanageQueryWrapper.orderByAsc(value):monitormanageQueryWrapper.orderByDesc(value); - } catch (NoSuchFieldException e) { - e.printStackTrace(); - } - } - if((total>0 && AllIdList.size()>0) || total==0){ - Page page=new Page<>(monitormanagePagination.getCurrentPage(), monitormanagePagination.getPageSize()); - IPage userIPage=this.page(page, monitormanageQueryWrapper); - return monitormanagePagination.setData(userIPage.getRecords(),userIPage.getTotal()); - }else{ - List list = new ArrayList(); - return monitormanagePagination.setData(list, list.size()); - } - } - @Override - public List getTypeList(MonitormanagePagination monitormanagePagination,String dataType){ - String userId=userProvider.get().getUserId(); - List AllIdList =new ArrayList(); - int total=0; - int monitormanageNum =0; - QueryWrapper monitormanageQueryWrapper=new QueryWrapper<>(); - boolean pcPermission = false; - boolean appPermission = false; - boolean isPc = ServletUtil.getHeader("jnpf-origin").equals("pc"); - if(isPc && pcPermission){ - if (!userProvider.get().getIsAdministrator()){ - Object monitormanageObj=authorizeService.getCondition(new AuthorizeConditionModel(monitormanageQueryWrapper,monitormanagePagination.getMenuId(),"monitormanage")); - if (ObjectUtil.isEmpty(monitormanageObj)){ - return new ArrayList<>(); - } else { - monitormanageQueryWrapper = (QueryWrapper)monitormanageObj; - monitormanageNum++; - } - } - } - if(!isPc && appPermission){ - if (!userProvider.get().getIsAdministrator()){ - Object monitormanageObj=authorizeService.getCondition(new AuthorizeConditionModel(monitormanageQueryWrapper,monitormanagePagination.getMenuId(),"monitormanage")); - if (ObjectUtil.isEmpty(monitormanageObj)){ - return new ArrayList<>(); - } else { - monitormanageQueryWrapper = (QueryWrapper)monitormanageObj; - monitormanageNum++; - } - - - } - } - if(StringUtil.isNotEmpty(monitormanagePagination.getMName())){ - monitormanageNum++; - monitormanageQueryWrapper.lambda().like(MonitormanageEntity::getMName,monitormanagePagination.getMName()); - } - - if(AllIdList.size()>0){ - monitormanageQueryWrapper.lambda().in(MonitormanageEntity::getId, AllIdList); - } - //排序 - if(StringUtil.isEmpty(monitormanagePagination.getSidx())){ - monitormanageQueryWrapper.lambda().orderByDesc(MonitormanageEntity::getId); - }else{ - try { - String sidx = monitormanagePagination.getSidx(); - MonitormanageEntity monitormanageEntity = new MonitormanageEntity(); - Field declaredField = monitormanageEntity.getClass().getDeclaredField(sidx); - declaredField.setAccessible(true); - String value = declaredField.getAnnotation(TableField.class).value(); - monitormanageQueryWrapper="asc".equals(monitormanagePagination.getSort().toLowerCase())?monitormanageQueryWrapper.orderByAsc(value):monitormanageQueryWrapper.orderByDesc(value); - } catch (NoSuchFieldException e) { - e.printStackTrace(); - } - } - if("0".equals(dataType)){ - if((total>0 && AllIdList.size()>0) || total==0){ - Page page=new Page<>(monitormanagePagination.getCurrentPage(), monitormanagePagination.getPageSize()); - IPage userIPage=this.page(page, monitormanageQueryWrapper); - return monitormanagePagination.setData(userIPage.getRecords(),userIPage.getTotal()); - }else{ - List list = new ArrayList(); - return monitormanagePagination.setData(list, list.size()); - } - }else{ - return this.list(monitormanageQueryWrapper); - } - } - - @Override - public MonitormanageEntity getInfo(String id){ - QueryWrapper queryWrapper=new QueryWrapper<>(); - queryWrapper.lambda().eq(MonitormanageEntity::getId,id); - return this.getOne(queryWrapper); - } - - @Override - public void create(MonitormanageEntity entity){ - this.save(entity); - } - - @Override - public boolean update(String id, MonitormanageEntity entity){ - entity.setId(id); - return this.updateById(entity); - } - @Override - public void delete(MonitormanageEntity entity){ - if(entity!=null){ - this.removeById(entity.getId()); - } - } - //子表方法 - - //列表子表数据方法 - - -} \ No newline at end of file diff --git a/SC-boot/linkage-scm/src/main/resources/mapper/monitorItem/Monitoring_itemMapper.xml b/SC-boot/linkage-scm/src/main/resources/mapper/monitorItem/Monitoring_itemMapper.xml index b4bcfb36..4373b705 100644 --- a/SC-boot/linkage-scm/src/main/resources/mapper/monitorItem/Monitoring_itemMapper.xml +++ b/SC-boot/linkage-scm/src/main/resources/mapper/monitorItem/Monitoring_itemMapper.xml @@ -1,6 +1,6 @@ - + diff --git a/SC-web/src/views/scm/basicInformation/inventoryOrd/Form.vue b/SC-web/src/views/scm/basicInformation/inventoryOrd/Form.vue index bda44121..793dfde2 100644 --- a/SC-web/src/views/scm/basicInformation/inventoryOrd/Form.vue +++ b/SC-web/src/views/scm/basicInformation/inventoryOrd/Form.vue @@ -7,7 +7,7 @@