diff --git a/README.md b/README.md
index c984586..9766014 100644
--- a/README.md
+++ b/README.md
@@ -48,49 +48,5 @@
## 在线体验
- admin/admin123
-- 陆陆续续收到一些打赏，为了更好的体验已用于演示服务器升级。谢谢各位小伙伴。
-演示地址：http://vue.ruoyi.vip
-文档地址：http://doc.ruoyi.vip
-
-## 演示图
-
-
-
-  |
-  |
-
-
-  |
-  |
-
-
-  |
-  |
-
-
-  |
-  |
-
-
-  |
-  |
-
-
-  |
-  |
-
-
-  |
-  |
-
-
-  |
-  |
-
-
-
-
-## 若依前后端分离交流群
-
-QQ群： [](https://jq.qq.com/?_wv=1027&k=5bVB1og) [](https://jq.qq.com/?_wv=1027&k=5eiA4DH) [](https://jq.qq.com/?_wv=1027&k=5AxMKlC) [](https://jq.qq.com/?_wv=1027&k=51G72yr) [](https://jq.qq.com/?_wv=1027&k=VvjN2nvu) [](https://jq.qq.com/?_wv=1027&k=5vYAqA05) [](https://jq.qq.com/?_wv=1027&k=kOIINEb5) [](https://jq.qq.com/?_wv=1027&k=UKtX5jhs) [](https://jq.qq.com/?_wv=1027&k=EI9an8lJ) [](https://jq.qq.com/?_wv=1027&k=SWCtLnMz) [](https://jq.qq.com/?_wv=1027&k=96Dkdq0k) [](https://jq.qq.com/?_wv=1027&k=0fsNiYZt) [](https://jq.qq.com/?_wv=1027&k=7xw4xUG1) [](https://jq.qq.com/?_wv=1027&k=eCx8eyoJ) [](https://jq.qq.com/?_wv=1027&k=SpyH2875) [](https://jq.qq.com/?_wv=1027&k=tKEt51dz) [](http://qm.qq.com/cgi-bin/qm/qr?_wv=1027&k=0vBbSb0ztbBgVtn3kJS-Q4HUNYwip89G&authKey=8irq5PhutrZmWIvsUsklBxhj57l%2F1nOZqjzigkXZVoZE451GG4JHPOqW7AW6cf0T&noverify=0&group_code=143961921) [](http://qm.qq.com/cgi-bin/qm/qr?_wv=1027&k=ZFAPAbp09S2ltvwrJzp7wGlbopsc0rwi&authKey=HB2cxpxP2yspk%2Bo3WKTBfktRCccVkU26cgi5B16u0KcAYrVu7sBaE7XSEqmMdFQp&noverify=0&group_code=174951577) [](http://qm.qq.com/cgi-bin/qm/qr?_wv=1027&k=Fn2aF5IHpwsy8j6VlalNJK6qbwFLFHat&authKey=uyIT%2B97x2AXj3odyXpsSpVaPMC%2Bidw0LxG5MAtEqlrcBcWJUA%2FeS43rsF1Tg7IRJ&noverify=0&group_code=161281055) [](http://qm.qq.com/cgi-bin/qm/qr?_wv=1027&k=XIzkm_mV2xTsUtFxo63bmicYoDBA6Ifm&authKey=dDW%2F4qsmw3x9govoZY9w%2FoWAoC4wbHqGal%2BbqLzoS6VBarU8EBptIgPKN%2FviyC8j&noverify=0&group_code=138988063) 点击按钮入群。
\ No newline at end of file
+#影源扫描仪 授权码：ND8NSUzCysU1gCr78aj57g==
\ No newline at end of file
diff --git a/dangan-dangan/src/main/java/com/da/dangan/controller/DaCatalogController.java b/dangan-dangan/src/main/java/com/da/dangan/controller/DaCatalogController.java
index d894ee9..c5ca299 100644
--- a/dangan-dangan/src/main/java/com/da/dangan/controller/DaCatalogController.java
+++ b/dangan-dangan/src/main/java/com/da/dangan/controller/DaCatalogController.java
@@ -96,7 +96,7 @@ public class DaCatalogController extends BaseController
{
if (!daCatalogService.checkDaCatalogNameUnique(daCatalog))
{
- return error("新增部门'" + daCatalog.getMuName() + "'失败，目录名称已存在");
+ return error("新增目录'" + daCatalog.getMuName() + "'失败，目录名称已存在");
}
daCatalog.setCreateBy(getUsername());
return toAjax(daCatalogService.insertDaCatalog(daCatalog));
diff --git a/dangan-dangan/src/main/java/com/da/dangan/controller/DaCzrkdjController.java b/dangan-dangan/src/main/java/com/da/dangan/controller/DaCzrkdjController.java
index d8a9660..fb3e82b 100644
--- a/dangan-dangan/src/main/java/com/da/dangan/controller/DaCzrkdjController.java
+++ b/dangan-dangan/src/main/java/com/da/dangan/controller/DaCzrkdjController.java
@@ -1,25 +1,19 @@
package com.da.dangan.controller;
-import java.util.List;
-import javax.servlet.http.HttpServletResponse;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.PutMapping;
-import org.springframework.web.bind.annotation.DeleteMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
import com.da.common.annotation.Log;
import com.da.common.core.controller.BaseController;
import com.da.common.core.domain.AjaxResult;
+import com.da.common.core.page.TableDataInfo;
import com.da.common.enums.BusinessType;
+import com.da.common.utils.poi.ExcelUtil;
import com.da.dangan.domain.DaCzrkdj;
import com.da.dangan.service.IDaCzrkdjService;
-import com.da.common.utils.poi.ExcelUtil;
-import com.da.common.core.page.TableDataInfo;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletResponse;
+import java.util.List;
/**
* 常住人口登记Controller
@@ -42,7 +36,7 @@ public class DaCzrkdjController extends BaseController
public TableDataInfo list(DaCzrkdj daCzrkdj)
{
startPage();
- List list = daCzrkdjService.selectDaCzrkdjList(daCzrkdj);
+ List list = daCzrkdjService.selectDaCzrkdjList1(daCzrkdj);
return getDataTable(list);
}
diff --git a/dangan-dangan/src/main/java/com/da/dangan/controller/DaJianSuoController.java b/dangan-dangan/src/main/java/com/da/dangan/controller/DaJianSuoController.java
index 73c0dc7..f08ffb6 100644
--- a/dangan-dangan/src/main/java/com/da/dangan/controller/DaJianSuoController.java
+++ b/dangan-dangan/src/main/java/com/da/dangan/controller/DaJianSuoController.java
@@ -2,11 +2,13 @@ package com.da.dangan.controller;
import com.da.common.core.controller.BaseController;
import com.da.common.core.domain.AjaxResult;
+import com.da.common.core.domain.entity.DaCatalog;
import com.da.dangan.domain.DaCzrkdj;
import com.da.dangan.service.IDaCzrkdjService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;
import java.util.List;
@@ -18,22 +20,101 @@ import java.util.List;
* @date 2024-05-08
*/
@RestController
-@RequestMapping("/dangan/js")
+@RequestMapping("/dangan/search")
public class DaJianSuoController extends BaseController {
@Autowired
private IDaCzrkdjService daCzrkdjService;
/**
- * 查询常住人口登记列表
+ * 从档案目录查询对应的档案信息
*/
// @PreAuthorize("@ss.hasPermi('dangan:czrkdj:list')")
@GetMapping("/list")
- public AjaxResult list(DaCzrkdj daCzrkdj)
- { AjaxResult ajaxResult = new AjaxResult();
- startPage();
- List czrkdjs = daCzrkdjService.selectDaCzrkdjList1(daCzrkdj);
- ajaxResult.put("czrkdj",czrkdjs);
+ public AjaxResult list(DaCatalog daCatalog)
+ {
+ AjaxResult ajax = AjaxResult.success();
+ ajax.put("czrkdj",null);
+ switch(daCatalog.getYwType()){
+ case "0":
+ DaCzrkdj daCzrkdj = new DaCzrkdj();
+ daCzrkdj.setMuId(daCatalog.getId());
+ startPage();
+ List czrkdjs = daCzrkdjService.selectDaCzrkdjList(daCzrkdj);
+ ajax.put("czrkdj",getDataTable(czrkdjs));
+ break;
+ case "1":
+ break;
+ case "2":
+ break;
+ case "3":
+ break;
+ case "4":
+ break;
+ case "5":
+ break;
+ default :
+ break;
+ }
+ return ajax;
+ }
+
+ /**
+ * 档案检索————————————————接口未用，前端分开判断调用每个表的list接口————————————————
+ * keyword 关键字 ywTypes 勾选从哪些业务类型中查询
+ */
+ // @PreAuthorize("@ss.hasPermi('dangan:czrkdj:list')")
+ @GetMapping("/listAll")
+ public AjaxResult listAll(@RequestParam("keyword") String keyword, @RequestParam("ywTypes")List ywTypes)
+ {
+ AjaxResult ajax = AjaxResult.success();
+ ajax.put("czrkdj",null);
+ if(ywTypes!=null&&ywTypes.size()>0){
+ if (ywTypes.contains("0")) {
+ DaCzrkdj daCzrkdj = new DaCzrkdj();
+ daCzrkdj.setName(keyword);
+ startPage(); //分页关系到几个表的分页
+ List czrkdjs = daCzrkdjService.selectDaCzrkdjList1(daCzrkdj);
+ ajax.put("czrkdj",getDataTable(czrkdjs));
+ }
+ //TODO 其他业务类型查询
+ }
+ return ajax;
+ }
+
+ /**
+ * 查出来的数据做分页
+ * @param keyword
+ * @param ywType
+ * @return
+ */
+ @GetMapping("/listPage")
+ public AjaxResult listPage(@RequestParam("keyword") String keyword, @RequestParam("ywType")String ywType)
+ {
+ AjaxResult ajax = AjaxResult.success();
+ ajax.put("czrkdj",null);
+ switch(ywType){
+ case "0":
+ DaCzrkdj daCzrkdj = new DaCzrkdj();
+ daCzrkdj.setName(keyword);
+ startPage(); //分页关系到几个表的分页
+ List czrkdjs = daCzrkdjService.selectDaCzrkdjList1(daCzrkdj);
+ ajax.put("czrkdj",getDataTable(czrkdjs));
+ break;
+ //TODO 其他业务类型查询
- return ajaxResult;
+ case "1":
+ break;
+ case "2":
+ break;
+ case "3":
+ break;
+ case "4":
+ break;
+ case "5":
+ break;
+ default :
+ break;
+ }
+ return ajax;
}
}
diff --git a/dangan-dangan/src/main/java/com/da/dangan/controller/DangAnCollectController.java b/dangan-dangan/src/main/java/com/da/dangan/controller/DangAnCollectController.java
index 5cce7ad..9949569 100644
--- a/dangan-dangan/src/main/java/com/da/dangan/controller/DangAnCollectController.java
+++ b/dangan-dangan/src/main/java/com/da/dangan/controller/DangAnCollectController.java
@@ -13,7 +13,11 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;
+import javax.imageio.ImageIO;
+import java.awt.*;
+import java.awt.image.BufferedImage;
import java.io.File;
+import java.io.IOException;
import java.util.ArrayList;
import java.util.List;
@@ -89,6 +93,11 @@ public class DangAnCollectController extends BaseController {
// 上传并返回新文件名称
String fileName = FileUploadUtils.upload(filePath, file);
String url = serverConfig.getUrl() + fileName;
+
+ // 添加水印
+ String updatedFilePath = removePathBeforeSecondSlash(fileName);
+ String watermarkFilePath = addWatermark(filePath + updatedFilePath);
+
urls.add(url);
fileNames.add(fileName);
newFileNames.add(FileUtils.getName(fileName));
@@ -98,6 +107,7 @@ public class DangAnCollectController extends BaseController {
newPicRecard.setPicUrl(url);
newPicRecard.setCreateBy(getUsername());
newPicRecard.setMuId(picRecard.getMuId());
+ newPicRecard.setMuPath(picRecard.getMuPath());
newPicRecard.setWlsjId(picRecard.getWlsjId());
newPicRecard.setWlsjPath(picRecard.getWlsjPath());
daPicturesRecardService.insertDaPicturesRecard(newPicRecard);
@@ -116,6 +126,36 @@ public class DangAnCollectController extends BaseController {
return AjaxResult.error(e.getMessage());
}
}
+ /**
+ * 测试添加水印
+ */
+ @PostMapping("/tests")
+ public AjaxResult tests(MultipartFile[] files) throws Exception
+ {
+ try
+ { //数据存储
+ List picRecards = new ArrayList<>();
+ // 上传文件路径
+ String filePath = RuoYiConfig.getUploadPath();
+ for (MultipartFile file : files)
+ {
+ // 上传并返回新文件名称
+ String fileName = FileUploadUtils.upload(filePath, file);
+ String url = serverConfig.getUrl() + fileName;
+ // 添加水印
+ String updatedFilePath = removePathBeforeSecondSlash(fileName);
+ String watermarkFilePath = addWatermark(filePath + updatedFilePath);
+ }
+ AjaxResult ajax = AjaxResult.success();
+ return ajax;
+ }
+ catch (Exception e)
+ {
+ return AjaxResult.error(e.getMessage());
+ }
+ }
+
+
/**
* 调用识别接口
@@ -131,8 +171,9 @@ public class DangAnCollectController extends BaseController {
files.add(file);
}
// TODO 调用第三方接口识别信息
- // String result= CallThirdInterface.callThirdInterface("url",files);
- // TODO 存储识别后的信息
+ //String result= CallThirdInterface.callThirdInterface1();
+ //String result= CallThirdInterface.callThirdInterface("url",files);
+ // TODO 根据业务类型存储识别后的信息
//daCzrkdjService.insertDaCzrkdj();
//修改图片信息记录表为已识别
@@ -148,7 +189,74 @@ public class DangAnCollectController extends BaseController {
return AjaxResult.success();
}
+ /**
+ * 删除第二个斜杠之前的路径
+ * @param filePath
+ * @return
+ */
+ private String removePathBeforeSecondSlash(String filePath)
+ {
+ int count = 0;
+ int index = -1;
+ for (int i = 0; i < filePath.length(); i++) {
+ if (filePath.charAt(i) == '/') {
+ count++;
+ if (count == 3) {
+ index = i;
+ break;
+ }
+ }
+ }
+ if (index != -1) {
+ return filePath.substring(index);
+ }
+ return filePath;
+ }
+ /**
+ * 添加水印
+ * @param filePath
+ * @return
+ * @throws IOException
+ */
+ private String addWatermark(String filePath) throws IOException
+ { //获取文件后缀
+ int indexNum = filePath.lastIndexOf(".");
+ String fileExtension = filePath.substring(indexNum+1);
+
+ BufferedImage image = ImageIO.read(new File(filePath));
+ /*int h = bufferedImage.getHeight();
+ int w = bufferedImage.getWidth();
+ BufferedImage image = new BufferedImage(w, h, BufferedImage.TYPE_INT_ARGB );*/
+
+ // 创建Graphics对象，并设置水印文字的样式
+ Graphics2D g2d = (Graphics2D) image.getGraphics();
+ Font font = new Font("微软雅黑", Font.BOLD, 45);
+ g2d.setFont(font);
+ //g2d.setComposite(AlphaComposite.getInstance(AlphaComposite.SRC_OVER, 1f)); // 设置透明度为50%
+ Color watermarkColor = new Color(147, 144, 144, 35);
+ //Color watermarkColor = new Color(155, 213, 222, 57);
+ g2d.setColor(watermarkColor);
+ // 在右下角添加水印
+ String watermark = "我是水印我是水印";
+
+ //设置水印旋转角度（默认对角线角度）
+ double lengthOfDiagonal = Math.sqrt(image.getWidth() * image.getWidth() + image.getHeight() * image.getHeight());
+ double v = (Math.pow(image.getWidth(), 2) + Math.pow(lengthOfDiagonal, 2) - Math.pow(image.getHeight(), 2)) / (2 * image.getWidth() * lengthOfDiagonal);
+ double acos = Math.acos(v);
+ double myDegree = Math.toDegrees(acos);
+ g2d.rotate(-Math.toRadians(myDegree), (double) image.getWidth() / 2, (double) image.getHeight() / 2);
+ //设置水印位置
+ int x = (image.getWidth() - g2d.getFontMetrics().stringWidth(watermark)) /2;
+ int y = image.getHeight()/2;
+ g2d.drawString(watermark, x, y);
+
+ // 保存添加水印后的图片，覆盖原始图片
+ File output = new File(filePath);
+ ImageIO.write(image, fileExtension, output);
+ g2d.dispose();
+ return filePath;
+ }
}
diff --git a/dangan-dangan/src/main/java/com/da/dangan/domain/DaPicturesRecard.java b/dangan-dangan/src/main/java/com/da/dangan/domain/DaPicturesRecard.java
index 8ac1b69..f3f5ad8 100644
--- a/dangan-dangan/src/main/java/com/da/dangan/domain/DaPicturesRecard.java
+++ b/dangan-dangan/src/main/java/com/da/dangan/domain/DaPicturesRecard.java
@@ -7,9 +7,9 @@ import com.da.common.core.domain.BaseEntity;
/**
* 档案图片信息记录对象 da_pictures_recard
- *
+ *
* @author hs
- * @date 2024-05-13
+ * @date 2024-05-15
*/
public class DaPicturesRecard extends BaseEntity
{
@@ -42,79 +42,92 @@ public class DaPicturesRecard extends BaseEntity
@Excel(name = "档案目录路径")
private String muPath;
- /** 是否已经识别 */
- @Excel(name = "是否已经识别")
+ /** 业务类型(字典) */
+ @Excel(name = "业务类型(字典)")
+ private String ywType;
+
+ /** 是否已识别 */
+ @Excel(name = "是否已识别")
private String recognize;
- public void setId(Long id)
+ public void setId(Long id)
{
this.id = id;
}
- public Long getId()
+ public Long getId()
{
return id;
}
- public void setPicName(String picName)
+ public void setPicName(String picName)
{
this.picName = picName;
}
- public String getPicName()
+ public String getPicName()
{
return picName;
}
- public void setPicUrl(String picUrl)
+ public void setPicUrl(String picUrl)
{
this.picUrl = picUrl;
}
- public String getPicUrl()
+ public String getPicUrl()
{
return picUrl;
}
- public void setWlsjId(Long wlsjId)
+ public void setWlsjId(Long wlsjId)
{
this.wlsjId = wlsjId;
}
- public Long getWlsjId()
+ public Long getWlsjId()
{
return wlsjId;
}
- public void setWlsjPath(String wlsjPath)
+ public void setWlsjPath(String wlsjPath)
{
this.wlsjPath = wlsjPath;
}
- public String getWlsjPath()
+ public String getWlsjPath()
{
return wlsjPath;
}
- public void setMuId(Long muId)
+ public void setMuId(Long muId)
{
this.muId = muId;
}
- public Long getMuId()
+ public Long getMuId()
{
return muId;
}
- public void setMuPath(String muPath)
+ public void setMuPath(String muPath)
{
this.muPath = muPath;
}
- public String getMuPath()
+ public String getMuPath()
{
return muPath;
}
- public void setRecognize(String recognize)
+ public void setYwType(String ywType)
+ {
+ this.ywType = ywType;
+ }
+
+ public String getYwType()
+ {
+ return ywType;
+ }
+ public void setRecognize(String recognize)
{
this.recognize = recognize;
}
- public String getRecognize()
+ public String getRecognize()
{
return recognize;
}
@@ -122,19 +135,20 @@ public class DaPicturesRecard extends BaseEntity
@Override
public String toString() {
return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
- .append("id", getId())
- .append("picName", getPicName())
- .append("picUrl", getPicUrl())
- .append("wlsjId", getWlsjId())
- .append("wlsjPath", getWlsjPath())
- .append("muId", getMuId())
- .append("muPath", getMuPath())
- .append("recognize", getRecognize())
- .append("remark", getRemark())
- .append("createBy", getCreateBy())
- .append("createTime", getCreateTime())
- .append("updateBy", getUpdateBy())
- .append("updateTime", getUpdateTime())
- .toString();
+ .append("id", getId())
+ .append("picName", getPicName())
+ .append("picUrl", getPicUrl())
+ .append("wlsjId", getWlsjId())
+ .append("wlsjPath", getWlsjPath())
+ .append("muId", getMuId())
+ .append("muPath", getMuPath())
+ .append("ywType", getYwType())
+ .append("recognize", getRecognize())
+ .append("remark", getRemark())
+ .append("createBy", getCreateBy())
+ .append("createTime", getCreateTime())
+ .append("updateBy", getUpdateBy())
+ .append("updateTime", getUpdateTime())
+ .toString();
}
}
diff --git a/dangan-dangan/src/main/java/com/da/dangan/service/impl/DaCatalogServiceImpl.java b/dangan-dangan/src/main/java/com/da/dangan/service/impl/DaCatalogServiceImpl.java
index d4bf168..3d53afa 100644
--- a/dangan-dangan/src/main/java/com/da/dangan/service/impl/DaCatalogServiceImpl.java
+++ b/dangan-dangan/src/main/java/com/da/dangan/service/impl/DaCatalogServiceImpl.java
@@ -134,6 +134,7 @@ public class DaCatalogServiceImpl implements IDaCatalogService
throw new ServiceException("此目录停用，不允许新增");
}
daCatalog.setAncestors(info.getAncestors() + "," + daCatalog.getPid());
+ daCatalog.setYwType(info.getYwType());
}
return daCatalogMapper.insertDaCatalog(daCatalog);
}
diff --git a/dangan-dangan/src/main/java/com/da/dangan/util/CallThirdInterface.java b/dangan-dangan/src/main/java/com/da/dangan/util/CallThirdInterface.java
index 63c66e0..17fa951 100644
--- a/dangan-dangan/src/main/java/com/da/dangan/util/CallThirdInterface.java
+++ b/dangan-dangan/src/main/java/com/da/dangan/util/CallThirdInterface.java
@@ -13,24 +13,31 @@ import java.util.List;
*/
public class CallThirdInterface {
- /*
- public static String callThirdInterface1(String url){
- // 文件路径
- String filePath = "/path/to/your/file.txt";
- // 请求的URL
- String url = "http://yourserver.com/upload";
-
- // 使用file方法传递文件
- HttpRequest request = HttpRequest.post(url)
- .file("fileParam", filePath);
-
- // 发送请求并获取响应
- HttpResponse response = request.execute();
-
- // 打印响应内容
- System.out.println(response.body());
- } */
+ public static String callThirdInterface1(){
+ // 1. 创建HttpRequest对象 - 指定好 url 地址
+ HttpRequest httpRequest = new HttpRequest("http://localhost/register");
+ // 2. 设置请求方式，默认是GET请求
+ httpRequest.setMethod(Method.POST);
+ // 3. 设置请求参数 可通过 form表单方法 设置 可以是文件类型
+ // form方法有很多重载方法,可以一个一个参数设置，也可以将参数封装进一个map集合然后一块儿
+ // File file = new File("C:\\Users\\hssym\\Downloads\\UBQ.png");
+ // httpRequest.form("image",files);
+ // 4. 设置请求头
+ // 请求头同样可以逐一设置，也可以封装到map中再统一设置
+ // 设置的请求头是否可以覆盖等信息具体请看源码关于重载方法的说明
+ // httpRequest.header("x-c-authorization","yourToken");
+ // 5. 执行请求，得到http响应类
+ HttpResponse execute = httpRequest.execute();
+ // 6. 解析这个http响应类，可以获取到响应主体、cookie、是否请求成功等信息
+ boolean ok = execute.isOk(); // 是否请求成功 判断依据为：状态码范围在200~299内
+ System.out.println(ok);
+ List cookies = execute.getCookies();// 获取所有cookie
+ cookies.forEach(System.out::println); // 如果为空不会遍历的
+ String body = execute.body(); // 获取响应主体
+ System.out.println(body);
+ return body;
+ }
public static String callThirdInterface(String url,List files){
// 1. 创建HttpRequest对象 - 指定好 url 地址
HttpRequest httpRequest = new HttpRequest(url);
diff --git a/dangan-dangan/src/main/resources/mapper/dangan/DaCzrkdjMapper.xml b/dangan-dangan/src/main/resources/mapper/dangan/DaCzrkdjMapper.xml
index 2cf822d..df8ac69 100644
--- a/dangan-dangan/src/main/resources/mapper/dangan/DaCzrkdjMapper.xml
+++ b/dangan-dangan/src/main/resources/mapper/dangan/DaCzrkdjMapper.xml
@@ -47,7 +47,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
and mu_id = #{muId}
and (name like concat('%', #{name}, '%')
- or hz_name like concat('%', #{hzName}, '%'))
+ or hz_name like concat('%', #{name}, '%'))
and relation = #{relation}
and birthday = #{birthday}
diff --git a/dangan-dangan/src/main/resources/mapper/dangan/DaPicturesRecardMapper.xml b/dangan-dangan/src/main/resources/mapper/dangan/DaPicturesRecardMapper.xml
index 9ccb1e9..d09c49a 100644
--- a/dangan-dangan/src/main/resources/mapper/dangan/DaPicturesRecardMapper.xml
+++ b/dangan-dangan/src/main/resources/mapper/dangan/DaPicturesRecardMapper.xml
@@ -1,9 +1,9 @@
+ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+ "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-
+
@@ -12,6 +12,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+
@@ -21,27 +22,29 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
- select id, pic_name, pic_url, wlsj_id, wlsj_path, mu_id, mu_path, recognize, remark, create_by, create_time, update_by, update_time from da_pictures_recard
+ select id, pic_name, pic_url, wlsj_id, wlsj_path, mu_id, mu_path, yw_type, recognize, remark, create_by, create_time, update_by, update_time from da_pictures_recard
-
+
-
+
insert into da_pictures_recard
@@ -51,13 +54,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
wlsj_path,
mu_id,
mu_path,
+ yw_type,
recognize,
remark,
create_by,
create_time,
update_by,
update_time,
-
+
#{picName},
#{picUrl},
@@ -65,13 +69,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
#{wlsjPath},
#{muId},
#{muPath},
+ #{ywType},
#{recognize},
#{remark},
#{createBy},
#{createTime},
#{updateBy},
#{updateTime},
-
+
@@ -83,6 +88,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
wlsj_path = #{wlsjPath},
mu_id = #{muId},
mu_path = #{muPath},
+ yw_type = #{ywType},
recognize = #{recognize},
remark = #{remark},
create_by = #{createBy},
@@ -98,7 +104,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
- delete from da_pictures_recard where id in
+ delete from da_pictures_recard where id in
#{id}