Merge remote-tracking branch 'origin/master'

master
wanglei 2 years ago
commit 2f4cad39f6

@ -48,49 +48,5 @@
## 在线体验
- admin/admin123
- 陆陆续续收到一些打赏,为了更好的体验已用于演示服务器升级。谢谢各位小伙伴。
演示地址http://vue.ruoyi.vip
文档地址http://doc.ruoyi.vip
## 演示图
<table>
<tr>
<td><img src="https://oscimg.oschina.net/oscnet/cd1f90be5f2684f4560c9519c0f2a232ee8.jpg"/></td>
<td><img src="https://oscimg.oschina.net/oscnet/1cbcf0e6f257c7d3a063c0e3f2ff989e4b3.jpg"/></td>
</tr>
<tr>
<td><img src="https://oscimg.oschina.net/oscnet/up-8074972883b5ba0622e13246738ebba237a.png"/></td>
<td><img src="https://oscimg.oschina.net/oscnet/up-9f88719cdfca9af2e58b352a20e23d43b12.png"/></td>
</tr>
<tr>
<td><img src="https://oscimg.oschina.net/oscnet/up-39bf2584ec3a529b0d5a3b70d15c9b37646.png"/></td>
<td><img src="https://oscimg.oschina.net/oscnet/up-936ec82d1f4872e1bc980927654b6007307.png"/></td>
</tr>
<tr>
<td><img src="https://oscimg.oschina.net/oscnet/up-b2d62ceb95d2dd9b3fbe157bb70d26001e9.png"/></td>
<td><img src="https://oscimg.oschina.net/oscnet/up-d67451d308b7a79ad6819723396f7c3d77a.png"/></td>
</tr>
<tr>
<td><img src="https://oscimg.oschina.net/oscnet/5e8c387724954459291aafd5eb52b456f53.jpg"/></td>
<td><img src="https://oscimg.oschina.net/oscnet/644e78da53c2e92a95dfda4f76e6d117c4b.jpg"/></td>
</tr>
<tr>
<td><img src="https://oscimg.oschina.net/oscnet/up-8370a0d02977eebf6dbf854c8450293c937.png"/></td>
<td><img src="https://oscimg.oschina.net/oscnet/up-49003ed83f60f633e7153609a53a2b644f7.png"/></td>
</tr>
<tr>
<td><img src="https://oscimg.oschina.net/oscnet/up-d4fe726319ece268d4746602c39cffc0621.png"/></td>
<td><img src="https://oscimg.oschina.net/oscnet/up-c195234bbcd30be6927f037a6755e6ab69c.png"/></td>
</tr>
<tr>
<td><img src="https://oscimg.oschina.net/oscnet/b6115bc8c31de52951982e509930b20684a.jpg"/></td>
<td><img src="https://oscimg.oschina.net/oscnet/up-5e4daac0bb59612c5038448acbcef235e3a.png"/></td>
</tr>
</table>
## 若依前后端分离交流群
QQ群 [![加入QQ群](https://img.shields.io/badge/已满-937441-blue.svg)](https://jq.qq.com/?_wv=1027&k=5bVB1og) [![加入QQ群](https://img.shields.io/badge/已满-887144332-blue.svg)](https://jq.qq.com/?_wv=1027&k=5eiA4DH) [![加入QQ群](https://img.shields.io/badge/已满-180251782-blue.svg)](https://jq.qq.com/?_wv=1027&k=5AxMKlC) [![加入QQ群](https://img.shields.io/badge/已满-104180207-blue.svg)](https://jq.qq.com/?_wv=1027&k=51G72yr) [![加入QQ群](https://img.shields.io/badge/已满-186866453-blue.svg)](https://jq.qq.com/?_wv=1027&k=VvjN2nvu) [![加入QQ群](https://img.shields.io/badge/已满-201396349-blue.svg)](https://jq.qq.com/?_wv=1027&k=5vYAqA05) [![加入QQ群](https://img.shields.io/badge/已满-101456076-blue.svg)](https://jq.qq.com/?_wv=1027&k=kOIINEb5) [![加入QQ群](https://img.shields.io/badge/已满-101539465-blue.svg)](https://jq.qq.com/?_wv=1027&k=UKtX5jhs) [![加入QQ群](https://img.shields.io/badge/已满-264312783-blue.svg)](https://jq.qq.com/?_wv=1027&k=EI9an8lJ) [![加入QQ群](https://img.shields.io/badge/已满-167385320-blue.svg)](https://jq.qq.com/?_wv=1027&k=SWCtLnMz) [![加入QQ群](https://img.shields.io/badge/已满-104748341-blue.svg)](https://jq.qq.com/?_wv=1027&k=96Dkdq0k) [![加入QQ群](https://img.shields.io/badge/已满-160110482-blue.svg)](https://jq.qq.com/?_wv=1027&k=0fsNiYZt) [![加入QQ群](https://img.shields.io/badge/已满-170801498-blue.svg)](https://jq.qq.com/?_wv=1027&k=7xw4xUG1) [![加入QQ群](https://img.shields.io/badge/已满-108482800-blue.svg)](https://jq.qq.com/?_wv=1027&k=eCx8eyoJ) [![加入QQ群](https://img.shields.io/badge/已满-101046199-blue.svg)](https://jq.qq.com/?_wv=1027&k=SpyH2875) [![加入QQ群](https://img.shields.io/badge/已满-136919097-blue.svg)](https://jq.qq.com/?_wv=1027&k=tKEt51dz) [![加入QQ群](https://img.shields.io/badge/已满-143961921-blue.svg)](http://qm.qq.com/cgi-bin/qm/qr?_wv=1027&k=0vBbSb0ztbBgVtn3kJS-Q4HUNYwip89G&authKey=8irq5PhutrZmWIvsUsklBxhj57l%2F1nOZqjzigkXZVoZE451GG4JHPOqW7AW6cf0T&noverify=0&group_code=143961921) [![加入QQ群](https://img.shields.io/badge/已满-174951577-blue.svg)](http://qm.qq.com/cgi-bin/qm/qr?_wv=1027&k=ZFAPAbp09S2ltvwrJzp7wGlbopsc0rwi&authKey=HB2cxpxP2yspk%2Bo3WKTBfktRCccVkU26cgi5B16u0KcAYrVu7sBaE7XSEqmMdFQp&noverify=0&group_code=174951577) [![加入QQ群](https://img.shields.io/badge/已满-161281055-blue.svg)](http://qm.qq.com/cgi-bin/qm/qr?_wv=1027&k=Fn2aF5IHpwsy8j6VlalNJK6qbwFLFHat&authKey=uyIT%2B97x2AXj3odyXpsSpVaPMC%2Bidw0LxG5MAtEqlrcBcWJUA%2FeS43rsF1Tg7IRJ&noverify=0&group_code=161281055) [![加入QQ群](https://img.shields.io/badge/138988063-blue.svg)](http://qm.qq.com/cgi-bin/qm/qr?_wv=1027&k=XIzkm_mV2xTsUtFxo63bmicYoDBA6Ifm&authKey=dDW%2F4qsmw3x9govoZY9w%2FoWAoC4wbHqGal%2BbqLzoS6VBarU8EBptIgPKN%2FviyC8j&noverify=0&group_code=138988063) 点击按钮入群。
#影源扫描仪 授权码ND8NSUzCysU1gCr78aj57g==

@ -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));

@ -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<DaCzrkdj> list = daCzrkdjService.selectDaCzrkdjList(daCzrkdj);
List<DaCzrkdj> list = daCzrkdjService.selectDaCzrkdjList1(daCzrkdj);
return getDataTable(list);
}

@ -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<DaCzrkdj> 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<DaCzrkdj> 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<String> 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<DaCzrkdj> 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<DaCzrkdj> 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;
}
}

@ -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<DaPicturesRecard> 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;
}
}

@ -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();
}
}

@ -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);
}

@ -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<HttpCookie> 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<File> files){
// 1. 创建HttpRequest对象 - 指定好 url 地址
HttpRequest httpRequest = new HttpRequest(url);

@ -47,7 +47,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="muId != null "> and mu_id = #{muId}</if>
<if test="name != null and name != ''">
and (name like concat('%', #{name}, '%')
or hz_name like concat('%', #{hzName}, '%'))
or hz_name like concat('%', #{name}, '%'))
</if>
<if test="relation != null and relation != ''"> and relation = #{relation}</if>
<if test="birthday != null "> and birthday = #{birthday}</if>

@ -1,9 +1,9 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE mapper
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.da.dangan.mapper.DaPicturesRecardMapper">
<resultMap type="DaPicturesRecard" id="DaPicturesRecardResult">
<result property="id" column="id" />
<result property="picName" column="pic_name" />
@ -12,6 +12,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<result property="wlsjPath" column="wlsj_path" />
<result property="muId" column="mu_id" />
<result property="muPath" column="mu_path" />
<result property="ywType" column="yw_type" />
<result property="recognize" column="recognize" />
<result property="remark" column="remark" />
<result property="createBy" column="create_by" />
@ -21,27 +22,29 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</resultMap>
<sql id="selectDaPicturesRecardVo">
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
</sql>
<select id="selectDaPicturesRecardList" parameterType="DaPicturesRecard" resultMap="DaPicturesRecardResult">
<include refid="selectDaPicturesRecardVo"/>
<where>
<where>
<if test="picName != null and picName != ''"> and pic_name like concat('%', #{picName}, '%')</if>
<if test="picUrl != null and picUrl != ''"> and pic_url = #{picUrl}</if>
<if test="wlsjId != null "> and wlsj_id = #{wlsjId}</if>
<if test="wlsjPath != null and wlsjPath != ''"> and wlsj_path = #{wlsjPath}</if>
<if test="muId != null "> and mu_id = #{muId}</if>
<if test="muPath != null and muPath != ''"> and mu_path = #{muPath}</if>
<if test="ywType != null and ywType != ''"> and yw_type = #{ywType}</if>
<if test="recognize != null and recognize != ''"> and recognize = #{recognize}</if>
</where>
order by create_time DESC
</select>
<select id="selectDaPicturesRecardById" parameterType="Long" resultMap="DaPicturesRecardResult">
<include refid="selectDaPicturesRecardVo"/>
where id = #{id}
</select>
<insert id="insertDaPicturesRecard" parameterType="DaPicturesRecard" useGeneratedKeys="true" keyProperty="id">
insert into da_pictures_recard
<trim prefix="(" suffix=")" suffixOverrides=",">
@ -51,13 +54,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="wlsjPath != null">wlsj_path,</if>
<if test="muId != null">mu_id,</if>
<if test="muPath != null">mu_path,</if>
<if test="ywType != null">yw_type,</if>
<if test="recognize != null">recognize,</if>
<if test="remark != null">remark,</if>
<if test="createBy != null">create_by,</if>
<if test="createTime != null">create_time,</if>
<if test="updateBy != null">update_by,</if>
<if test="updateTime != null">update_time,</if>
</trim>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="picName != null and picName != ''">#{picName},</if>
<if test="picUrl != null and picUrl != ''">#{picUrl},</if>
@ -65,13 +69,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="wlsjPath != null">#{wlsjPath},</if>
<if test="muId != null">#{muId},</if>
<if test="muPath != null">#{muPath},</if>
<if test="ywType != null">#{ywType},</if>
<if test="recognize != null">#{recognize},</if>
<if test="remark != null">#{remark},</if>
<if test="createBy != null">#{createBy},</if>
<if test="createTime != null">#{createTime},</if>
<if test="updateBy != null">#{updateBy},</if>
<if test="updateTime != null">#{updateTime},</if>
</trim>
</trim>
</insert>
<update id="updateDaPicturesRecard" parameterType="DaPicturesRecard">
@ -83,6 +88,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="wlsjPath != null">wlsj_path = #{wlsjPath},</if>
<if test="muId != null">mu_id = #{muId},</if>
<if test="muPath != null">mu_path = #{muPath},</if>
<if test="ywType != null">yw_type = #{ywType},</if>
<if test="recognize != null">recognize = #{recognize},</if>
<if test="remark != null">remark = #{remark},</if>
<if test="createBy != null">create_by = #{createBy},</if>
@ -98,7 +104,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</delete>
<delete id="deleteDaPicturesRecardByIds" parameterType="String">
delete from da_pictures_recard where id in
delete from da_pictures_recard where id in
<foreach item="id" collection="array" open="(" separator="," close=")">
#{id}
</foreach>

Loading…
Cancel
Save