From 3689771c29cb607b0c7b7825035f223ceb69ff04 Mon Sep 17 00:00:00 2001 From: liao <2948196353@qq.com> Date: Tue, 23 Nov 2021 09:11:03 +0800 Subject: [PATCH 1/7] ~ --- .../controller/WgdZcbController.java | 23 +++++----- .../da/slrs/wgdCensusLeo/entity/WgdZcb.java | 5 +-- .../mapper/wgdCensusLeo/WgdZcbMapper.xml | 43 +++++++++---------- 3 files changed, 35 insertions(+), 36 deletions(-) diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/controller/WgdZcbController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/controller/WgdZcbController.java index 49cbfd3d..f3f714ce 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/controller/WgdZcbController.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/controller/WgdZcbController.java @@ -15,13 +15,13 @@ import com.adc.da.base.web.BaseController; import java.util.List; /** -*

- * 标准制修订补助资金收支统计支出表 前端控制器 - *

-* -* @author super_liu -* @since 2021-11-12 -*/ + *

+ * 标准制修订补助资金收支统计支出表 前端控制器 + *

+ * + * @author super_liu + * @since 2021-11-12 + */ @RestController @Api(description = "|WgdZcb|") @RequestMapping("api/wgdCensusLeo/wgd-zcb") @@ -30,13 +30,14 @@ public class WgdZcbController extends BaseController { IWgdZcbService iWgdZcbService; @GetMapping("/getAllZcbs") - public ResponseMessage getAllWgdZcbs(){//查询所有 + public ResponseMessage getAllWgdZcbs() {//查询所有 return Result.success(iWgdZcbService.getAllWgdZcbs()); } + @ApiOperation("查询") @GetMapping("/queryAllZcbs") - public ResponseMessage queryAllWgdZcbs(WgdZcb wgdZcb){//多条件查询 + public ResponseMessage queryAllWgdZcbs(WgdZcb wgdZcb) {//多条件查询 List wgdZcbs = iWgdZcbService.queryAllWgdZcbs(wgdZcb); PageInfo pageInfo = getPageInfo(wgdZcb.getPager(),wgdZcbs); return Result.success(pageInfo); @@ -60,13 +61,13 @@ public class WgdZcbController extends BaseController { } @PostMapping("/delZcb") - ResponseMessage deleteWgdZcb(String id){//删除 + ResponseMessage deleteWgdZcb(String id) {//删除 return Result.success(iWgdZcbService.deleteWgdZcb(id)); } @ApiOperation("删除") @PostMapping("/delZcbs") - ResponseMessage deleteWgdZcbs(String ids){//批量删除 + ResponseMessage deleteWgdZcbs(String ids) {//批量删除 return Result.success(iWgdZcbService.deleteWgdZcbs(ids)); } } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/entity/WgdZcb.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/entity/WgdZcb.java index a47c4c65..0ee8a508 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/entity/WgdZcb.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/entity/WgdZcb.java @@ -35,10 +35,9 @@ public class WgdZcb extends BasePage { private String cost; @ApiModelProperty(value = "用途") - private String use; + private String purposes; @ApiModelProperty(value = "详细附件") - private String annex; - + private String annexs; } diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/wgdCensusLeo/WgdZcbMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/wgdCensusLeo/WgdZcbMapper.xml index 51767b4d..d834b30d 100644 --- a/adc-da-slrs/src/main/resources/mybatis/mapper/wgdCensusLeo/WgdZcbMapper.xml +++ b/adc-da-slrs/src/main/resources/mybatis/mapper/wgdCensusLeo/WgdZcbMapper.xml @@ -3,7 +3,7 @@ - id,name,cost,use,annex + id,name,cost,purposes,annexs @@ -12,18 +12,17 @@ and id = #{id} - and name like concat('%',#{name},'%') + and name = #{name} - and cost like concat('%',#{cost},'%') + and cost = #{cost} - - and use like concat('%',#{use},'%') + + and purposes = #{purposes} - - and annex = #{annex} + + and annexs = #{annexs} - SELECT count( @@ -349,4 +360,12 @@ + diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandardComplianceAssessResult/SarStandardComplianceProductAssessMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandardComplianceAssessResult/SarStandardComplianceProductAssessMapper.xml index b82994ed..43469b23 100644 --- a/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandardComplianceAssessResult/SarStandardComplianceProductAssessMapper.xml +++ b/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandardComplianceAssessResult/SarStandardComplianceProductAssessMapper.xml @@ -3,5 +3,56 @@ + + From 90d92b4a169c336793d0c0065c70e19276f23805 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BC=A0=E8=B6=85=E7=84=B6?= Date: Thu, 2 Dec 2021 10:18:04 +0800 Subject: [PATCH 6/7] =?UTF-8?q?zcr:=E9=93=BE=E6=8E=A5=E5=9B=BE=E6=A0=87?= =?UTF-8?q?=E6=96=87=E4=BB=B6=E6=B5=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../sarUrl/controller/TsUrlController.java | 57 +++++++++++++++++++ .../com/adc/da/slrs/sarUrl/entity/TsUrl.java | 6 ++ 2 files changed, 63 insertions(+) diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarUrl/controller/TsUrlController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarUrl/controller/TsUrlController.java index 12edcf60..f4a48ad6 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarUrl/controller/TsUrlController.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarUrl/controller/TsUrlController.java @@ -1,6 +1,8 @@ package com.adc.da.slrs.sarUrl.controller; +import com.adc.da.att.entity.AttFileEO; +import com.adc.da.att.service.IAttFileEOService; import com.adc.da.http.ResponseMessage; import com.adc.da.http.Result; import com.adc.da.slrs.sarUrl.entity.OrderUrlVO; @@ -12,12 +14,21 @@ import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Value; import org.springframework.web.bind.annotation.*; import org.springframework.web.servlet.ModelAndView; +import javax.imageio.ImageIO; +import javax.servlet.ServletOutputStream; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; +import javax.servlet.http.HttpSession; +import javax.swing.*; +import java.awt.*; +import java.awt.image.BufferedImage; +import java.io.*; import java.util.Arrays; +import java.util.Base64; import java.util.List; /** @@ -34,6 +45,52 @@ public class TsUrlController{ @Autowired private ITsUrlService tsUrlService; + @Autowired + private IAttFileEOService iAttFileEOService; + + @Value("${file.path}") + private String filePath; + + @GetMapping("getIconImg") + public String getIconImg(HttpServletRequest request, HttpServletResponse response){ + String url = ""; + String path = "api/att/attFile/upload"; + ServletOutputStream outputStream = null; + FileInputStream inputStream = null; + //通过id获取路径 + String id = request.getParameter("id"); + String fid = tsUrlService.getById(id).getIcon(); + List attFileEOS = iAttFileEOService.getMultiFileInfos(fid); + if(attFileEOS.isEmpty()){ + return null; + } + AttFileEO attFileEO = attFileEOS.get(0); + url = filePath + attFileEO.getFilePath() + attFileEO.getFileName(); + + try { + System.out.println(id); + TsUrl tsUrl = tsUrlService.getById(id); + System.out.println(tsUrl); + + File file = new File(url); + if(!file.exists()) return null; + inputStream = new FileInputStream(file); + response.setContentType("image/jpeg"); + outputStream = response.getOutputStream(); + int len = 0; + byte[] buffer = new byte[1024 * 10]; + while ((len = inputStream.read(buffer)) != -1){ + outputStream.write(buffer,0,len); + } + outputStream.flush(); + outputStream.close(); + inputStream.close(); + } catch (IOException e) { + System.out.println("---------图标获取异常--------------"); + } + return null; + } + @ApiOperation("查询") @GetMapping public ResponseMessage> getUrls(){ diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarUrl/entity/TsUrl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarUrl/entity/TsUrl.java index 6798937c..12d6c292 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarUrl/entity/TsUrl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarUrl/entity/TsUrl.java @@ -61,4 +61,10 @@ public class TsUrl implements Serializable { /**排序*/ @ApiModelProperty(value = "排序") private Integer orderBy; + + /**新增*/ + @ApiModelProperty(value = "图标信息") + private String icon; + @ApiModelProperty(value = "位置") + private Integer type; } From 0569a33350f91396adf0bcc065065d01f76936ac Mon Sep 17 00:00:00 2001 From: yuezhihang Date: Thu, 2 Dec 2021 10:25:10 +0800 Subject: [PATCH 7/7] =?UTF-8?q?=E8=AF=84=E4=BC=B0=E7=BB=93=E6=9E=9C?= =?UTF-8?q?=E6=9F=A5=E7=9C=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...ndardComplianceAssessResultController.java | 4 +-- ...rStandardComplianceProductAssessMapper.xml | 26 ++++++++++++------- 2 files changed, 19 insertions(+), 11 deletions(-) diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/controller/SarStandardComplianceAssessResultController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/controller/SarStandardComplianceAssessResultController.java index d2be75a6..9b921b33 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/controller/SarStandardComplianceAssessResultController.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/controller/SarStandardComplianceAssessResultController.java @@ -193,8 +193,8 @@ public class SarStandardComplianceAssessResultController { p1.setTotal(page.getTotal()); map.put("unfit",p1); QueryWrapper queryWrapper1 = new QueryWrapper<>(); - queryWrapper.eq("STAND_ID", eo.getStandId()); - queryWrapper.eq("product_id", eo.getProductId()); + queryWrapper1.eq("STAND_ID", eo.getStandId()); + queryWrapper1.eq("product_id", eo.getProductId()); queryWrapper1.ne("research_compliance",""); queryWrapper1.orderByAsc("product_name"); queryWrapper1.orderByAsc("standard_item"); diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandardComplianceAssessResult/SarStandardComplianceProductAssessMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandardComplianceAssessResult/SarStandardComplianceProductAssessMapper.xml index 43469b23..62cf51da 100644 --- a/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandardComplianceAssessResult/SarStandardComplianceProductAssessMapper.xml +++ b/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandardComplianceAssessResult/SarStandardComplianceProductAssessMapper.xml @@ -8,11 +8,15 @@ select PRODUCT_NAME as productName,sar_stand_project_library.project_group as projectGroup, sar_stand_project_library.id as sarId, sar_stand_project_library.product_line as productLine,sar_stand_project_library.project_number as productId, - sar_stand_project_library.project_manager as projectManager,ts_user.UNAME as uName,count(*) unCount from - sar_stand_unqualified - left join sar_stand_project_library on sar_stand_unqualified.product_id = sar_stand_project_library.project_number - LEFT JOIN ts_user on ts_user.USID = sar_stand_project_library.project_manager - where STAND_ID = #{product.standId} and CLOSE_STATE = '1' + sar_stand_project_library.project_manager as projectManager,ts_user.UNAME as uName, + (SELECT count(*) FROM sar_stand_unqualified WHERE sar_stand_unqualified.STAND_ID = #{product.standId}) unCount + FROM + sar_stand_project_library + LEFT JOIN sar_stand_unqualified ON sar_stand_unqualified.product_id = sar_stand_project_library.project_number + LEFT JOIN ts_user ON ts_user.USID = sar_stand_project_library.project_manager + WHERE + sar_stand_project_library.project_number in ( SELECT product_id FROM sar_standard_compliance_product_assess WHERE STAND_ID=#{product.standId}) + AND CLOSE_STATE = '1' group by PRODUCT_NAME, sar_stand_project_library.project_group, @@ -34,10 +38,14 @@