ruanfa
/
dangan
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source
master
wanglei 2 years ago
parent de46a1af05 8180bc62ad
commit 030e15e783
10 changed files with 234 additions and 160 deletions
Show Stats Download Patch File Download Diff File

22
README.md
Unescape View File

@ -1,28 +1,10 @@
<p align="center">
<img alt="logo" src="https://oscimg.oschina.net/oscnet/up-d3d0a9303e11d522a06cd263f3079027715.png">
</p>
<h1 align="center" style="margin: 30px 0 30px; font-weight: bold;">RuoYi v3.8.7</h1>
<h4 align="center">基于SpringBoot+Vue前后端分离的Java快速开发框架</h4>
<p align="center">
<a href="https://gitee.com/y_project/RuoYi-Vue/stargazers"><img src="https://gitee.com/y_project/RuoYi-Vue/badge/star.svg?theme=dark"></a>
<a href="https://gitee.com/y_project/RuoYi-Vue"><img src="https://img.shields.io/badge/RuoYi-v3.8.7-brightgreen.svg"></a>
<a href="https://gitee.com/y_project/RuoYi-Vue/blob/master/LICENSE"><img src="https://img.shields.io/github/license/mashape/apistatus.svg"></a>
</p>
## 平台简介
若依是一套全部开源的快速开发平台，毫无保留给个人及企业免费使用。
* 前端采用Vue、Element UI。
* 后端采用Spring Boot、Spring Security、Redis & Jwt。
* 权限认证使用Jwt，支持多终端认证系统。
* 支持加载动态权限菜单，多方式轻松权限控制。
* 高效率开发，使用代码生成器可以一键生成前后端代码。
* 提供了技术栈（[Vue3](https://v3.cn.vuejs.org) [Element Plus](https://element-plus.org/zh-CN) [Vite](https://cn.vitejs.dev)）版本[RuoYi-Vue3](https://github.com/yangzongzhuan/RuoYi-Vue3)，保持同步更新。
* 提供了单应用版本[RuoYi-Vue-fast](https://github.com/yangzongzhuan/RuoYi-Vue-fast)，Oracle版本[RuoYi-Vue-Oracle](https://github.com/yangzongzhuan/RuoYi-Vue-Oracle)，保持同步更新。
* 不分离版本，请移步[RuoYi](https://gitee.com/y_project/RuoYi)，微服务版本，请移步[RuoYi-Cloud](https://gitee.com/y_project/RuoYi-Cloud)
* 阿里云折扣场：[点我进入](http://aly.ruoyi.vip)，腾讯云秒杀场：[点我进入](http://txy.ruoyi.vip)&nbsp;&nbsp;
* 阿里云优惠券：[点我领取](https://www.aliyun.com/minisite/goods?userCode=brki8iof&share_source=copy_link)，腾讯云优惠券：[点我领取](https://cloud.tencent.com/redirect.php?redirect=1025&cps_key=198c8df2ed259157187173bc7f4f32fd&from=console)&nbsp;&nbsp;
## 内置功能
@ -49,4 +31,6 @@
- admin/admin123
#影源扫描仪 授权码：ND8NSUzCysU1gCr78aj57g==
#影源扫描仪 授权码：V4tMKPYgFtW8vQr4C0s4/g==
测试临时码：D+1WT4eWDqLseG5433yq9w==
#系统中扫描上传 连接打印机的电脑需要安装两个：扫描仪驱动M3230.zip、webscan.exe插件 (已上传到项目)

4
dangan-admin/src/main/resources/application.yml
Unescape View File

@ -127,3 +127,7 @@ xss:
excludes: /system/notice
# 匹配链接
urlPatterns: /system/*,/monitor/*,/tool/*
ocr:
#第三方访问地址
url: http://123.57.142.195:443/upload_api

156
dangan-dangan/src/main/java/com/da/dangan/controller/DangAnCollectController.java
Unescape View File

@ -8,8 +8,11 @@ import com.da.common.utils.file.FileUtils;
import com.da.dangan.domain.DaPicturesRecard;
import com.da.dangan.service.IDaCzrkdjService;
import com.da.dangan.service.IDaPicturesRecardService;
import com.da.dangan.util.CallThirdInterface;
import com.da.framework.config.ServerConfig;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.http.ResponseEntity;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;
@ -38,14 +41,15 @@ public class DangAnCollectController extends BaseController {
private IDaCzrkdjService daCzrkdjService;
private static final String FILE_DELIMETER = ",";
@Value("${ocr.url}")
private String url;
/**
* 上传（单个）
*/
@PostMapping("/save")
public AjaxResult save(@RequestPart("file")MultipartFile file, @RequestPart("picRecard")DaPicturesRecard picRecard)
{
try
{
public AjaxResult save(@RequestPart("file") MultipartFile file, @RequestPart("picRecard") DaPicturesRecard picRecard) {
try {
// 上传文件路径
String filePath = RuoYiConfig.getUploadPath();
// 上传并返回新文件名称
@ -57,15 +61,13 @@ public class DangAnCollectController extends BaseController {
picRecard.setCreateBy(getUsername());
AjaxResult ajax = AjaxResult.success();
daPicturesRecardService.insertDaPicturesRecard(picRecard);
ajax.put("data",picRecard);
ajax.put("data", picRecard);
/*ajax.put("url", url);
ajax.put("fileName", fileName);
ajax.put("newFileName", FileUtils.getName(fileName));
ajax.put("originalFilename", file.getOriginalFilename());*/
return ajax;
}
catch (Exception e)
{
} catch (Exception e) {
return AjaxResult.error(e.getMessage());
}
}
@ -74,10 +76,8 @@ public class DangAnCollectController extends BaseController {
* 通用上传（单个/多个）
*/
@PostMapping("/saves")
public AjaxResult saves(@RequestPart("files")MultipartFile[] files,@RequestPart("picRecard") DaPicturesRecard picRecard) throws Exception
{
try
{ //数据存储
public AjaxResult saves(@RequestPart("files") MultipartFile[] files, @RequestPart("picRecard") DaPicturesRecard picRecard) throws Exception {
try { //数据存储
List<DaPicturesRecard> picRecards = new ArrayList<>();
// 上传文件路径
String filePath = RuoYiConfig.getUploadPath();
@ -85,8 +85,7 @@ public class DangAnCollectController extends BaseController {
List<String> fileNames = new ArrayList<String>();
List<String> newFileNames = new ArrayList<String>();
List<String> originalFilenames = new ArrayList<String>();
for (MultipartFile file : files)
{
for (MultipartFile file : files) {
//
DaPicturesRecard newPicRecard = new DaPicturesRecard();
@ -95,8 +94,8 @@ public class DangAnCollectController extends BaseController {
String url = serverConfig.getUrl() + fileName;
// 添加水印
String updatedFilePath = removePathBeforeSecondSlash(fileName);
String watermarkFilePath = addWatermark(filePath + updatedFilePath);
/*String updatedFilePath = removePathBeforeSecondSlash(fileName);
String watermarkFilePath = addWatermark(filePath + updatedFilePath);*/
urls.add(url);
fileNames.add(fileName);
@ -110,6 +109,7 @@ public class DangAnCollectController extends BaseController {
newPicRecard.setMuPath(picRecard.getMuPath());
newPicRecard.setWlsjId(picRecard.getWlsjId());
newPicRecard.setWlsjPath(picRecard.getWlsjPath());
newPicRecard.setYwType(picRecard.getYwType());
daPicturesRecardService.insertDaPicturesRecard(newPicRecard);
picRecards.add(newPicRecard);
}
@ -118,66 +118,36 @@ public class DangAnCollectController extends BaseController {
ajax.put("fileNames", StringUtils.join(fileNames, FILE_DELIMETER));
ajax.put("newFileNames", StringUtils.join(newFileNames, FILE_DELIMETER));
ajax.put("originalFilenames", StringUtils.join(originalFilenames, FILE_DELIMETER));*/
ajax.put("data",picRecards);
return ajax;
}
catch (Exception e)
{
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();
ajax.put("data", picRecards);
return ajax;
}
catch (Exception e)
{
} catch (Exception e) {
return AjaxResult.error(e.getMessage());
}
}
/**
* 调用识别接口
* 调用ocr识别接口——识别单张图片为一条记录
*/
@PostMapping("/recongnize")
public AjaxResult recognize(@RequestBody DaPicturesRecard[] picRecards){
public AjaxResult recognize(@RequestBody DaPicturesRecard[] picRecards) {
try {
//获取所有的文件
List<File> files = new ArrayList<>();
for (DaPicturesRecard picRecard : picRecards) {
File file = new File(picRecard.getPicUrl());
String path = getPath(picRecard.getPicUrl());
File file = new File(path);
files.add(file);
}
// TODO 调用第三方接口识别信息
//String result= CallThirdInterface.callThirdInterface1();
//String result= CallThirdInterface.callThirdInterface("url",files);
String result = CallThirdInterface.callThirdInterface(url, files, "option1");
System.out.println(result);
// TODO 根据业务类型存储识别后的信息
//daCzrkdjService.insertDaCzrkdj();
//修改图片信息记录表为已识别
for(DaPicturesRecard picRecard:picRecards){
//识别成功的图片 ，修改图片信息记录表为已识别
for (DaPicturesRecard picRecard : picRecards) {
picRecard.setRecognize("1");
daPicturesRecardService.updateDaPicturesRecard(picRecard);
}
@ -185,17 +155,68 @@ public class DangAnCollectController extends BaseController {
e.printStackTrace();
return AjaxResult.error(e.getMessage());
}
return AjaxResult.success();
}
/**
* 图片批量识别处理进度
*/
@GetMapping("/progress")
public ResponseEntity<Double> getProgress() {
//调用第三方进度条接口
// 返回进度值，例如：0.5代表50%
return ResponseEntity.ok(0.5);
}
/**
* 测试第三方接口
*/
@PostMapping("/test")
public String test(@RequestParam("files[]") MultipartFile[] files, @RequestParam("fileType") String fileType) throws Exception {
List<File> fileList = new ArrayList<>();
for (MultipartFile multipartFile : files) {
// 使用multipartFile的transferTo方法保存到临时文件
File file = new File(multipartFile.getOriginalFilename());
multipartFile.transferTo(file);
fileList.add(file);
}
String result = CallThirdInterface.callThirdInterface(url, fileList, fileType);
return result;
}
/**
* 测试添加水印
*/
@PostMapping("/test_water")
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());
}
}
/**
* 删除第二个斜杠之前的路径
*
* @param filePath
* @return
*/
private String removePathBeforeSecondSlash(String filePath)
{
private String removePathBeforeSecondSlash(String filePath) {
int count = 0;
int index = -1;
for (int i = 0; i < filePath.length(); i++) {
@ -212,16 +233,17 @@ public class DangAnCollectController extends BaseController {
}
return filePath;
}
/**
* 添加水印
*
* @param filePath
* @return
* @throws IOException
*/
private String addWatermark(String filePath) throws IOException
{ //获取文件后缀
private String addWatermark(String filePath) throws IOException { //获取文件后缀
int indexNum = filePath.lastIndexOf(".");
String fileExtension = filePath.substring(indexNum+1);
String fileExtension = filePath.substring(indexNum + 1);
BufferedImage image = ImageIO.read(new File(filePath));
/*int h = bufferedImage.getHeight();
@ -247,8 +269,8 @@ public class DangAnCollectController extends BaseController {
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;
int x = (image.getWidth() - g2d.getFontMetrics().stringWidth(watermark)) / 2;
int y = image.getHeight() / 2;
g2d.drawString(watermark, x, y);
// 保存添加水印后的图片，覆盖原始图片
@ -258,5 +280,11 @@ public class DangAnCollectController extends BaseController {
return filePath;
}
public String getPath(String path) {
String profile = RuoYiConfig.getUploadPath();
int i = path.indexOf("upload");
String filePath = profile + path.substring(i + 6);
return filePath;
}
}

20
dangan-dangan/src/main/java/com/da/dangan/domain/DaCzrkdj.java
Unescape View File

@ -12,7 +12,7 @@ import java.util.Date;
* 常住人口登记对象 da_czrkdj
*
* @author hs
* @date 2024-05-08
* @date 2024-05-30
*/
public class DaCzrkdj extends BaseEntity
{
@ -21,6 +21,10 @@ public class DaCzrkdj extends BaseEntity
/** id */
private Long id;
/** 业务类型(字典) */
@Excel(name = "业务类型(字典)")
private String ywType;
/** 目录id */
@Excel(name = "目录id")
private Long muId;
@ -54,8 +58,8 @@ public class DaCzrkdj extends BaseEntity
@Excel(name = "身份证号")
private String cardId;
/** 档案图片 */
@Excel(name = "档案图片")
/** 识别的图片 */
@Excel(name = "识别的图片")
private String pictures;
public void setId(Long id)
@ -67,6 +71,15 @@ public class DaCzrkdj extends BaseEntity
{
return id;
}
public void setYwType(String ywType)
{
this.ywType = ywType;
}
public String getYwType()
{
return ywType;
}
public void setMuId(Long muId)
{
this.muId = muId;
@ -153,6 +166,7 @@ public class DaCzrkdj extends BaseEntity
public String toString() {
return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
.append("id", getId())
.append("ywType", getYwType())
.append("muId", getMuId())
.append("name", getName())
.append("hzName", getHzName())

16
dangan-dangan/src/main/java/com/da/dangan/domain/DaPicturesRecard.java
Unescape View File

@ -9,7 +9,7 @@ import com.da.common.core.domain.BaseEntity;
* 档案图片信息记录对象 da_pictures_recard
*
* @author hs
* @date 2024-05-15
* @date 2024-05-30
*/
public class DaPicturesRecard extends BaseEntity
{
@ -46,6 +46,10 @@ public class DaPicturesRecard extends BaseEntity
@Excel(name = "业务类型(字典)")
private String ywType;
/** 对应档案记录id */
@Excel(name = "对应档案记录id")
private Long daJlId;
/** 是否已识别 */
@Excel(name = "是否已识别")
private String recognize;
@ -122,6 +126,15 @@ public class DaPicturesRecard extends BaseEntity
{
return ywType;
}
public void setDaJlId(Long daJlId)
{
this.daJlId = daJlId;
}
public Long getDaJlId()
{
return daJlId;
}
public void setRecognize(String recognize)
{
this.recognize = recognize;
@ -143,6 +156,7 @@ public class DaPicturesRecard extends BaseEntity
.append("muId", getMuId())
.append("muPath", getMuPath())
.append("ywType", getYwType())
.append("daJlId", getDaJlId())
.append("recognize", getRecognize())
.append("remark", getRemark())
.append("createBy", getCreateBy())

74
dangan-dangan/src/main/java/com/da/dangan/util/CallThirdInterface.java
Unescape View File

@ -1,56 +1,71 @@
package com.da.dangan.util;
import cn.hutool.core.util.CharsetUtil;
import cn.hutool.http.HttpRequest;
import cn.hutool.http.HttpResponse;
import cn.hutool.http.HttpUtil;
import cn.hutool.http.Method;
import java.io.File;
import java.net.HttpCookie;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
/**
* 调用第三方接口，传文件，获取识别结果
*/
public class CallThirdInterface {
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();
public static String callThirdInterface1(String url){
// 定义上传的URL
//String url = "http://yourserver.com:8080/upload";
//添加json
/*JSONObject json = new JSONObject();
json.put("username", "1332788xxxxxx");
json.put("password", "123456.");*/
//添加请求头，可多个
HashMap<String, String> headers = new HashMap<>();//存放请求头，可以存放多个请求头
headers.put("Authorization", "Bearer eyJhbGciOiJIUzUxMiJ9.eyJsb2dpbl91c2VyX2tleSI6IjA2NjhmYTM5LTE5OWEtNDAyYy1iYjJlLTk1MjI0OWExMTlhOSJ9.S5-6MC6xKHx1bGjuE0g_QR0vGTsAG1E6rmQCqm2GSMIgNNZkYCnZckegYI8UCCxuGkTV_GOFwmcGagG0IccNEw");
// 定义要上传的文件
// File file = new File("/path/to/your/file.txt");
// 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;
// 定义其他要上传的表单参数
Map<String, Object> map = new HashMap<>();//存放参数
map.put("keyword", "王");
map.put("ywTypes", 0);
// 使用Hutool的HttpUtil上传文件
String result = HttpUtil.createGet(url)
.addHeaders(headers)
.charset(CharsetUtil.CHARSET_UTF_8)
//.form("file", file) // 文件名称为"file"
.form(map)// 添加其他表单参数
.execute().body() ;
// 输出结果
System.out.println(result);
return result;
}
public static String callThirdInterface(String url,List<File> files){
public static String callThirdInterface(String url,List<File> files,String fileType){
// 1. 创建HttpRequest对象 - 指定好 url 地址
HttpRequest httpRequest = new HttpRequest(url);
// 2. 设置请求方式，默认是GET请求
httpRequest.setMethod(Method.POST);
// 3. 设置请求参数 可通过 form表单方法 设置 可以是文件类型
// form方法有很多重载方法,可以一个一个参数设置，也可以将参数封装进一个map集合然后一块儿
// File file = new File("C:\\Users\\hssym\\Downloads\\UBQ.png");
httpRequest.form("image",files);
httpRequest.charset(CharsetUtil.CHARSET_UTF_8);
httpRequest.form("files[]",files.toArray(new File[0]));
httpRequest.form("fileType",fileType);
// 4. 设置请求头
// 请求头同样可以逐一设置，也可以封装到map中再统一设置
// 设置的请求头是否可以覆盖等信息具体请看源码关于重载方法的说明
httpRequest.header("x-c-authorization","yourToken");
// 设置的请求头,可添加多个
// httpRequest.header("x-c-authorization","yourToken");
// httpRequest.header("Content-Type", "multipart/form-data;charset=UTF-8");
// 5. 执行请求，得到http响应类
HttpResponse execute = httpRequest.execute();
@ -60,6 +75,10 @@ public class CallThirdInterface {
List<HttpCookie> cookies = execute.getCookies();// 获取所有cookie
cookies.forEach(System.out::println); // 如果为空不会遍历的
String body = execute.body(); // 获取响应主体
/*byte[] bytes = execute.bodyBytes();
String body = new String (bytes,CharsetUtil.UTF_8);*/
// 输出结果
System.out.println(body);
return body;
}
@ -78,5 +97,4 @@ public class CallThirdInterface {
}
System.out.println(values);
}
}

8
dangan-dangan/src/main/resources/mapper/dangan/DaCzrkdjMapper.xml
Unescape View File

@ -6,6 +6,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<resultMap type="DaCzrkdj" id="DaCzrkdjResult">
<result property="id" column="id" />
<result property="ywType" column="yw_type" />
<result property="muId" column="mu_id" />
<result property="name" column="name" />
<result property="hzName" column="hz_name" />
@ -23,12 +24,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</resultMap>
<sql id="selectDaCzrkdjVo">
select id, mu_id, name, hz_name, relation, birthday, address, jiguan, card_id, pictures, remark, create_by, create_time, update_by, update_time from da_czrkdj
select id,yw_type, mu_id, name, hz_name, relation, birthday, address, jiguan, card_id, pictures, remark, create_by, create_time, update_by, update_time from da_czrkdj
</sql>
<select id="selectDaCzrkdjList" parameterType="DaCzrkdj" resultMap="DaCzrkdjResult">
<include refid="selectDaCzrkdjVo"/>
<where>
<if test="ywType != null and ywType != ''"> and yw_type = #{ywType}</if>
<if test="muId != null "> and mu_id = #{muId}</if>
<if test="name != null and name != ''"> and name like concat('%', #{name}, '%')</if>
<if test="hzName != null and hzName != ''"> and hz_name like concat('%', #{hzName}, '%')</if>
@ -44,6 +46,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<select id="selectDaCzrkdjList1" parameterType="DaCzrkdj" resultMap="DaCzrkdjResult">
<include refid="selectDaCzrkdjVo"/>
<where>
<if test="ywType != null and ywType != ''"> and yw_type = #{ywType}</if>
<if test="muId != null "> and mu_id = #{muId}</if>
<if test="name != null and name != ''">
and (name like concat('%', #{name}, '%')
@ -66,6 +69,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<insert id="insertDaCzrkdj" parameterType="DaCzrkdj" useGeneratedKeys="true" keyProperty="id">
insert into da_czrkdj
<trim prefix="(" suffix=")" suffixOverrides=",">
<if test="ywType != null">yw_type,</if>
<if test="muId != null">mu_id,</if>
<if test="name != null">name,</if>
<if test="hzName != null">hz_name,</if>
@ -82,6 +86,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="updateTime != null">update_time,</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="ywType != null">#{ywType},</if>
<if test="muId != null">#{muId},</if>
<if test="name != null">#{name},</if>
<if test="hzName != null">#{hzName},</if>
@ -102,6 +107,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<update id="updateDaCzrkdj" parameterType="DaCzrkdj">
update da_czrkdj
<trim prefix="SET" suffixOverrides=",">
<if test="ywType != null">yw_type = #{ywType},</if>
<if test="muId != null">mu_id = #{muId},</if>
<if test="name != null">name = #{name},</if>
<if test="hzName != null">hz_name = #{hzName},</if>

9
dangan-dangan/src/main/resources/mapper/dangan/DaPicturesRecardMapper.xml
Unescape View File

@ -13,6 +13,7 @@
<result property="muId" column="mu_id" />
<result property="muPath" column="mu_path" />
<result property="ywType" column="yw_type" />
<result property="daJlId" column="da_jl_id" />
<result property="recognize" column="recognize" />
<result property="remark" column="remark" />
<result property="createBy" column="create_by" />
@ -22,7 +23,7 @@
</resultMap>
<sql id="selectDaPicturesRecardVo">
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
select id, pic_name, pic_url, wlsj_id, wlsj_path, mu_id, mu_path, yw_type,da_jl_id, recognize, remark, create_by, create_time, update_by, update_time from da_pictures_recard
</sql>
<select id="selectDaPicturesRecardList" parameterType="DaPicturesRecard" resultMap="DaPicturesRecardResult">
@ -34,10 +35,11 @@
<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="daJlId != null "> and da_jl_id = #{daJlId}</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
order by id DESC
</select>
<select id="selectDaPicturesRecardById" parameterType="Long" resultMap="DaPicturesRecardResult">
@ -55,6 +57,7 @@
<if test="muId != null">mu_id,</if>
<if test="muPath != null">mu_path,</if>
<if test="ywType != null">yw_type,</if>
<if test="daJlId != null">da_jl_id,</if>
<if test="recognize != null">recognize,</if>
<if test="remark != null">remark,</if>
<if test="createBy != null">create_by,</if>
@ -70,6 +73,7 @@
<if test="muId != null">#{muId},</if>
<if test="muPath != null">#{muPath},</if>
<if test="ywType != null">#{ywType},</if>
<if test="daJlId != null">#{daJlId},</if>
<if test="recognize != null">#{recognize},</if>
<if test="remark != null">#{remark},</if>
<if test="createBy != null">#{createBy},</if>
@ -89,6 +93,7 @@
<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="daJlId != null">da_jl_id = #{daJlId},</if>
<if test="recognize != null">recognize = #{recognize},</if>
<if test="remark != null">remark = #{remark},</if>
<if test="createBy != null">create_by = #{createBy},</if>

3
dangan-ui/src/views/dangan/collection/index.vue
Unescape View File

@ -234,7 +234,8 @@ export default {
_this.WebScan = new WebScan({
url:'http://localhost:18989/WebScan',
wsUrl:'http://localhost:28989/',
licence:'D+1WT4eWDqLseG5433yq9w=='
/*licence:'D+1WT4eWDqLseG5433yq9w=='*/
licence:'V4tMKPYgFtW8vQr4C0s4/g=='
});
_this.WebScan.initSef('',function (result){

2
dangan-ui/src/views/dangan/pictureRecard/index.vue
Unescape View File

@ -111,7 +111,7 @@
<el-table v-loading="loading" :data="pictureRecardList" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" align="center" />
<el-table-column label="id" align="center" prop="id" />
<el-table-column label="上传时间" align="center" prop="createTime" />
<el-table-column label="图片名称" align="center" prop="picName" />
<el-table-column label="图片路径" align="center" prop="picUrl" />
<el-table-column label="物理书架ID" align="center" prop="wlsjId" />

Write Preview
Loading…
Cancel
Save