diff --git a/SC-boot/linkage-admin/src/main/resources/application-dev.yml b/SC-boot/linkage-admin/src/main/resources/application-dev.yml index f8f4cb5a..518e3d5e 100644 --- a/SC-boot/linkage-admin/src/main/resources/application-dev.yml +++ b/SC-boot/linkage-admin/src/main/resources/application-dev.yml @@ -65,6 +65,7 @@ config: Path: D:\project\resources\ ServiceDirectoryPath: TemporaryFile + # Linux、MacOS环境配置（静态资源根目录和代码生成器临时目录） # Path: /www/wwwroot/JNPF.Admin.test/Resources/ # ServiceDirectoryPath: /www/wwwroot/JNPF.Admin.test/Resources/CodeTemp/ diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/Jg_natural/controller/Jg_naturalController.java b/SC-boot/linkage-scm/src/main/java/jnpf/Jg_natural/controller/Jg_naturalController.java index 355c1889..9f6f2476 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/Jg_natural/controller/Jg_naturalController.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/Jg_natural/controller/Jg_naturalController.java @@ -9,6 +9,7 @@ import cn.afterturn.easypoi.excel.entity.params.ExcelExportEntity; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import jnpf.Jg_natural.entity.Jg_naturalEntity; +import jnpf.Jg_natural.entity.Jg_naturalMobileEntity; import jnpf.Jg_natural.jg_natural.*; import jnpf.Jg_natural.service.Jg_naturalService; import jnpf.base.ActionResult; @@ -73,9 +74,9 @@ public class Jg_naturalController { */ @PostMapping("/getList") public ActionResult list(@RequestBody Jg_naturalPagination jg_naturalPagination)throws IOException{ - List list= jg_naturalService.getList(jg_naturalPagination); + List list= jg_naturalService.getList(jg_naturalPagination); //处理id字段转名称，若无需转或者为空可删除 - for(Jg_naturalEntity entity:list){ + for(Jg_naturalMobileEntity entity:list){ } List listVO=JsonUtil.getJsonToList(list,Jg_naturalListVO.class); for(Jg_naturalListVO jg_naturalVO:listVO){ diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/Jg_natural/jg_natural/Jg_naturalListVO.java b/SC-boot/linkage-scm/src/main/java/jnpf/Jg_natural/jg_natural/Jg_naturalListVO.java index 167305f8..f349a365 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/Jg_natural/jg_natural/Jg_naturalListVO.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/Jg_natural/jg_natural/Jg_naturalListVO.java @@ -49,5 +49,11 @@ public class Jg_naturalListVO{ @JsonProperty("creatorTime") private Date creatorTime; + //运输总量 + @JsonProperty("naturalSum") + private Integer naturalSum; + // 总次数 + @JsonProperty("naturalCount") + private Integer naturalCount; } \ No newline at end of file diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/Jg_natural/mapper/Jg_naturalMapper.java b/SC-boot/linkage-scm/src/main/java/jnpf/Jg_natural/mapper/Jg_naturalMapper.java index 7404abfa..b29ea538 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/Jg_natural/mapper/Jg_naturalMapper.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/Jg_natural/mapper/Jg_naturalMapper.java @@ -1,8 +1,13 @@ package jnpf.Jg_natural.mapper; +import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import jnpf.Jg_natural.entity.Jg_naturalEntity; +import jnpf.Jg_natural.entity.Jg_naturalMobileEntity; +import org.apache.ibatis.annotations.Param; /** * @@ -13,5 +18,5 @@ import jnpf.Jg_natural.entity.Jg_naturalEntity; * 日期： 2023-02-01 */ public interface Jg_naturalMapper extends BaseMapper { - + IPage getNaturalList(@Param("page") Page page, @Param("ew") Wrapper queryWrapper); } diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/Jg_natural/service/Jg_naturalService.java b/SC-boot/linkage-scm/src/main/java/jnpf/Jg_natural/service/Jg_naturalService.java index d856549b..83b79efd 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/Jg_natural/service/Jg_naturalService.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/Jg_natural/service/Jg_naturalService.java @@ -1,10 +1,15 @@ package jnpf.Jg_natural.service; +import com.baomidou.mybatisplus.core.conditions.Wrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; import jnpf.Jg_natural.entity.Jg_naturalEntity; +import jnpf.Jg_natural.entity.Jg_naturalMobileEntity; import jnpf.Jg_natural.jg_natural.Jg_naturalPagination; import java.util.List; + /** * * jg_natural @@ -15,9 +20,11 @@ import java.util.List; */ public interface Jg_naturalService extends IService { - List getList(Jg_naturalPagination jg_naturalPagination); + List getList(Jg_naturalPagination jg_naturalPagination); + + IPage page(Page page, Wrapper queryWrapper); - List getTypeList(Jg_naturalPagination jg_naturalPagination,String dataType); + List getTypeList(Jg_naturalPagination jg_naturalPagination, String dataType); diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/Jg_natural/service/impl/Jg_naturalServiceImpl.java b/SC-boot/linkage-scm/src/main/java/jnpf/Jg_natural/service/impl/Jg_naturalServiceImpl.java index 158286af..fbb3a087 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/Jg_natural/service/impl/Jg_naturalServiceImpl.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/Jg_natural/service/impl/Jg_naturalServiceImpl.java @@ -2,11 +2,13 @@ package jnpf.Jg_natural.service.impl; import cn.hutool.core.util.ObjectUtil; import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.core.conditions.Wrapper; 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.Jg_natural.entity.Jg_naturalEntity; +import jnpf.Jg_natural.entity.Jg_naturalMobileEntity; import jnpf.Jg_natural.jg_natural.Jg_naturalPagination; import jnpf.Jg_natural.mapper.Jg_naturalMapper; import jnpf.Jg_natural.service.Jg_naturalService; @@ -18,6 +20,7 @@ import jnpf.util.UserProvider; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import javax.annotation.Resource; import java.lang.reflect.Field; import java.util.ArrayList; import java.util.List; @@ -40,12 +43,14 @@ public class Jg_naturalServiceImpl extends ServiceImpl getList(Jg_naturalPagination jg_naturalPagination){ + public List getList(Jg_naturalPagination jg_naturalPagination){ String userId=userProvider.get().getUserId(); List AllIdList =new ArrayList(); int total=0; @@ -107,14 +112,20 @@ public class Jg_naturalServiceImpl extends ServiceImpl0 && AllIdList.size()>0) || total==0){ - Page page=new Page<>(jg_naturalPagination.getCurrentPage(), jg_naturalPagination.getPageSize()); - IPage userIPage=this.page(page, jg_naturalQueryWrapper); - return jg_naturalPagination.setData(userIPage.getRecords(),userIPage.getTotal()); + Page page=new Page<>(jg_naturalPagination.getCurrentPage(), jg_naturalPagination.getPageSize()); + IPage userIPage = this.page(page, jg_naturalQueryWrapper); + return jg_naturalPagination.setData(userIPage.getRecords(),userIPage.getTotal()); }else{ - List list = new ArrayList(); + List list = new ArrayList(); return jg_naturalPagination.setData(list, list.size()); } } + + @Override + public IPage page(Page page, Wrapper queryWrapper) { + return naturalMapper.getNaturalList(page,queryWrapper); + } + @Override public List getTypeList(Jg_naturalPagination jg_naturalPagination,String dataType){ String userId=userProvider.get().getUserId(); diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/camera/camera/flow.ffe b/SC-boot/linkage-scm/src/main/java/jnpf/camera/camera/flow.ffe deleted file mode 100644 index 5dfaaf17..00000000 --- a/SC-boot/linkage-scm/src/main/java/jnpf/camera/camera/flow.ffe +++ /dev/null @@ -1 +0,0 @@ -{"flowEngine":{"appFormUrl":null,"category":"crm","creatorTime":1670572225000,"creatorUser":"admin","dbLinkId":"0","deleteMark":null,"deleteTime":null,"deleteUserId":null,"description":"获取摄像头的地址，定期更新","enCode":"002","enabledMark":1,"flowTemplateJson":"{\"type\":\"start\",\"content\":\"所有人\",\"properties\":{\"initiator\":[],\"initiatePos\":[],\"initiateRole\":[],\"title\":\"流程发起\",\"formOperates\":[{\"id\":\"mId\",\"name\":\"主表ID\",\"required\":false,\"requiredDisabled\":false,\"jnpfKey\":\"select\",\"dataType\":\"\",\"read\":true,\"write\":true},{\"id\":\"mName\",\"name\":\"设备名\",\"required\":true,\"requiredDisabled\":true,\"jnpfKey\":\"comInput\",\"dataType\":\"\",\"read\":true,\"write\":true},{\"id\":\"serialnumber\",\"name\":\"设备序列号\",\"required\":true,\"requiredDisabled\":true,\"jnpfKey\":\"comInput\",\"dataType\":\"\",\"read\":true,\"write\":true},{\"id\":\"flvaddress\",\"name\":\"标清flv直播地址\",\"required\":true,\"requiredDisabled\":true,\"jnpfKey\":\"comInput\",\"dataType\":\"\",\"read\":true,\"write\":true},{\"id\":\"flvhdaddress\",\"name\":\"高清flv直播地址\",\"required\":true,\"requiredDisabled\":true,\"jnpfKey\":\"comInput\",\"dataType\":\"\",\"read\":true,\"write\":true},{\"id\":\"mStatus\",\"name\":\"设备状态：不在线、在线\",\"required\":false,\"requiredDisabled\":false,\"jnpfKey\":\"switch\",\"dataType\":\"\",\"read\":true,\"write\":true}],\"initFuncConfig\":{\"on\":false,\"interfaceId\":\"\",\"interfaceName\":\"\",\"templateJson\":[]},\"endFuncConfig\":{\"on\":false,\"interfaceId\":\"\",\"interfaceName\":\"\",\"templateJson\":[]},\"flowRecallFuncConfig\":{\"on\":false,\"interfaceId\":\"\",\"interfaceName\":\"\",\"templateJson\":[]},\"waitMsgConfig\":{\"on\":0,\"msgId\":\"\",\"msgName\":\"\",\"templateJson\":[]},\"endMsgConfig\":{\"on\":0,\"msgId\":\"\",\"msgName\":\"\",\"templateJson\":[]},\"approveMsgConfig\":{\"on\":0,\"msgId\":\"\",\"msgName\":\"\",\"templateJson\":[]},\"rejectMsgConfig\":{\"on\":0,\"msgId\":\"\",\"msgName\":\"\",\"templateJson\":[]},\"copyMsgConfig\":{\"on\":0,\"msgId\":\"\",\"msgName\":\"\",\"templateJson\":[]},\"hasSubmitBtn\":true,\"submitBtnText\":\"提 交\",\"hasSaveBtn\":true,\"saveBtnText\":\"暂 存\",\"hasPressBtn\":false,\"pressBtnText\":\"催 办\",\"hasRevokeBtn\":false,\"revokeBtnText\":\"撤 回\",\"hasPrintBtn\":false,\"printBtnText\":\"打 印\",\"printId\":\"\",\"isComment\":false,\"isBatchApproval\":false,\"isSummary\":false,\"summaryType\":0},\"nodeId\":\"RbGc8G1\"}","formData":"[{\"filedId\":\"mId\",\"filedName\":\"主表ID\",\"required\":false},{\"filedId\":\"mName\",\"filedName\":\"设备名\",\"required\":true},{\"filedId\":\"serialnumber\",\"filedName\":\"设备序列号\",\"required\":true},{\"filedId\":\"flvaddress\",\"filedName\":\"标清flv直播地址\",\"required\":true},{\"filedId\":\"flvhdaddress\",\"filedName\":\"高清flv直播地址\",\"required\":true},{\"filedId\":\"mStatus\",\"filedName\":\"设备状态：不在线、在线\",\"required\":false}]","formType":1,"formUrl":"extend/monitoring_item/form.vue","fullName":"摄像头数据","icon":"fa fa-file-text-o","iconBackground":null,"id":"370926725908927749","lastModifyTime":1670574143000,"lastModifyUser":"admin","sortCode":0,"tables":"[]","type":1,"version":null,"visibleType":0},"visibleList":[]} \ No newline at end of file diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/camera/camera/html/app/form/index.vue b/SC-boot/linkage-scm/src/main/java/jnpf/camera/camera/html/app/form/index.vue deleted file mode 100644 index bd301a52..00000000 --- a/SC-boot/linkage-scm/src/main/java/jnpf/camera/camera/html/app/form/index.vue +++ /dev/null @@ -1,175 +0,0 @@ - - - diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/camera/camera/html/app/index/index.vue b/SC-boot/linkage-scm/src/main/java/jnpf/camera/camera/html/app/index/index.vue deleted file mode 100644 index 98555598..00000000 --- a/SC-boot/linkage-scm/src/main/java/jnpf/camera/camera/html/app/index/index.vue +++ /dev/null @@ -1,389 +0,0 @@ - - - - - diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/camera/camera/html/web/monitoring_item/ExportBox.vue b/SC-boot/linkage-scm/src/main/java/jnpf/camera/camera/html/web/monitoring_item/ExportBox.vue deleted file mode 100644 index e61a2182..00000000 --- a/SC-boot/linkage-scm/src/main/java/jnpf/camera/camera/html/web/monitoring_item/ExportBox.vue +++ /dev/null @@ -1,68 +0,0 @@ - - - - \ No newline at end of file diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/camera/camera/html/web/monitoring_item/form.vue b/SC-boot/linkage-scm/src/main/java/jnpf/camera/camera/html/web/monitoring_item/form.vue deleted file mode 100644 index 4eec2b2d..00000000 --- a/SC-boot/linkage-scm/src/main/java/jnpf/camera/camera/html/web/monitoring_item/form.vue +++ /dev/null @@ -1,341 +0,0 @@ - - diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/camera/camera/html/web/monitoring_item/index.vue b/SC-boot/linkage-scm/src/main/java/jnpf/camera/camera/html/web/monitoring_item/index.vue deleted file mode 100644 index 80157067..00000000 --- a/SC-boot/linkage-scm/src/main/java/jnpf/camera/camera/html/web/monitoring_item/index.vue +++ /dev/null @@ -1,307 +0,0 @@ - - - diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/camera/controller/Monitoring_itemController.java b/SC-boot/linkage-scm/src/main/java/jnpf/camera/controller/Monitoring_itemController.java deleted file mode 100644 index c7dc427a..00000000 --- a/SC-boot/linkage-scm/src/main/java/jnpf/camera/controller/Monitoring_itemController.java +++ /dev/null @@ -1,356 +0,0 @@ -package jnpf.camera.controller; - -import cn.afterturn.easypoi.excel.ExcelExportUtil; -import cn.afterturn.easypoi.excel.entity.ExportParams; -import cn.afterturn.easypoi.excel.entity.enmus.ExcelType; -import cn.afterturn.easypoi.excel.entity.params.ExcelExportEntity; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; -import jnpf.base.ActionResult; -import jnpf.base.UserInfo; -import jnpf.base.entity.VisualdevEntity; -import jnpf.base.vo.DownloadVO; -import jnpf.base.vo.PageListVO; -import jnpf.base.vo.PaginationVO; -import jnpf.camera.entity.Monitoring_itemEntity; -import jnpf.camera.model.monitoring_item.*; -import jnpf.camera.service.Monitoring_itemService; -import jnpf.config.ConfigValueUtil; -import jnpf.engine.entity.FlowTaskEntity; -import jnpf.engine.enums.FlowStatusEnum; -import jnpf.exception.DataException; -import jnpf.exception.WorkFlowException; -import jnpf.util.*; -import jnpf.util.enums.FileTypeEnum; -import jnpf.util.file.UploadUtil; -import lombok.Cleanup; -import lombok.extern.slf4j.Slf4j; -import org.apache.poi.hssf.usermodel.HSSFWorkbook; -import org.apache.poi.ss.usermodel.Workbook; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.transaction.annotation.Transactional; -import org.springframework.web.bind.annotation.*; - -import javax.validation.Valid; -import java.io.FileOutputStream; -import java.io.IOException; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.List; -import java.util.Map; - - -/** - * - * monitoring_item - * @版本： V3.2.0 - * @版权： 长江云息（https://www.jnpfsoft.com） - * @作者： Allen Pan - * @日期： 2022-12-09 - */ -@Slf4j -@RestController -@Api(tags = "监控摄像头视频流的获取" , value = "监控摄像头视频流的获取") -@RequestMapping("/api/example/Monitoring_item") -public class Monitoring_itemController { - - - @Autowired - private GeneraterSwapUtil generaterSwapUtil; - - @Autowired - private ConfigValueUtil configValueUtil; - - @Autowired - private UserProvider userProvider; - - @Autowired - private Monitoring_itemService monitoring_itemService; - - - - /** - * 列表 - * - * @param monitoring_itemPagination - * @return - */ - @PostMapping("/getList") - public ActionResult list(@RequestBody Monitoring_itemPagination monitoring_itemPagination)throws IOException{ - List list= monitoring_itemService.getList(monitoring_itemPagination); - //处理id字段转名称，若无需转或者为空可删除 - for(Monitoring_itemEntity entity:list){ - entity.setMId(generaterSwapUtil.getDynName("370933183241262469" ,"M_Name" ,"id","" ,entity.getMId())); - entity.setMStatus(generaterSwapUtil.switchSelectValue(entity.getMStatus() ,"开" ,"关")); - } - List listVO=JsonUtil.getJsonToList(list,Monitoring_itemListVO.class); - for(Monitoring_itemListVO monitoring_itemVO:listVO){ - } - for(Monitoring_itemListVO vo:listVO){ - FlowTaskEntity flowTaskEntity = generaterSwapUtil.getInfoSubmit(vo.getId(), FlowTaskEntity::getStatus); - if (flowTaskEntity!=null){ - vo.setFlowState(flowTaskEntity.getStatus()); - }else{ - vo.setFlowState(null); - } - } - PageListVO vo=new PageListVO(); - vo.setList(listVO); - PaginationVO page=JsonUtil.getJsonToBean(monitoring_itemPagination,PaginationVO.class); - vo.setPagination(page); - return ActionResult.success(vo); - } - - - /** - * 创建 - * - * @param crData - * @return - */ - @PostMapping - @Transactional - public ActionResult create(@RequestBody @Valid Map crData) throws DataException { - Monitoring_itemCrForm monitoring_itemCrForm = JsonUtil.getJsonToBean(crData,Monitoring_itemCrForm.class); - String visualId ="370926725908927749"; - VisualdevEntity visualdevEntity =generaterSwapUtil.getVisualEntity(visualId); - String mainId =RandomUtil.uuId(); - UserInfo userInfo=userProvider.get(); - Monitoring_itemEntity entity = JsonUtil.getJsonToBean(monitoring_itemCrForm, Monitoring_itemEntity.class); - entity.setId(mainId); - monitoring_itemService.save(entity); - if (FlowStatusEnum.submit.getMessage().equals(monitoring_itemCrForm.getStatus())){ - try { - generaterSwapUtil.submitFlowTask(visualdevEntity,mainId,monitoring_itemCrForm,userInfo,monitoring_itemCrForm.getCandidateList()); - } catch (WorkFlowException e) { - e.printStackTrace(); - } - return ActionResult.success("提交成功，请耐心等待"); - } - 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(Monitoring_itemPaginationExportModel monitoring_itemPaginationExportModel) throws IOException { - if (StringUtil.isEmpty(monitoring_itemPaginationExportModel.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()); - //处理id字段转名称，若无需转或者为空可删除 - for(Monitoring_itemEntity entity:list){ - entity.setMId(generaterSwapUtil.getDynName("370933183241262469" ,"M_Name" ,"id","" ,entity.getMId())); - entity.setMStatus(generaterSwapUtil.switchSelectValue(entity.getMStatus() ,"开" ,"关")); - } - List listVO=JsonUtil.getJsonToList(list,Monitoring_itemListVO.class); - for(Monitoring_itemListVO monitoring_itemVO: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]; - 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 "mId" : - entitys.add(new ExcelExportEntity("主表ID" ,"mId")); - break; - case "mName" : - entitys.add(new ExcelExportEntity("设备名" ,"mName")); - break; - case "serialnumber" : - entitys.add(new ExcelExportEntity("设备序列号" ,"serialnumber")); - break; - case "flvaddress" : - entitys.add(new ExcelExportEntity("标清flv直播地址" ,"flvaddress")); - break; - case "flvhdaddress" : - entitys.add(new ExcelExportEntity("高清flv直播地址" ,"flvhdaddress")); - break; - case "mStatus" : - entitys.add(new ExcelExportEntity("设备状态：不在线、在线" ,"mStatus")); - 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(","); - List allIdList = Arrays.asList(idList); - List columnIdList = new ArrayList<>(20); - int i =0; - for (String allId : allIdList){ - FlowTaskEntity taskEntity = generaterSwapUtil.getInfoSubmit(allId, FlowTaskEntity::getId, FlowTaskEntity::getStatus); - if (taskEntity==null){ - columnIdList.add(allId); - }else if (taskEntity.getStatus().equals(0)){ - try { - generaterSwapUtil.deleteFlowTask(taskEntity); - columnIdList.add(allId); - i++; - } catch (WorkFlowException e) { - e.printStackTrace(); - } - } - } - monitoring_itemService.removeByIds(columnIdList); - if (i == 0 && columnIdList.size()==0){ - return ActionResult.fail("流程已发起，无法删除"); - } - return ActionResult.success("删除成功"); - } - - - /** - * 信息 - * - * @param id - * @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); - - //子表 - //副表 - return ActionResult.success(vo); - } - - - - - - /** - * 更新 - * - * @param id - * @return - */ - @PutMapping("/{id}") - @Transactional - public ActionResult update(@PathVariable("id") String id,@RequestBody @Valid Map upData) throws DataException { - Monitoring_itemUpForm monitoring_itemUpForm = JsonUtil.getJsonToBean(upData,Monitoring_itemUpForm.class); - String visualId ="370926725908927749"; - VisualdevEntity visualdevEntity =generaterSwapUtil.getVisualEntity(visualId); - UserInfo userInfo=userProvider.get(); - Monitoring_itemEntity entity= monitoring_itemService.getInfo(id); - if(entity!=null){ - Monitoring_itemEntity subentity=JsonUtil.getJsonToBean(monitoring_itemUpForm, Monitoring_itemEntity.class); - monitoring_itemService.update(id, subentity); - - if (FlowStatusEnum.submit.getMessage().equals(monitoring_itemUpForm.getStatus())){ - try { - generaterSwapUtil.submitFlowTask(visualdevEntity,id,subentity,userInfo,monitoring_itemUpForm.getCandidateList()); - } catch (WorkFlowException e) { - e.printStackTrace(); - } - return ActionResult.success("提交成功，请耐心等待"); - } - return ActionResult.success("更新成功"); - }else{ - return ActionResult.fail("更新失败，数据不存在"); - } - } - - /** - * 删除 - * - * @param id - * @return - */ - @DeleteMapping("/{id}") - @Transactional - public ActionResult delete(@PathVariable("id") String id){ - Monitoring_itemEntity entity= monitoring_itemService.getInfo(id); - if(entity!=null){ - FlowTaskEntity taskEntity = generaterSwapUtil.getInfoSubmit(id, FlowTaskEntity::getId, FlowTaskEntity::getStatus); - if (taskEntity != null) { - try { - generaterSwapUtil.deleteFlowTask(taskEntity); - } catch (WorkFlowException e) { - e.printStackTrace(); - } - } - monitoring_itemService.delete(entity); - - } - return ActionResult.success("删除成功"); - } - - - - - -} diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/camera/entity/Monitoring_itemEntity.java b/SC-boot/linkage-scm/src/main/java/jnpf/camera/entity/Monitoring_itemEntity.java deleted file mode 100644 index 935a0b4d..00000000 --- a/SC-boot/linkage-scm/src/main/java/jnpf/camera/entity/Monitoring_itemEntity.java +++ /dev/null @@ -1,82 +0,0 @@ -package jnpf.camera.entity; - -import com.baomidou.mybatisplus.annotation.IdType; -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; -/** - * - * 监控清单 - * @版本： V3.2.0 - * @版权： 长江云息（https://www.jnpfsoft.com） - * @作者： Allen Pan - * @日期： 2022-12-09 - */ -@Data -@TableName("monitoring_item") -public class Monitoring_itemEntity { - - @TableId(value = "F_ID",type = IdType.AUTO) - private String id; - - @TableField("F_CREATORUSERID") - private Integer creatoruserid; - - @TableField("F_CREATORUSERNAME") - private String creatorusername; - - @TableField("F_CREATORTIME") - private Date creatortime; - - @TableField("F_LASTMODIFYUSERID") - private Integer lastmodifyuserid; - - @TableField("F_LASTMODIFYUSERNAME") - private String lastmodifyusername; - - @TableField("F_LASTMODIFYTIME") - private Date lastmodifytime; - - @TableField("F_DELETEUSERID") - private Integer deleteuserid; - - @TableField("F_DELETEUSERNAME") - private String deleteusername; - - @TableField("F_DELETETIME") - private Date deletetime; - - @TableField("F_DELETEMARK") - private String deletemark; - - @TableField("Z_ID") - private Integer zId; - - @TableField("D_ID") - private Integer dId; - - @TableField("M_ID") - private String mId; - - @TableField("M_NAME") - private String mName; - - @TableField("SERIALNUMBER") - private String serialnumber; - - @TableField("M_STATUS") - private String mStatus; - - @TableField("FLVADDRESS") - private String flvaddress; - - @TableField("FLVHDADDRESS") - private String flvhdaddress; - - @TableField("ChannelNumber") - private String channelNumber; - -} diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/camera/imou/utils/Testaa.java b/SC-boot/linkage-scm/src/main/java/jnpf/camera/imou/utils/Testaa.java deleted file mode 100644 index e5f9e72c..00000000 --- a/SC-boot/linkage-scm/src/main/java/jnpf/camera/imou/utils/Testaa.java +++ /dev/null @@ -1,21 +0,0 @@ -package jnpf.camera.imou.utils; - -import cn.hutool.json.JSONObject; - -public class Testaa { - public static void main(String[] args) { -// {"result":{"msg":"操作成功。","code":"0","data":{"expireTime":252417,"accessToken":"At_0000062668d71c5b455386dcb052b4af"}},"id":"98a7a257-c4e4-4db3-a2d3-d97a3836b87c"} - String a="{\"result\":{\"msg\":\"操作成功。\",\"code\":\"0\",\"data\":{\"expireTime\":252417,\"accessToken\":\"At_0000062668d71c5b455386dcb052b4af\"}},\"id\":\"98a7a257-c4e4-4db3-a2d3-d97a3836b87c\"}"; - String resText=a; - if (resText.length()>0){ - JSONObject a1=new JSONObject(resText); - JSONObject a2=new JSONObject(a1.get("result")); - JSONObject a3=new JSONObject(a2.get("data")); -// JSONObject a4=new JSONObject(a3.get("accessToken")); - System.out.println(a1); - System.out.println(a2); - System.out.println(a3.get("accessToken")); -// System.out.println(a4); - } - } -} diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/camera/mapper/Monitoring_itemMapper.java b/SC-boot/linkage-scm/src/main/java/jnpf/camera/mapper/Monitoring_itemMapper.java deleted file mode 100644 index 6c304426..00000000 --- a/SC-boot/linkage-scm/src/main/java/jnpf/camera/mapper/Monitoring_itemMapper.java +++ /dev/null @@ -1,20 +0,0 @@ -package jnpf.camera.mapper; - - -//import jnpf.entity.Monitoring_itemEntity; - -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import jnpf.camera.entity.Monitoring_itemEntity; - - -/** - * - * monitoring_item - * 版本： V3.2.0 - * 版权： 长江云息（https://www.jnpfsoft.com） - * 作者： Allen Pan - * 日期： 2022-12-09 - */ -public interface Monitoring_itemMapper extends BaseMapper { - -} diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/camera/model/monitoring_item/Monitoring_itemCrForm.java b/SC-boot/linkage-scm/src/main/java/jnpf/camera/model/monitoring_item/Monitoring_itemCrForm.java deleted file mode 100644 index a132e15a..00000000 --- a/SC-boot/linkage-scm/src/main/java/jnpf/camera/model/monitoring_item/Monitoring_itemCrForm.java +++ /dev/null @@ -1,59 +0,0 @@ - - -package jnpf.camera.model.monitoring_item; - -import com.fasterxml.jackson.annotation.JsonProperty; -import lombok.Data; - -import java.util.List; -import java.util.Map; - -/** - * - * - * @版本： V3.2.0 - * @版权： 长江云息（https://www.jnpfsoft.com） - * @作者： Allen Pan - * @日期： 2022-12-09 - */ -@Data -public class Monitoring_itemCrForm { - /** 流程状态 **/ - @JsonProperty("status") - private String status; - - private Map> candidateList; - - /** 主表ID **/ - @JsonProperty("mId") - private String mId; - - - /** 设备名 **/ - @JsonProperty("mName") - private String mName; - - - /** 设备序列号 **/ - @JsonProperty("serialnumber") - private String serialnumber; - - - /** 标清flv直播地址 **/ - @JsonProperty("flvaddress") - private String flvaddress; - - - /** 高清flv直播地址 **/ - @JsonProperty("flvhdaddress") - private String flvhdaddress; - - - /** 设备状态：不在线、在线 **/ - @JsonProperty("mStatus") - private String mStatus; - - - - -} \ No newline at end of file diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/camera/model/monitoring_item/Monitoring_itemInfoVO.java b/SC-boot/linkage-scm/src/main/java/jnpf/camera/model/monitoring_item/Monitoring_itemInfoVO.java deleted file mode 100644 index d028cdcf..00000000 --- a/SC-boot/linkage-scm/src/main/java/jnpf/camera/model/monitoring_item/Monitoring_itemInfoVO.java +++ /dev/null @@ -1,45 +0,0 @@ - - -package jnpf.camera.model.monitoring_item; - -import com.fasterxml.jackson.annotation.JsonProperty; -import lombok.Data; -/** - * - * - * @版本： V3.2.0 - * @版权： 长江云息（https://www.jnpfsoft.com） - * @作者： Allen Pan - * @日期： 2022-12-09 - */ -@Data -public class Monitoring_itemInfoVO{ - /** 主键 **/ - @JsonProperty("id") - private String id; - - /** 主表ID **/ - @JsonProperty("mId") - private String mId; - - /** 设备名 **/ - @JsonProperty("mName") - private String mName; - - /** 设备序列号 **/ - @JsonProperty("serialnumber") - private String serialnumber; - - /** 标清flv直播地址 **/ - @JsonProperty("flvaddress") - private String flvaddress; - - /** 高清flv直播地址 **/ - @JsonProperty("flvhdaddress") - private String flvhdaddress; - - /** 设备状态：不在线、在线 **/ - @JsonProperty("mStatus") - private String mStatus; - -} \ No newline at end of file diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/camera/model/monitoring_item/Monitoring_itemListQuery.java b/SC-boot/linkage-scm/src/main/java/jnpf/camera/model/monitoring_item/Monitoring_itemListQuery.java deleted file mode 100644 index 052e3ab6..00000000 --- a/SC-boot/linkage-scm/src/main/java/jnpf/camera/model/monitoring_item/Monitoring_itemListQuery.java +++ /dev/null @@ -1,22 +0,0 @@ -package jnpf.camera.model.monitoring_item; - -import jnpf.base.Pagination; -import lombok.Data; -/** - * - * - * @版本： V3.2.0 - * @版权： 长江云息（https://www.jnpfsoft.com） - * @作者： Allen Pan - * @日期： 2022-12-09 - */ -@Data -public class Monitoring_itemListQuery 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/camera/model/monitoring_item/Monitoring_itemListVO.java b/SC-boot/linkage-scm/src/main/java/jnpf/camera/model/monitoring_item/Monitoring_itemListVO.java deleted file mode 100644 index c77da10a..00000000 --- a/SC-boot/linkage-scm/src/main/java/jnpf/camera/model/monitoring_item/Monitoring_itemListVO.java +++ /dev/null @@ -1,59 +0,0 @@ - - -package jnpf.camera.model.monitoring_item; - - -import com.fasterxml.jackson.annotation.JsonProperty; -import lombok.Data; -/** - * - * - * @版本： V3.2.0 - * @版权： 长江云息（https://www.jnpfsoft.com） - * @作者： Allen Pan - * @日期： 2022-12-09 - */ -@Data -public class Monitoring_itemListVO{ - /** 主键 */ - private String id; - - - /** 主表ID **/ - @JsonProperty("mId") - private String mId; - - - - /** 设备名 **/ - @JsonProperty("mName") - private String mName; - - - - /** 设备序列号 **/ - @JsonProperty("serialnumber") - private String serialnumber; - - - - /** 标清flv直播地址 **/ - @JsonProperty("flvaddress") - private String flvaddress; - - - - /** 高清flv直播地址 **/ - @JsonProperty("flvhdaddress") - private String flvhdaddress; - - - - /** 设备状态：不在线、在线 **/ - @JsonProperty("mStatus") - private String mStatus; - - - @JsonProperty("flowState") - private Integer flowState; -} \ No newline at end of file diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/camera/model/monitoring_item/Monitoring_itemPagination.java b/SC-boot/linkage-scm/src/main/java/jnpf/camera/model/monitoring_item/Monitoring_itemPagination.java deleted file mode 100644 index 41d20bab..00000000 --- a/SC-boot/linkage-scm/src/main/java/jnpf/camera/model/monitoring_item/Monitoring_itemPagination.java +++ /dev/null @@ -1,24 +0,0 @@ -package jnpf.camera.model.monitoring_item; - - -import jnpf.base.Pagination; -import lombok.Data; - -/** - * - * - * @版本： V3.2.0 - * @版权： 长江云息（https://www.jnpfsoft.com） - * @作者： Allen Pan - * @日期： 2022-12-09 - */ -@Data -public class Monitoring_itemPagination 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/camera/model/monitoring_item/Monitoring_itemPaginationExportModel.java b/SC-boot/linkage-scm/src/main/java/jnpf/camera/model/monitoring_item/Monitoring_itemPaginationExportModel.java deleted file mode 100644 index aa9d9f67..00000000 --- a/SC-boot/linkage-scm/src/main/java/jnpf/camera/model/monitoring_item/Monitoring_itemPaginationExportModel.java +++ /dev/null @@ -1,25 +0,0 @@ -package jnpf.camera.model.monitoring_item; - -import jnpf.base.Pagination; -import lombok.Data; -/** - * - * - * @版本： V3.2.0 - * @版权： 长江云息（https://www.jnpfsoft.com） - * @作者： Allen Pan - * @日期： 2022-12-09 - */ -@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/camera/model/monitoring_item/Monitoring_itemUpForm.java b/SC-boot/linkage-scm/src/main/java/jnpf/camera/model/monitoring_item/Monitoring_itemUpForm.java deleted file mode 100644 index de4d1ab8..00000000 --- a/SC-boot/linkage-scm/src/main/java/jnpf/camera/model/monitoring_item/Monitoring_itemUpForm.java +++ /dev/null @@ -1,55 +0,0 @@ - - -package jnpf.camera.model.monitoring_item; - -import com.fasterxml.jackson.annotation.JsonProperty; -import lombok.Data; - -import java.util.List; -import java.util.Map; - -/** - * - * - * @版本： V3.2.0 - * @版权： 长江云息（https://www.jnpfsoft.com） - * @作者： Allen Pan - * @日期： 2022-12-09 - */ -@Data -public class Monitoring_itemUpForm{ - /** 主键 */ - private String id; - - /** 流程状态 **/ - @JsonProperty("status") - private String status; - - private Map> candidateList; - - /** 主表ID **/ - @JsonProperty("mId") - private String mId; - - /** 设备名 **/ - @JsonProperty("mName") - private String mName; - - /** 设备序列号 **/ - @JsonProperty("serialnumber") - private String serialnumber; - - /** 标清flv直播地址 **/ - @JsonProperty("flvaddress") - private String flvaddress; - - /** 高清flv直播地址 **/ - @JsonProperty("flvhdaddress") - private String flvhdaddress; - - /** 设备状态：不在线、在线 **/ - @JsonProperty("mStatus") - private String mStatus; - - -} \ No newline at end of file diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/camera/service/Monitoring_itemService.java b/SC-boot/linkage-scm/src/main/java/jnpf/camera/service/Monitoring_itemService.java deleted file mode 100644 index 918b9733..00000000 --- a/SC-boot/linkage-scm/src/main/java/jnpf/camera/service/Monitoring_itemService.java +++ /dev/null @@ -1,35 +0,0 @@ -package jnpf.camera.service; - -import com.baomidou.mybatisplus.extension.service.IService; -import jnpf.camera.entity.Monitoring_itemEntity; -import jnpf.camera.model.monitoring_item.Monitoring_itemPagination; - -import java.util.List; -/** - * - * monitoring_item - * 版本： V3.2.0 - * 版权： 长江云息（https://www.jnpfsoft.com） - * 作者： Allen Pan - * 日期： 2022-12-09 - */ -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/camera/service/impl/Monitoring_itemServiceImpl.java b/SC-boot/linkage-scm/src/main/java/jnpf/camera/service/impl/Monitoring_itemServiceImpl.java deleted file mode 100644 index c04fd2de..00000000 --- a/SC-boot/linkage-scm/src/main/java/jnpf/camera/service/impl/Monitoring_itemServiceImpl.java +++ /dev/null @@ -1,208 +0,0 @@ -package jnpf.camera.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.camera.entity.Monitoring_itemEntity; -import jnpf.camera.mapper.Monitoring_itemMapper; -import jnpf.camera.model.monitoring_item.Monitoring_itemPagination; -import jnpf.camera.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; - -/** - * - * monitoring_item - * 版本： V3.2.0 - * 版权： 长江云息（https://www.jnpfsoft.com） - * 作者： Allen Pan - * 日期： 2022-12-09 - */ -@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 = true; - boolean appPermission = true; - 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().orderByAsc(Monitoring_itemEntity::getMId); - }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 = true; - boolean appPermission = true; - 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().orderByAsc(Monitoring_itemEntity::getMId); - }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/customer/controller/CustomerJGController.java b/SC-boot/linkage-scm/src/main/java/jnpf/customer/controller/CustomerJGController.java index 9fd3a6c6..35e0c1a3 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/customer/controller/CustomerJGController.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/customer/controller/CustomerJGController.java @@ -1,50 +1,41 @@ package jnpf.customer.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 cn.afterturn.easypoi.excel.entity.params.ExcelExportEntity; 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.base.vo.PageListVO; +import jnpf.base.vo.PaginationVO; import jnpf.config.ConfigValueUtil; -import jnpf.exception.DataException; -import org.springframework.transaction.annotation.Transactional; -import jnpf.base.entity.ProvinceEntity; +import jnpf.customer.entity.CustomerJGEntity; +import jnpf.customer.entity.CustomerJGMobileEntity; import jnpf.customer.model.customer.*; -import jnpf.customer.model.customer.CustomerPagination; -import jnpf.customer.entity.*; +import jnpf.customer.service.CustomerJGService; +import jnpf.exception.DataException; 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 jnpf.util.enums.FileTypeEnum; +import jnpf.util.file.UploadUtil; import lombok.Cleanup; +import lombok.extern.slf4j.Slf4j; 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.customer.entity.CustomerJGEntity; -import jnpf.customer.service.CustomerJGService; -import org.springframework.web.bind.annotation.*; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.multipart.MultipartFile; +import org.springframework.transaction.annotation.Transactional; +import org.springframework.web.bind.annotation.*; + 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; +import java.util.ArrayList; +import java.util.List; +import java.util.Map; /** * @@ -83,9 +74,9 @@ public class CustomerJGController { */ @PostMapping("/getList") public ActionResult list(@RequestBody CustomerPagination customerPagination)throws IOException{ - List list= customerService.getList(customerPagination); + List list= customerService.getList(customerPagination); //处理id字段转名称，若无需转或者为空可删除 - for(CustomerJGEntity entity:list){ + for(CustomerJGMobileEntity entity:list){ entity.setStatus(generaterSwapUtil.switchSelectValue(entity.getStatus() ,"1" ,"2")); } List listVO=JsonUtil.getJsonToList(list,CustomerListVO.class); diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/customer/mapper/CustomerJGMapper.java b/SC-boot/linkage-scm/src/main/java/jnpf/customer/mapper/CustomerJGMapper.java index 627e63d6..f2ca9696 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/customer/mapper/CustomerJGMapper.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/customer/mapper/CustomerJGMapper.java @@ -1,8 +1,14 @@ package jnpf.customer.mapper; +import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import jnpf.customer.entity.CustomerJGEntity; +import jnpf.customer.entity.CustomerJGMobileEntity; +import org.apache.ibatis.annotations.Param; + /** * @@ -13,5 +19,6 @@ import jnpf.customer.entity.CustomerJGEntity; * 日期： 2023-01-04 */ public interface CustomerJGMapper extends BaseMapper { + IPage getMobileList(@Param("page") Page page, @Param("ew") Wrapper ew); } diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/customer/model/customer/CustomerListVO.java b/SC-boot/linkage-scm/src/main/java/jnpf/customer/model/customer/CustomerListVO.java index 767e46fa..66db2196 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/customer/model/customer/CustomerListVO.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/customer/model/customer/CustomerListVO.java @@ -3,12 +3,8 @@ package jnpf.customer.model.customer; -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; +import lombok.Data; /** * * @@ -67,6 +63,20 @@ public class CustomerListVO{ /** 是否启用 **/ @JsonProperty("status") private String status; - + // 收获量 + @JsonProperty("settlemenSum") + private Double settlemenSum; + // 净重 + @JsonProperty("weightSum") + private Double weightSum; + // 扣重 + @JsonProperty("buckleWeightSum") + private Double buckleWeightSum; + // 总重 + @JsonProperty("grossWeightSum") + private Double grossWeightSum; + // 总额 + @JsonProperty("salesPriceSum") + private Double salesPriceSum; } \ No newline at end of file diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/customer/service/CustomerJGService.java b/SC-boot/linkage-scm/src/main/java/jnpf/customer/service/CustomerJGService.java index 5a0408bd..12caa302 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/customer/service/CustomerJGService.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/customer/service/CustomerJGService.java @@ -1,7 +1,11 @@ package jnpf.customer.service; +import com.baomidou.mybatisplus.core.conditions.Wrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; import jnpf.customer.entity.CustomerJGEntity; +import jnpf.customer.entity.CustomerJGMobileEntity; import jnpf.customer.model.customer.CustomerPagination; import java.util.*; @@ -15,7 +19,7 @@ import java.util.*; */ public interface CustomerJGService extends IService { - List getList(CustomerPagination customerPagination); + List getList(CustomerPagination customerPagination); List getTypeList(CustomerPagination customerPagination, String dataType); @@ -28,7 +32,8 @@ public interface CustomerJGService extends IService { void create(CustomerJGEntity entity); boolean update(String id, CustomerJGEntity entity); - + public IPage page(Page page, Wrapper queryWrapper); + // 子表方法 //列表子表数据方法 diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/customer/service/impl/CustomerJGServiceImpl.java b/SC-boot/linkage-scm/src/main/java/jnpf/customer/service/impl/CustomerJGServiceImpl.java index 7ed9c05f..add6b4de 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/customer/service/impl/CustomerJGServiceImpl.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/customer/service/impl/CustomerJGServiceImpl.java @@ -1,36 +1,29 @@ package jnpf.customer.service.impl; -import jnpf.customer.entity.*; -import jnpf.customer.mapper.CustomerJGMapper; -import jnpf.customer.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.customer.model.customer.CustomerPagination; - -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.conditions.Wrapper; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; 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.*; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import jnpf.customer.entity.CustomerJGEntity; +import jnpf.customer.entity.CustomerJGMobileEntity; +import jnpf.customer.mapper.CustomerJGMapper; +import jnpf.customer.model.customer.CustomerPagination; +import jnpf.customer.service.CustomerJGService; +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 javax.annotation.Resource; +import java.lang.reflect.Field; +import java.util.ArrayList; +import java.util.List; /** * @@ -50,12 +43,13 @@ public class CustomerJGServiceImpl extends ServiceImpl getList(CustomerPagination customerPagination){ + public List getList(CustomerPagination customerPagination){ String userId=userProvider.get().getUserId(); List AllIdList =new ArrayList(); int total=0; @@ -129,14 +123,26 @@ public class CustomerJGServiceImpl extends ServiceImpl0 && AllIdList.size()>0) || total==0){ - Page page=new Page<>(customerPagination.getCurrentPage(), customerPagination.getPageSize()); - IPage userIPage=this.page(page, customerQueryWrapper); + Page page=new Page<>(customerPagination.getCurrentPage(), customerPagination.getPageSize()); + IPage userIPage=this.page(page, customerQueryWrapper); return customerPagination.setData(userIPage.getRecords(),userIPage.getTotal()); }else{ - List list = new ArrayList(); + List list = new ArrayList(); return customerPagination.setData(list, list.size()); } } + + /** + * @TODO 重载page方法 + * @param page + * @param queryWrapper + * @return + */ + @Override + public IPage page( Page page, Wrapper queryWrapper) { + return customerJGMapper.getMobileList(page, queryWrapper); + } + @Override public List getTypeList(CustomerPagination customerPagination,String dataType){ String userId=userProvider.get().getUserId(); diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/material/entity/MaterialMobileEntity.java b/SC-boot/linkage-scm/src/main/java/jnpf/material/entity/MaterialMobileEntity.java index af0aabbb..4b2974e1 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/material/entity/MaterialMobileEntity.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/material/entity/MaterialMobileEntity.java @@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import lombok.Data; +import java.math.BigDecimal; import java.util.Date; /** @@ -106,11 +107,11 @@ public class MaterialMobileEntity extends MaterialEntity { // 采购次数 private Integer purchasesNumber; // 采购量（吨） - private Double purchasesWeight; + private BigDecimal purchasesWeight; // 销售次数 private Integer salesNumber; // 销售量 - private Double salesWeight; + private BigDecimal salesWeight; // 转换方法 //创建转换方法 diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/material/mapper/MaterialMapper.java b/SC-boot/linkage-scm/src/main/java/jnpf/material/mapper/MaterialMapper.java index 9e1e450c..43111f1e 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/material/mapper/MaterialMapper.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/material/mapper/MaterialMapper.java @@ -2,10 +2,9 @@ package jnpf.material.mapper; import com.baomidou.mybatisplus.core.conditions.Wrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.metadata.IPage; -import com.baomidou.mybatisplus.core.toolkit.Constants; import jnpf.material.entity.MaterialEntity; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; import jnpf.material.entity.MaterialMobileEntity; import org.apache.ibatis.annotations.Param; @@ -25,7 +24,6 @@ public interface MaterialMapper extends BaseMapper { * @param queryWrapper 条件映射 * @return 派工单信息 */ - Object getMaterialMobileList111(); IPage getMaterialMobileList(@Param("page") IPage page, @Param("ew") Wrapper queryWrapper); diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/material/service/MaterialService.java b/SC-boot/linkage-scm/src/main/java/jnpf/material/service/MaterialService.java index 8473b089..09a535b0 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/material/service/MaterialService.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/material/service/MaterialService.java @@ -18,7 +18,7 @@ import java.util.*; */ public interface MaterialService extends IService { IPage pagee(Page page, Wrapper queryWrapper); - Object tesx(); + List getList(MaterialPagination materialPagination); List getTypeList(MaterialPagination materialPagination,String dataType); diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/material/service/impl/MaterialServiceImpl.java b/SC-boot/linkage-scm/src/main/java/jnpf/material/service/impl/MaterialServiceImpl.java index 2a26062b..4317b3a0 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/material/service/impl/MaterialServiceImpl.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/material/service/impl/MaterialServiceImpl.java @@ -1,38 +1,29 @@ package jnpf.material.service.impl; +import cn.hutool.core.util.ObjectUtil; +import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; -import jnpf.material.entity.*; -import jnpf.material.mapper.MaterialMapper; -import jnpf.material.service.*; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; 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.material.entity.MaterialEntity; +import jnpf.material.entity.MaterialMobileEntity; +import jnpf.material.mapper.MaterialMapper; import jnpf.material.model.material.MaterialPagination; - +import jnpf.material.service.MaterialService; +import jnpf.permission.model.authorize.AuthorizeConditionModel; import jnpf.permission.service.AuthorizeService; -import java.lang.reflect.Field; -import com.baomidou.mybatisplus.annotation.TableField; -import java.util.stream.Collectors; - - - - - - -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import java.text.SimpleDateFormat; -import jnpf.util.*; +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 javax.annotation.Resource; -import java.util.*; +import java.lang.reflect.Field; +import java.util.ArrayList; +import java.util.List; /** * @@ -254,10 +245,7 @@ public class MaterialServiceImpl extends ServiceImpl list= supplierService.getList(supplierPagination); + List list= supplierService.getList(supplierPagination); //处理id字段转名称，若无需转或者为空可删除 - for(SupplierEntity entity:list){ + for(SupplierMobileEntity entity:list){ entity.setStatus(generaterSwapUtil.switchSelectValue(entity.getStatus() ,"1" ,"0")); } List listVO=JsonUtil.getJsonToList(list,SupplierListVO.class); diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/supplier/mapper/SupplierMapper.java b/SC-boot/linkage-scm/src/main/java/jnpf/supplier/mapper/SupplierMapper.java index 79eaf719..2c00da98 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/supplier/mapper/SupplierMapper.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/supplier/mapper/SupplierMapper.java @@ -1,8 +1,13 @@ package jnpf.supplier.mapper; -import jnpf.supplier.entity.SupplierEntity; +import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import jnpf.supplier.entity.SupplierEntity; +import jnpf.supplier.entity.SupplierMobileEntity; +import org.apache.ibatis.annotations.Param; /** * @@ -13,5 +18,6 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; * 日期： 2023-01-04 */ public interface SupplierMapper extends BaseMapper { + IPage getSupplierList(@Param("page") Page page, @Param("ew")Wrapper wrapper); } diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/supplier/model/supplier/SupplierListVO.java b/SC-boot/linkage-scm/src/main/java/jnpf/supplier/model/supplier/SupplierListVO.java index 2abc3dc9..c2515f36 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/supplier/model/supplier/SupplierListVO.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/supplier/model/supplier/SupplierListVO.java @@ -3,12 +3,8 @@ package jnpf.supplier.model.supplier; -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; +import lombok.Data; /** * * @@ -78,5 +74,14 @@ public class SupplierListVO{ @JsonProperty("status") private String status; - + // 收获量 + private Double settlemenSum; + // 净重 + private Double weightSum; + // 扣重 + private Double buckleWeightSum; + // 总重 + private Double grossWeightSum; + // 总额 + private Double salesPriceSum; } \ No newline at end of file diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/supplier/service/SupplierService.java b/SC-boot/linkage-scm/src/main/java/jnpf/supplier/service/SupplierService.java index f3228135..632e3abe 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/supplier/service/SupplierService.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/supplier/service/SupplierService.java @@ -1,9 +1,14 @@ package jnpf.supplier.service; -import jnpf.supplier.entity.SupplierEntity; +import com.baomidou.mybatisplus.core.conditions.Wrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; +import jnpf.supplier.entity.SupplierEntity; +import jnpf.supplier.entity.SupplierMobileEntity; import jnpf.supplier.model.supplier.SupplierPagination; -import java.util.*; + +import java.util.List; /** * * 供应商档案 @@ -14,7 +19,10 @@ import java.util.*; */ public interface SupplierService extends IService { - List getList(SupplierPagination supplierPagination); + List getList(SupplierPagination supplierPagination); + + + IPagepage(Page page, Wrapper queryWrapper) ; List getTypeList(SupplierPagination supplierPagination, String dataType); diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/supplier/service/impl/SupplierServiceImpl.java b/SC-boot/linkage-scm/src/main/java/jnpf/supplier/service/impl/SupplierServiceImpl.java index 13136495..22359a13 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/supplier/service/impl/SupplierServiceImpl.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/supplier/service/impl/SupplierServiceImpl.java @@ -1,38 +1,29 @@ package jnpf.supplier.service.impl; -import jnpf.entity.*; -import jnpf.supplier.entity.SupplierEntity; -import jnpf.supplier.mapper.SupplierMapper; -import jnpf.service.*; -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import jnpf.supplier.service.SupplierService; -import jnpf.util.RandomUtil; -import java.math.BigDecimal; import cn.hutool.core.util.ObjectUtil; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.core.conditions.Wrapper; +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.permission.model.authorize.AuthorizeConditionModel; - - +import jnpf.permission.service.AuthorizeService; +import jnpf.supplier.entity.SupplierEntity; +import jnpf.supplier.entity.SupplierMobileEntity; +import jnpf.supplier.mapper.SupplierMapper; import jnpf.supplier.model.supplier.SupplierPagination; +import jnpf.supplier.service.SupplierService; +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 jnpf.permission.service.AuthorizeService; +import javax.annotation.Resource; 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.*; +import java.util.ArrayList; +import java.util.List; /** * @@ -52,12 +43,13 @@ public class SupplierServiceImpl extends ServiceImpl getList(SupplierPagination supplierPagination){ + public List getList(SupplierPagination supplierPagination){ String userId=userProvider.get().getUserId(); List AllIdList =new ArrayList(); int total=0; @@ -130,14 +122,20 @@ public class SupplierServiceImpl extends ServiceImpl0 && AllIdList.size()>0) || total==0){ - Page page=new Page<>(supplierPagination.getCurrentPage(), supplierPagination.getPageSize()); - IPage userIPage=this.page(page, supplierQueryWrapper); + Page page=new Page<>(supplierPagination.getCurrentPage(), supplierPagination.getPageSize()); + IPage userIPage=this.page(page, supplierQueryWrapper); return supplierPagination.setData(userIPage.getRecords(),userIPage.getTotal()); }else{ - List list = new ArrayList(); + List list = new ArrayList(); return supplierPagination.setData(list, list.size()); } } + + @Override + public IPage page(Page page, Wrapper queryWrapper) { + return supplierMapper.getSupplierList(page,queryWrapper); + } + @Override public List getTypeList(SupplierPagination supplierPagination,String dataType){ String userId=userProvider.get().getUserId(); diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/vehicle/controller/VehicleController.java b/SC-boot/linkage-scm/src/main/java/jnpf/vehicle/controller/VehicleController.java index 1e92befa..1e42695b 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/vehicle/controller/VehicleController.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/vehicle/controller/VehicleController.java @@ -1,51 +1,41 @@ package jnpf.vehicle.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 cn.afterturn.easypoi.excel.entity.params.ExcelExportEntity; 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.base.vo.PageListVO; +import jnpf.base.vo.PaginationVO; import jnpf.config.ConfigValueUtil; import jnpf.exception.DataException; +import jnpf.util.*; +import jnpf.util.enums.FileTypeEnum; +import jnpf.util.file.UploadUtil; import jnpf.vehicle.entity.VehicleEntity; +import jnpf.vehicle.entity.VehicleMobileEntity; import jnpf.vehicle.model.vehicle.*; import jnpf.vehicle.service.VehicleService; -import org.springframework.transaction.annotation.Transactional; -import jnpf.base.entity.ProvinceEntity; - -import jnpf.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 lombok.extern.slf4j.Slf4j; 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 org.springframework.web.bind.annotation.*; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.multipart.MultipartFile; +import org.springframework.transaction.annotation.Transactional; +import org.springframework.web.bind.annotation.*; + 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; +import java.util.ArrayList; +import java.util.List; +import java.util.Map; /** * @@ -84,9 +74,9 @@ public class VehicleController { */ @PostMapping("/getList") public ActionResult list(@RequestBody VehiclePagination vehiclePagination)throws IOException{ - List list= vehicleService.getList(vehiclePagination); + List list= vehicleService.getList(vehiclePagination); //处理id字段转名称，若无需转或者为空可删除 - for(VehicleEntity entity:list){ + for(VehicleMobileEntity entity:list){ entity.setVehiclephotos(generaterSwapUtil.getFileNameInJson(entity.getVehiclephotos())); } List listVO=JsonUtil.getJsonToList(list,VehicleListVO.class); diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/vehicle/mapper/VehicleMapper.java b/SC-boot/linkage-scm/src/main/java/jnpf/vehicle/mapper/VehicleMapper.java index 10ded42c..dd39f160 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/vehicle/mapper/VehicleMapper.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/vehicle/mapper/VehicleMapper.java @@ -1,8 +1,15 @@ package jnpf.vehicle.mapper; -import jnpf.vehicle.entity.VehicleEntity; +import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import jnpf.vehicle.entity.VehicleEntity; +import jnpf.vehicle.entity.VehicleMobileEntity; +import org.apache.ibatis.annotations.Param; + + /** * @@ -13,5 +20,5 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; * 日期： 2023-01-05 */ public interface VehicleMapper extends BaseMapper { - + IPage getVehicleList(@Param("page") Page page, @Param("ew") Wrapper queryWrapper); } diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/vehicle/model/vehicle/VehicleListVO.java b/SC-boot/linkage-scm/src/main/java/jnpf/vehicle/model/vehicle/VehicleListVO.java index efcfb43f..e08ae712 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/vehicle/model/vehicle/VehicleListVO.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/vehicle/model/vehicle/VehicleListVO.java @@ -3,12 +3,11 @@ package jnpf.vehicle.model.vehicle; -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; +import lombok.Data; + +import java.util.Date; /** * * @@ -58,6 +57,11 @@ public class VehicleListVO{ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8") @JsonProperty("creatortime") private Date creatortime; - + // 运输总次数 + @JsonProperty("licenseCount") + private Integer licenseCount; + // 运输总量 + @JsonProperty("licenseSum") + private Integer licenseSum; } \ No newline at end of file diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/vehicle/service/VehicleService.java b/SC-boot/linkage-scm/src/main/java/jnpf/vehicle/service/VehicleService.java index ce70c99e..49483eb8 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/vehicle/service/VehicleService.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/vehicle/service/VehicleService.java @@ -1,12 +1,15 @@ package jnpf.vehicle.service; +import com.baomidou.mybatisplus.core.conditions.Wrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; - import jnpf.vehicle.entity.VehicleEntity; +import jnpf.vehicle.entity.VehicleMobileEntity; import jnpf.vehicle.model.vehicle.VehiclePagination; -import java.util.*; +import java.util.List; /** * * vehicle @@ -17,7 +20,7 @@ import java.util.*; */ public interface VehicleService extends IService { - List getList(VehiclePagination vehiclePagination); + List getList(VehiclePagination vehiclePagination); List getTypeList(VehiclePagination vehiclePagination,String dataType); @@ -33,5 +36,7 @@ public interface VehicleService extends IService { // 子表方法 + IPage page(Page page, Wrapper queryWrapper); + //列表子表数据方法 } diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/vehicle/service/impl/VehicleServiceImpl.java b/SC-boot/linkage-scm/src/main/java/jnpf/vehicle/service/impl/VehicleServiceImpl.java index a9d017ec..86bdbe40 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/vehicle/service/impl/VehicleServiceImpl.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/vehicle/service/impl/VehicleServiceImpl.java @@ -1,37 +1,29 @@ package jnpf.vehicle.service.impl; -import jnpf.entity.*; - -import jnpf.service.*; -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import jnpf.util.RandomUtil; -import java.math.BigDecimal; import cn.hutool.core.util.ObjectUtil; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.core.conditions.Wrapper; +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.permission.model.authorize.AuthorizeConditionModel; - - - - import jnpf.permission.service.AuthorizeService; -import java.lang.reflect.Field; -import com.baomidou.mybatisplus.annotation.TableField; -import java.util.stream.Collectors; - - +import jnpf.util.ServletUtil; +import jnpf.util.StringUtil; +import jnpf.util.UserProvider; import jnpf.vehicle.entity.VehicleEntity; - +import jnpf.vehicle.entity.VehicleMobileEntity; import jnpf.vehicle.mapper.VehicleMapper; import jnpf.vehicle.model.vehicle.VehiclePagination; import jnpf.vehicle.service.VehicleService; -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.*; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.lang.reflect.Field; +import java.util.ArrayList; +import java.util.List; /** * @@ -51,12 +43,13 @@ public class VehicleServiceImpl extends ServiceImpl getList(VehiclePagination vehiclePagination){ + public List getList(VehiclePagination vehiclePagination){ String userId=userProvider.get().getUserId(); List AllIdList =new ArrayList(); int total=0; @@ -128,11 +121,11 @@ public class VehicleServiceImpl extends ServiceImpl0 && AllIdList.size()>0) || total==0){ - Page page=new Page<>(vehiclePagination.getCurrentPage(), vehiclePagination.getPageSize()); - IPage userIPage=this.page(page, vehicleQueryWrapper); + Page page=new Page<>(vehiclePagination.getCurrentPage(), vehiclePagination.getPageSize()); + IPage userIPage=this.page(page, vehicleQueryWrapper); return vehiclePagination.setData(userIPage.getRecords(),userIPage.getTotal()); }else{ - List list = new ArrayList(); + List list = new ArrayList(); return vehiclePagination.setData(list, list.size()); } } @@ -229,6 +222,12 @@ public class VehicleServiceImpl extends ServiceImpl page(Page page, Wrapper queryWrapper) { + return vehicleMapper.getVehicleList(page,queryWrapper); + } + @Override public void delete(VehicleEntity entity){ if(entity!=null){ diff --git a/SC-boot/linkage-scm/src/main/resources/CustomerMapper.xml b/SC-boot/linkage-scm/src/main/resources/CustomerMapper.xml deleted file mode 100644 index 0af72e67..00000000 --- a/SC-boot/linkage-scm/src/main/resources/CustomerMapper.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - diff --git a/SC-boot/linkage-scm/src/main/resources/Jg_naturalMapper.xml b/SC-boot/linkage-scm/src/main/resources/Jg_naturalMapper.xml deleted file mode 100644 index 8132306f..00000000 --- a/SC-boot/linkage-scm/src/main/resources/Jg_naturalMapper.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - diff --git a/SC-boot/linkage-scm/src/main/resources/SupplierinvoicesMapper.xml b/SC-boot/linkage-scm/src/main/resources/SupplierinvoicesMapper.xml deleted file mode 100644 index 35069d36..00000000 --- a/SC-boot/linkage-scm/src/main/resources/SupplierinvoicesMapper.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - diff --git a/SC-boot/linkage-scm/src/main/resources/VehicleMapper.xml b/SC-boot/linkage-scm/src/main/resources/VehicleMapper.xml deleted file mode 100644 index 6b0b5191..00000000 --- a/SC-boot/linkage-scm/src/main/resources/VehicleMapper.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - diff --git a/SC-boot/linkage-scm/src/main/resources/mapper/customer/CustomerMapper.xml b/SC-boot/linkage-scm/src/main/resources/mapper/customer/CustomerMapper.xml new file mode 100644 index 00000000..4149c529 --- /dev/null +++ b/SC-boot/linkage-scm/src/main/resources/mapper/customer/CustomerMapper.xml @@ -0,0 +1,85 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/SC-boot/linkage-scm/src/main/resources/mapper/material/MaterialMapper.xml b/SC-boot/linkage-scm/src/main/resources/mapper/material/MaterialMapper.xml index aff0b603..2425087f 100644 --- a/SC-boot/linkage-scm/src/main/resources/mapper/material/MaterialMapper.xml +++ b/SC-boot/linkage-scm/src/main/resources/mapper/material/MaterialMapper.xml @@ -1,9 +1,7 @@ - + + SELECT * from (SELECT + a.id, + a.creator_user_id, + a.creator_user_name, + a.creator_time, + a.last_modify_user_id, + a.last_modify_user_name, + a.last_modify_time, + a.delete_user_id, + a.delete_user_name, + a.delete_time, + a.delete_mark, + a.orgnize_id, + a.department_id, + a.adress, + a.`name`, + a.contact, + COUNT( b.id ) naturalCount, + IFNULL( SUM( CASE b.unit WHEN 0 THEN b.settlement ELSE b.settlement / 1000 END ), 0 ) naturalSum + FROM + jg_natural a + LEFT JOIN jg_poundlist b ON a.id = b.natural_id + WHERE + ( a.delete_mark != 1 OR a.delete_mark IS NULL ) + AND ( b.delete_mark != 1 OR b.delete_mark IS NULL ) + GROUP BY + a.id) a ${ew.customSqlSegment} + + + + + + + + + + + + + + + + + + + + + + + diff --git a/SC-boot/linkage-scm/src/main/resources/mapper/supplier/SupplierinvoicesMapper.xml b/SC-boot/linkage-scm/src/main/resources/mapper/supplier/SupplierinvoicesMapper.xml new file mode 100644 index 00000000..020e532b --- /dev/null +++ b/SC-boot/linkage-scm/src/main/resources/mapper/supplier/SupplierinvoicesMapper.xml @@ -0,0 +1,86 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/SC-boot/linkage-scm/src/main/resources/mapper/vehicle/VehicleMapper.xml b/SC-boot/linkage-scm/src/main/resources/mapper/vehicle/VehicleMapper.xml new file mode 100644 index 00000000..59963fd1 --- /dev/null +++ b/SC-boot/linkage-scm/src/main/resources/mapper/vehicle/VehicleMapper.xml @@ -0,0 +1,62 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + +