From da2ad4874c91ee6e14654eb11f35676ebcd1f66b Mon Sep 17 00:00:00 2001
From: zjh <1084500556@qq.com>
Date: 星期四, 24 四月 2025 18:17:29 +0800
Subject: [PATCH] zjh20250424
---
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjXdPictureController.java | 138 +++++++++++++++++++--------------------------
1 files changed, 59 insertions(+), 79 deletions(-)
diff --git a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjXdPictureController.java b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjXdPictureController.java
index ffbea94..b9a4e42 100644
--- a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjXdPictureController.java
+++ b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjXdPictureController.java
@@ -1,5 +1,10 @@
package com.ltkj.web.controller.system;
+import java.io.File;
+import java.io.IOException;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.Paths;
import java.util.*;
import java.util.stream.Collectors;
import javax.annotation.Resource;
@@ -10,6 +15,8 @@
import com.ltkj.common.core.domain.entity.SysUser;
import com.ltkj.common.core.redis.RedisCache;
import com.ltkj.common.utils.SecurityUtils;
+import com.ltkj.common.utils.file.FileUploadUtils;
+import com.ltkj.db.DataSourceContextHolder;
import com.ltkj.framework.config.MatchUtils;
import com.ltkj.hosp.domain.*;
import com.ltkj.hosp.service.*;
@@ -19,7 +26,9 @@
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
+import jodd.util.StringUtil;
import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Value;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.transaction.annotation.Isolation;
@@ -65,7 +74,8 @@
private LtkjExamJcbgdService jcbgdService;
@Resource
private LtkjExamJcsqdService jcsqdService;
-
+ @Value("${path.xdtfilePath}")
+ private String value;
/**
* 鏌ヨ浣撴蹇冪數鍥剧鐞嗗垪琛�
*/
@@ -220,82 +230,6 @@
@ApiParam (value = "寮�濮嬫椂闂�") @RequestParam (required = false) String beginTime,
@ApiParam (value = "缁撴潫鏃堕棿") @RequestParam (required = false) String endTime) {
-// DateTime beginTimes = null;
-// DateTime endTimes = null;
-// if (null != beginTime && null != endTime) {
-// beginTimes = DateUtil.beginOfDay(DateUtil.parse(beginTime));
-// endTimes = DateUtil.endOfDay(DateUtil.parse(endTime));
-// }
-// //鍒濆鍖栦綋妫�璁㈠崟琛�
-// List<TjOrder> orderList = null;
-// List<TjCustomer> customerList = new ArrayList<>();
-// Map<String, Object> map = new HashMap<>();
-//
-// if (checkStatus == 0)
-// asyncService.wCScheckSetCustomerLisByRedis(orderService.getCsTjOrderList(tjNumber, checkStatus, compId, beginTimes, endTimes));
-// if (checkStatus == 1)
-// asyncService.yCScheckSetCustomerLisByRedis(orderService.getCsTjOrderList(tjNumber, checkStatus, compId, beginTimes, endTimes));
-//
-// //鏍规嵁濮撳悕鏌ヨ
-// if (null != name && !"".equals(name)) {
-// List<TjCustomer> list = customerService.getTjCustomerList(name);
-// if (null != list && list.size() > 0) {
-// List<TjCustomer> lists = new ArrayList<>();
-// for (TjCustomer customer : list) {
-// orderList = orderService.getCsTjOrderListByCusId(customer.getCusId());
-// if (null != orderList && orderList.size() > 0) {
-// for (TjOrder tjOrder : orderList) {
-// customer.setTjNumber(tjOrder.getTjNumber());
-// customer.setTjStatus(Long.valueOf(tjOrder.getCheckStatus()));
-// customer.setOrderId(tjOrder.getOrderId());
-// customer.setTjTime(tjOrder.getCreateTime());
-// customer.setFinishTime(tjOrder.getFinishTime());
-// customer.setCusName(MatchUtils.hideCusName(customer.getCusName()));
-// customer.setCusPhone(MatchUtils.hidePhoneNum(customer.getCusPhone()));
-// customer.setCusIdcard(MatchUtils.hideIdCardNum(customer.getCusIdcard()));
-// customer.setConfirmStatus(String.valueOf(tjOrder.getStatus()));
-// if (tjOrder.getFirmId().equals("0")) {
-// customer.setTjCompName(null);
-// } else {
-// customer.setTjCompName(compService.selectDictCompByDrugManufacturerId(tjOrder.getFirmId()).getCnName());
-// }
-// lists.add(customer);
-// }
-// }
-// }
-// List<TjCustomer> customers = null;
-// if (lists.size() > 0) {
-// customers = lists.stream().skip((long) (page - 1) * pageSize).limit(pageSize).collect(Collectors.toList());
-// }
-// map.put("customers", customers);
-// map.put("total", lists.size());
-// return AjaxResult.success(map);
-// }
-// return AjaxResult.success("鏆傛棤鏁版嵁");
-// }
-//
-// //鏉′欢鏌ヨ
-// if (null != tjNumber || null != compId || (null != beginTime && null != endTime)) {
-// orderList = orderService.getCsTjOrderList(tjNumber, checkStatus, compId, beginTimes, endTimes);
-// return getResult(page, pageSize, orderList, customerList, map);
-// }
-//
-// List<TjCustomer> customers = null;
-// if (checkStatus == 0) {
-// customers = redisCache.getCacheMapValue("cScheck", "ws");
-// }
-// if (checkStatus == 1) {
-// customers = redisCache.getCacheMapValue("cScheck", "ys");
-// }
-// if (customers != null && customers.size() > 0) {
-// List<TjCustomer> customerLists = customers.stream().skip((long) (page - 1) * pageSize).limit(pageSize).collect(Collectors.toList());
-// map.put("customers", customerLists);
-// map.put("total", customers.size());
-// return AjaxResult.success(map);
-// } else {
-// orderList = orderService.getCsTjOrderList(tjNumber, checkStatus, compId, beginTimes, endTimes);
-// return getResult(page, pageSize, orderList, customerList, map);
-// }
Long deptId = SecurityUtils.getDeptId();
log.info("褰卞儚妫�鏌ュ垪琛�(楠ㄥ瘑搴﹀拰蹇冪數鍥�)鎺ュ彛 褰撳墠鐧诲綍浜虹瀹�"+deptId);
String value = String.valueOf(compId);
@@ -314,6 +248,28 @@
Long deptId = SecurityUtils.getDeptId();
log.info("褰卞儚妫�鏌ラ瀵嗗害蹇冪數鍥鹃〉闈㈢偣鍑讳綋妫�浜哄憳灞曠ず浣撴椤圭洰鎺ュ彛褰撳墠鐧诲綍浜虹瀹�"+deptId);
List<CsProVo> list = remarkService.getYxJcXx(tjNumber,deptId.toString());
+ if(null !=list && !list.isEmpty()){
+ for (CsProVo vo : list) {
+ LambdaQueryWrapper<TjXdtgmdjg> wq=new LambdaQueryWrapper<>();
+ wq.eq(TjXdtgmdjg::getTjh,tjNumber);
+ wq.eq(TjXdtgmdjg::getProId,vo.getProId());
+ TjXdtgmdjg xdtgmdjg = xdtgmdjgService.getOne(wq);
+ if(null !=xdtgmdjg){
+ if(StringUtil.isNotBlank(xdtgmdjg.getUrl())){
+ Path path = Paths.get(xdtgmdjg.getUrl());
+ byte[] data = null;
+ try {
+ data = Files.readAllBytes(path);
+ } catch (IOException e) {
+ throw new RuntimeException(e);
+ }
+ String base64 = Base64.getEncoder().encodeToString(data);
+ if(StringUtil.isNotBlank(base64)) vo.setImageUrl(base64);
+ }
+ }
+ }
+
+ }
return AjaxResult.success(list);
}
@@ -323,7 +279,8 @@
public AjaxResult addYxJcXx(@ApiParam (value = "浣撴鍙�") @RequestParam String tjNumber,
@ApiParam (value = "椤圭洰id") @RequestParam String proId,
@ApiParam (value = "妫�鏌ユ墍瑙�") @RequestParam String jcsj,
- @ApiParam (value = "妫�鏌ョ粨璁�") @RequestParam String jcjl) {
+ @ApiParam (value = "妫�鏌ョ粨璁�") @RequestParam String jcjl,
+ @ApiParam (value = "鍥剧墖鍦板潃") @RequestParam(required = false) String url) {
try {
SysUser user = SecurityUtils.getLoginUser().getUser();
TjOrder order = orderService.getOrderByTjNum(tjNumber);
@@ -356,6 +313,7 @@
xdtgmdjg.setJcjl(jcjl);
xdtgmdjg.setCreateBy(user.getNickName());
xdtgmdjg.setCreateId(user.getUserId().toString());
+ if(StringUtil.isNotBlank(url)) xdtgmdjg.setUrl(url);
xdtgmdjgService.save(xdtgmdjg);
saveTjXdtgmdjgByJcbgd(xdtgmdjg);
}
@@ -385,7 +343,11 @@
jcbgd.setXmdm(xdtgmdjg.getProId());
jcbgd.setXmmc(xdtgmdjg.getProName());
jcbgd.setBgNr(xdtgmdjg.getJcsj());
- jcbgd.setBgUrl("");
+ if(StringUtil.isNotBlank(xdtgmdjg.getUrl())){
+ jcbgd.setBgUrl(xdtgmdjg.getUrl());
+ }else {
+ jcbgd.setBgUrl("");
+ }
jcbgd.setShysxm(xdtgmdjg.getCreateBy());
jcbgd.setShysdm(xdtgmdjg.getCreateId());
jcbgd.setYxzd(xdtgmdjg.getJcjl());
@@ -417,7 +379,25 @@
if(null !=xdtgmdjg ){
map.put("jcsj",xdtgmdjg.getJcsj());
map.put("jcjl",xdtgmdjg.getJcjl());
+ if(StringUtil.isNotBlank(xdtgmdjg.getUrl())){
+ Path path = Paths.get(xdtgmdjg.getUrl());
+ byte[] data = null;
+ try {
+ data = Files.readAllBytes(path);
+ } catch (IOException e) {
+ throw new RuntimeException(e);
+ }
+ String base64 = Base64.getEncoder().encodeToString(data);
+ map.put("tp",base64);
+ }else {
+ map.put("tp",null);
+ }
return AjaxResult.success(map);
+ }else {
+ TjProject tjProject = projectService.getById(proId);
+ map.put("jcsj","");
+ map.put("jcjl",tjProject.getProDefault()==null ? "":tjProject.getProDefault());
+ map.put("tp",null);
}
return AjaxResult.success(map);
}
--
Gitblit v1.8.0