Skip to content

X
xzxt-qyxzpt-report
Commit 909b127e by liulianglang
Options

区域协作平台

parent ee6d8621
Showing with 2529 additions and 170 deletions
src/main/java/org/springblade/common/config/BladeConfiguration.java
......@@ -56,12 +56,12 @@ public class BladeConfiguration implements WebMvcConfigurer {
secureRegistry.excludePathPatterns("/bbkwp/*");
secureRegistry.excludePathPatterns("/queryCodeByType");
secureRegistry.excludePathPatterns("/whitelist/check");
secureRegistry.excludePathPatterns("/qqzc/flow/getDzqqByAsjbhAndSjh");
secureRegistry.excludePathPatterns("/sysuser/zcinsertUserNew");
secureRegistry.excludePathPatterns("/qqzc/flow/getDzqqByAsjbhAndSjhCount");
secureRegistry.excludePathPatterns("/qqzc/flow/exportDzqqByAsjbhAndSjh");
secureRegistry.excludePathPatterns("/qqzc/flow/getDzqqListByAsjbh");
secureRegistry.excludePathPatterns("/qqzc/flow/getDzqqListByAsjbhCount");
secureRegistry.excludePathPatterns("/**");
// secureRegistry.excludePathPatterns("/**");
//放开调证请求测试controller
secureRegistry.excludePathPatterns("/qqzc/**");
secureRegistry.excludePathPatterns("/detail/**");
......
src/main/java/org/springblade/founder/redis/controller/DictitemController.java 0 → 100644
package org.springblade.founder.redis.controller;
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.alibaba.fastjson.serializer.SerializerFeature;
import org.springblade.founder.redis.service.IDicItemService;
import org.springblade.founder.redis.service.impl.ImportCode;
import org.springblade.founder.utils.R;
import org.springblade.modules.system.entity.ZTreeNode;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Controller;
import org.springframework.util.StringUtils;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.ResponseBody;
import java.io.*;
import java.util.*;
@Controller
public class DictitemController {
@Autowired
private ImportCode importCode;
@Autowired
private IDicItemService dicItemService;
@Value("${jsonPath}")
private String jsonPath;
@RequestMapping(value = "/queryCodeByType", method = RequestMethod.GET)
@ResponseBody
public R queryCodeByType(String type, String id, String startId, String yycj, String name, String codes, String grade) {
try {
if ("prev".equals(grade)) {
JSONObject jsonObject = getPreNodes(type, id);
return R.ok().data("data", jsonObject.getJSONArray("data"));
} else {
List<ZTreeNode> ZTreeNodeList = queryTypeCode(type, id, startId, yycj, name, codes);
return R.ok().data("rows", ZTreeNodeList);
}
} catch (Exception e) {
e.printStackTrace();
return R.error();
}
}
private JSONObject getPreNodes(String type, String code) {
JSONObject resultObj = new JSONObject();
List<Map<String, Object>> rtList = new ArrayList<>();
ZTreeNode curNode = null;
String pid = null;
List<ZTreeNode> siblingNodes;
while (!StringUtils.isEmpty(code)) {
curNode = getNodeByCode(type, code);
pid = curNode.getPId();
if (!StringUtils.isEmpty(pid)) {
siblingNodes = queryTypeCode(type, pid, null, null, null, null);
code = pid;
} else {
siblingNodes = queryTypeCode(type, null, null, null, null, null);
code = null;
}
Map<String, Object> map = new HashMap<>();
map.put("pid", pid);
map.put("items", siblingNodes);
rtList.add(map);
}
int index1 = 0;
int index2 = 0;
for (int i = rtList.size() - 1; i >= 0; i--) {
Map<String, Object> itemMap = rtList.get(i);
String parentid = (String) itemMap.get("pid");
JSONArray items = JSONArray.parseArray(JSONObject.toJSONString(itemMap.get("items")));
if (i == rtList.size() - 1) {
resultObj.put("data", items);
} else {
if (i == rtList.size() - 2) {
JSONArray lastArray = resultObj.getJSONArray("data");
for (int j = 0; j < lastArray.size(); j++) {
if (parentid.equals(lastArray.getJSONObject(j).getString("id"))) {
index1 = j;
lastArray.getJSONObject(j).put("children", items);
break;
}
}
}
if (i == rtList.size() - 3) {
JSONArray array2 = resultObj.getJSONArray("data").getJSONObject(index1).getJSONArray("children");
for (int k = 0; k < array2.size(); k++) {
if (parentid.equals(array2.getJSONObject(k).getString("id"))) {
index2 = k;
array2.getJSONObject(k).put("children", items);
break;
}
}
}
if (i == rtList.size() - 4) {
JSONArray array3 = resultObj.getJSONArray("data").getJSONObject(index1).getJSONArray("children").getJSONObject(index2).getJSONArray("children");
for (int m = 0; m < array3.size(); m++) {
if (parentid.equals(array3.getJSONObject(m).getString("id"))) {
index2 = m;
array3.getJSONObject(m).put("children", items);
break;
}
}
}
}
}
return resultObj;
}
private ZTreeNode getNodeByCode(String type, String code) {
List<ZTreeNode> zTreeNodeList = dicItemService.queryCodes(type, code, null);
if (zTreeNodeList == null || zTreeNodeList.size() < 1) {
return new ZTreeNode();
}
return zTreeNodeList.get(0);
}
@RequestMapping(value = "/queryTypeCode", method = RequestMethod.GET)
@ResponseBody
public List<ZTreeNode> queryTypeCode(String type, String id, String startId, String yycj, String name, String codes) {
List<ZTreeNode> ZTreeNodeList = new ArrayList<ZTreeNode>();
if (type != null && !"".equals(type)) {
if (type.equals("CODE_JY")) {//添加警员查询的字典
ZTreeNodeList = dicItemService.queryTypeUsercode(startId, name);//查询警员字典
} else {
if (codes != null && !"".equals(codes)) {
ZTreeNodeList = dicItemService.queryCodes(type, codes, name);
} else {
// 立案单位走这条路
ZTreeNodeList = dicItemService.queryTypeCode(type, id, startId, yycj, name);
}
}
}
if("CODE_QGUNIT".equals(type) && StringUtils.isEmpty(id)){
List<ZTreeNode> bjdwList = new ArrayList<>();
List<ZTreeNode> sjdwList = new ArrayList<>();
for (ZTreeNode node : ZTreeNodeList){
String codestr = node.getId();
if (codestr.startsWith("01")){
bjdwList.add(node);
}else {
sjdwList.add(node);
}
}
bjdwList = Sort(bjdwList);
sjdwList = Sort(sjdwList);
sjdwList.addAll(bjdwList);
return sjdwList;
}
ZTreeNodeList = Sort(ZTreeNodeList);
return ZTreeNodeList;
}
private List<ZTreeNode> Sort(List<ZTreeNode> ZTreeNodeList) {
Collections.sort(ZTreeNodeList, new Comparator<ZTreeNode>() {
@Override
public int compare(ZTreeNode o1, ZTreeNode o2) {
if (o1.getCodeType().equals(o2.getCodeType())) {
String code1str = o1.getId();
String code2str = o2.getId();
code1str = code1str.trim();
code2str = code2str.trim();
if (code1str.matches("[0-9]+") && code2str.matches("[0-9]+")) {
Long code1 = Long.parseLong(code1str);
Long code2 = Long.parseLong(code2str);
return code1.compareTo(code2);
} else {
Object ids1str = o1.getIds();
Object ids2str = o2.getIds();
int hascode1 = ids1str.hashCode();
int hascode2 = ids2str.hashCode();
Integer hascode1_ = Integer.valueOf(hascode1);
Integer hascode2_ = Integer.valueOf(hascode2);
return hascode1_.compareTo(hascode2_);
}
} else {
Object ids1str = o1.getIds();
Object ids2str = o2.getIds();
int hascode1 = ids1str.hashCode();
int hascode2 = ids2str.hashCode();
Integer hascode1_ = Integer.valueOf(hascode1);
Integer hascode2_ = Integer.valueOf(hascode2);
return hascode1_.compareTo(hascode2_);
}
}
});
return ZTreeNodeList;
}
@RequestMapping(value = "/queryZTreeDataByName", method = RequestMethod.GET)
@ResponseBody
public List<ZTreeNode> queryZTreeDataByName(@RequestParam(value = "type", required = false) String code_type, String startId, String id, String yycj, String unitcode, String name) {
List<ZTreeNode> ZTreeNodeList = new ArrayList<ZTreeNode>();
if (code_type != null && !"".equals(code_type)) {
if ("CODE_JY".equals(code_type)) {
ZTreeNodeList = dicItemService.queryTypeUsercode(startId, name);//查询警员字典
} else {
ZTreeNodeList = dicItemService.getZtreeNodeByName(code_type, id, yycj, unitcode, name);
}
}
return ZTreeNodeList;
}
/**
* 根据类别重新刷新redis缓存
*/
@RequestMapping("/refreshCodeCache")
@ResponseBody
public R refreshCodeCache(String type) {
String result = "";
try {
importCode.insertIntoRedis(type);
type = (null == type || "null" == type) ? "" : type;
result = "字典" + type + "成功加入缓存";
return R.ok().data("result", result);
} catch (Exception e) {
e.printStackTrace();
result = "刷新字典发生异常！" + "\n" + e.getMessage();
return R.error(result);
}
}
@RequestMapping(value = "/reloadXzxtDict", method = RequestMethod.GET)
@ResponseBody
public R reloadXzxtDict(String type) {
try {
List<String> types;
if (StringUtils.isEmpty(type)) {
types = importCode.getAllTypes(null);
} else if ("SHCE".equals(type)) {
types = importCode.getAllTypes("SHCE");
} else {
types = Arrays.asList(type.split(","));
}
for (String str : types) {
getAllDicJson(str);
}
return R.ok();
} catch (Exception e) {
e.printStackTrace();
return R.error(e.getMessage());
}
}
//生成对应groupid的字典的json文件
private void getAllDicJson(String type) throws Exception {
System.out.println("type===========" + type);
String jsonStr = "";
JSONObject jsonObject = new JSONObject();
List<ZTreeNode> ZTreeNodeList = dicItemService.queryTypeCode(type, null, null, null, null);
ZTreeNodeList = Sort(ZTreeNodeList);
//拿到所有父节点，通过父节点去查询所有的子节点，然后生成json串
for (int i = 0; i < ZTreeNodeList.size(); i++) {
ZTreeNode zTreeNode1 = ZTreeNodeList.get(i);
//判断是否为父节点
if (zTreeNode1.isIsParent()) {//为父节点拿到子节点
List<ZTreeNode> ZTreeNodeChildrenList1 = dicItemService.queryTypeCode(type, zTreeNode1.getId(), null, null, null);
getZdList(ZTreeNodeChildrenList1, type);
zTreeNode1.setChildren(ZTreeNodeChildrenList1);
}
}
jsonObject.put("success", true);
jsonObject.put("code", 200);
jsonObject.put("message", "成功");
Map<String, Object> dataMap = new HashMap();
dataMap.put("rows", ZTreeNodeList);
jsonObject.put("data", dataMap);
jsonStr = JSONObject.toJSONString(jsonObject, SerializerFeature.PrettyFormat, SerializerFeature.WriteMapNullValue,
SerializerFeature.WriteDateUseDateFormat);
try {
String filePath = jsonPath + File.separator;
File file = new File(filePath);
if (!file.exists()) {
file.mkdir();
}
String fileName = filePath + type + ".json";
String encoding = "utf-8";
BufferedWriter out = new BufferedWriter(new OutputStreamWriter(
new FileOutputStream(fileName), encoding));
out.write(jsonStr); // \r\n即为换行
out.flush(); // 把缓存区内容压入文件
out.close(); // 最后记得关闭文件
} catch (IOException e) {
throw new IOException(e);
}
}
public void getZdList(List<ZTreeNode> ZTreeNodeChildrenList, String type) {
if (ZTreeNodeChildrenList != null && ZTreeNodeChildrenList.size() > 0) {
ZTreeNodeChildrenList = Sort(ZTreeNodeChildrenList);
for (int t = 0; t < ZTreeNodeChildrenList.size(); t++) {
ZTreeNode zTreeNode = ZTreeNodeChildrenList.get(t);
if (zTreeNode.isIsParent()) {
List<ZTreeNode> ZTreeNodeChildrenList1 = dicItemService.queryTypeCode(type, zTreeNode.getId(), null, null, null);
ZTreeNodeChildrenList1 = Sort(ZTreeNodeChildrenList1);
zTreeNode.setChildren(ZTreeNodeChildrenList1);
getZdList(ZTreeNodeChildrenList1, type);
}
}
}
}
}
src/main/java/org/springblade/founder/redis/mapper/DictitemMapper.java 0 → 100644
package org.springblade.founder.redis.mapper;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import org.springblade.modules.system.entity.SysDictitem;
import org.springblade.modules.system.entity.User;
import org.springframework.stereotype.Component;
import java.util.List;
import java.util.Map;
@Component
@Mapper
public interface DictitemMapper {
List<SysDictitem> findCodeAllByType(String value);
List<User> queryAllUnitUser(Map m);
List<String> getAllTypes(@Param(value = "type") String type);
String getNameByCode(@Param(value = "code") String code, @Param(value = "groupid") String groupid);
}
src/main/java/org/springblade/founder/redis/mapper/DictitemMapper.xml 0 → 100644
<?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">
<mapper namespace="org.springblade.founder.redis.mapper.DictitemMapper">
<select id="queryAllUnitUser" resultType="org.springblade.modules.system.entity.User" parameterType="java.util.Map">
select
ID as id,
real_name as relName,
account as account
from blade_user where scbz='0' and dept_id = #{unitcode } and status='1'
<if test="true_name!=null and true_name!=''">and real_name like concat('%',#{true_name, jdbcType=VARCHAR},'%')</if>
</select>
<select id="findCodeAllByType" parameterType="java.lang.String" resultType="org.springblade.modules.system.entity.SysDictitem">
select distinct
id,
isparent,
groupid,
code ,
name,
groupname,
pid,
description,
yycj1,
yycj2,
yycj3,
yycj4,
yycj5,
yycj6,
yycj7,
yycj8,
yycj9,
startcode,
endcode
from sys_dictitem
where 1=1
and scbz = '0'
<if test="value != null">
and groupid=#{value, jdbcType=VARCHAR}
</if>
order by code asc
</select>
<select id="getAllTypes" resultType="java.lang.String">
select distinct(groupid) from sys_dictitem
where 1=1
</select>
<select id="getNameByCode" resultType="java.lang.String">
select name from SYS_DICTITEM where groupid=#{groupid, jdbcType=VARCHAR} and code =#{code, jdbcType=VARCHAR}
</select>
</mapper>
src/main/java/org/springblade/founder/redis/service/IDicItemService.java 0 → 100644
package org.springblade.founder.redis.service;
import org.springblade.modules.system.entity.ZTreeNode;
import java.util.List;
public interface IDicItemService {
List<ZTreeNode> queryTypeCode(String code_type, String id, String startId, String yycj, String name);
/**
* 查询指定节点的代码
* @param code_type
* @param codes
* @return
*/
List<ZTreeNode> queryCodes(String code_type, String codes, String name);
/**
* 根据条件查询代码
* @param code_type
* @param id 父级id
* @param yycj 应用场景
* @param unitcode 单位
* @param name 搜索条件
* @return
*/
List<ZTreeNode> getZtreeNodeByName(String code_type, String id, String yycj, String unitcode, String name);
List<ZTreeNode> queryTypeUsercode(String startId, String name);
}
src/main/java/org/springblade/founder/redis/service/impl/IDicItemServiceImpl.java 0 → 100644
package org.springblade.founder.redis.service.impl;
import com.alibaba.fastjson.JSON;
import org.springblade.founder.redis.mapper.DictitemMapper;
import org.springblade.founder.redis.service.IDicItemService;
import org.springblade.modules.system.entity.SysDictitem;
import org.springblade.modules.system.entity.User;
import org.springblade.modules.system.entity.ZTreeNode;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.data.redis.core.StringRedisTemplate;
import org.springframework.stereotype.Service;
import java.util.*;
@Service
public class IDicItemServiceImpl implements IDicItemService {
@Autowired
DictitemMapper dicItemDao;
@Value("${ssdw}")
private String ssdw; //所属单位
@Autowired
private StringRedisTemplate redisTemplate;
/**
* 查询所有单位下的警员信息
* @param startId
* @return
*/
@Override
public List<ZTreeNode> queryTypeUsercode(String startId, String name) {
List<ZTreeNode> ztreeNodes = new ArrayList<>();
Map m = new HashMap<>();
m.put("unitcode",startId);
m.put("true_name",name);
//拿到对应单位下的警员信息
List<User> users = dicItemDao.queryAllUnitUser(m);
if(users!=null&&users.size()>0){//封装成node对象
for(int i=0;i<users.size();i++){
ZTreeNode node = new ZTreeNode();
User user = users.get(i);
node.setState(null); //显示叶子图标
node.setIds(user.getId());
node.setLabel(user.getRealName());
node.setCodeType("CODE_JY");
node.setText(user.getRealName());
node.setId(user.getAccount());
ztreeNodes.add(node);
}
}
return ztreeNodes;
}
@Override
public List<ZTreeNode> queryTypeCode(String type, String id, String startId, String yycj, String name) {
List<ZTreeNode> ztreeNodes = new ArrayList<>();
if (null != ssdw && !"".equals(ssdw) && ssdw.length() >= 2) {
ssdw = ssdw.substring(0, 2);
}
if(id==null||"".equals(id)){//根节点
id=null;
if("CODE_UNIT".equals(type)){//单位代码增加起始单位过滤功能
if(startId!=null){
id=startId.substring(0,2)+"000000000000".substring(startId.length()-2);
}
}else if("CODE_AJXZLB".equals(type)||"CODE_XALBDMBCMS".equals(type)){
id=startId;
//System.out.println("startId="+startId);
}
}
if(name==null||"".equals(name)){
name="*";
}else{
name="*"+name+"*";
id="*";
}
if(startId==null||"".equals(startId)){
startId="*";
}else{
startId=startId+"*";
}
//获取符合条件的key
String keys = ssdw + ":" + type + ":"+id+":"+startId+":"+name+":*";
Set<String> set = redisTemplate.keys(keys);
//System.out.println("keys="+keys);
//System.out.println("=============");
//System.out.println(set);
Iterator<String> iterator = set.iterator();
while(iterator.hasNext()){
String str = iterator.next();
//System.out.println("key="+str);
String jsonStr=redisTemplate.opsForValue().get(str);
//System.out.println("jsonStr="+jsonStr);
jsonStr=jsonStr.replaceAll("\\\\","");
if(jsonStr.startsWith("\"")){
jsonStr=jsonStr.substring(1,jsonStr.length());
}
if(jsonStr.endsWith("\"")){
jsonStr=jsonStr.substring(0,jsonStr.length()-1);
}
//System.out.println("jsonStr="+jsonStr);
SysDictitem sysDictitem= JSON.parseObject(jsonStr, SysDictitem.class);
ZTreeNode node=new ZTreeNode();
node=parseSysDictitemToNode(node,sysDictitem);
if(node.getPId()==null||"".equals(node.getPId())||node.isIsParent()){
node.setState("closed"); //显示文件夹图标
}else{
node.setState(null); //显示叶子图标
}
ztreeNodes.add(node);
}
//System.out.println("------------------------");
//System.out.println(ztreeNodes.toString());
return ztreeNodes;
}
public List<ZTreeNode> getZtreeNodeByName(String code_type, String id, String yycj, String unitcode, String name) {
List<ZTreeNode> ztreeNodes = new ArrayList<>();
if (null != ssdw && !"".equals(ssdw) && ssdw.length() >= 2) {
ssdw = ssdw.substring(0, 2);
}
//获取符合条件的key
String keys = "" + ssdw + ":" + code_type + ":*:*:*"+name+"*:*";
Set<String> set = redisTemplate.keys(keys);
Iterator<String> iterator = set.iterator();
while(iterator.hasNext()) {
String str = iterator.next();
String jsonStr = redisTemplate.opsForValue().get(str);
jsonStr=jsonStr.replaceAll("\\\\","");
if(jsonStr.startsWith("\"")){
jsonStr=jsonStr.substring(1,jsonStr.length());
}
if(jsonStr.endsWith("\"")){
jsonStr=jsonStr.substring(0,jsonStr.length()-1);
}
SysDictitem sysDictitem= JSON.parseObject(jsonStr, SysDictitem.class);
ZTreeNode node=new ZTreeNode();
node=parseSysDictitemToNode(node,sysDictitem);
ztreeNodes.add(node);
}
return getTreeJsonDataByName(ztreeNodes,id);
}
private List<ZTreeNode> getTreeJsonDataByName(List<ZTreeNode> zTreeNoderList, String id) {
List<ZTreeNode> nodes = new ArrayList<ZTreeNode>();
if(null==id || "".equals(id)){
for(ZTreeNode aa:zTreeNoderList) {
int count=0;
for(ZTreeNode bb:zTreeNoderList) {
if(null==aa.getPId() || "".equals(aa.getPId())){ //获得第一级结点
nodes.add(aa);
break;
}else{
if(!aa.getPId().equals(bb.getId())){ //获得第一级结点
count++;
}else{
break;
}
}
}
if(count==zTreeNoderList.size()){
nodes.add(aa);
}
}
}else{
for(ZTreeNode aa:zTreeNoderList){
if(null!=aa.getPId() && aa.getPId().equals(id)){ //根据父节点id获得下面一级的所有结点
nodes.add(aa);
}
}
}
//以下代码是为了区分页面的结点是否有子结点，有的话就显示文件夹图标，没有的话就显示叶子图标
for(ZTreeNode a:nodes){
int count=0;
for(ZTreeNode b:zTreeNoderList){
if(!a.getId().equals(b.getPId())){
count++;
}else{
break;
}
}
if(count!=zTreeNoderList.size()){
a.setState("closed"); //显示文件夹图标
}else{
a.setState(null); //显示叶子图标
}
}
return nodes;
}
@Override
public List<ZTreeNode> queryCodes(String type, String codes, String name) {
List<ZTreeNode> ztreeNodes = new ArrayList<ZTreeNode>();
if (null != ssdw && !"".equals(ssdw) && ssdw.length() >= 2) {
ssdw = ssdw.substring(0, 2);
}
if(codes.endsWith(",")){
codes=codes.substring(0,codes.length()-1);
}
if(name==null||"".equals(name)){
name="*";
}
String[] codeArray=codes.split(",");
for(String code:codeArray){
//获取符合条件的key
System.out.println("code="+code);
String key = ssdw + ":" + type + ":*:"+code+":"+name+":*";
Set<String> set = redisTemplate.keys(key);
Iterator<String> iterator = set.iterator();
while(iterator.hasNext()){
String str = iterator.next();
String jsonStr=redisTemplate.opsForValue().get(str);
if(jsonStr!=null){
jsonStr=jsonStr.replaceAll("\\\\","");
if(jsonStr.startsWith("\"")){
jsonStr=jsonStr.substring(1,jsonStr.length());
}
if(jsonStr.endsWith("\"")){
jsonStr=jsonStr.substring(0,jsonStr.length()-1);
}
SysDictitem sysDictitem= JSON.parseObject(jsonStr, SysDictitem.class);
ZTreeNode node=new ZTreeNode();
node=parseSysDictitemToNode(node,sysDictitem);
node.setState(null); //显示叶子图标
ztreeNodes.add(node);
}
}
}
return ztreeNodes;
}
private ZTreeNode parseSysDictitemToNode(ZTreeNode node, SysDictitem sysDictitem){
node.setIds(sysDictitem.getId());
node.setCodeType(sysDictitem.getGroupid());
node.setLabel(sysDictitem.getName());
node.setText(sysDictitem.getName());
node.setId(sysDictitem.getCode());
node.setPId(sysDictitem.getPid());
node.setDescription(sysDictitem.getDescription());
node.setEndcode(sysDictitem.getEndcode());
//System.out.println(sysDictitem.getName()+":"+sysDictitem.getIsparent());
node.setParentFlag(sysDictitem.getIsparent());
node.setStartcode(sysDictitem.getStartcode());
node.setYycj1(sysDictitem.getYycj1());
node.setYycj2(sysDictitem.getYycj2());
node.setYycj3(sysDictitem.getYycj3());
node.setYycj4(sysDictitem.getYycj4());
node.setYycj5(sysDictitem.getYycj5());
node.setYycj6(sysDictitem.getYycj6());
node.setYycj7(sysDictitem.getYycj7());
node.setYycj8(sysDictitem.getYycj8());
node.setYycj9(sysDictitem.getYycj9());
return node;
}
}
src/main/java/org/springblade/founder/redis/service/impl/ImportCode.java 0 → 100644
package org.springblade.founder.redis.service.impl;
import com.alibaba.fastjson.JSON;
import org.springblade.founder.redis.mapper.DictitemMapper;
import org.springblade.modules.system.entity.SysDictitem;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.data.redis.core.StringRedisTemplate;
import org.springframework.stereotype.Service;
import org.springframework.util.StringUtils;
import java.util.List;
import java.util.Set;
/**
* Created by Administrator on 2018/4/18.
*/
@Service
public class ImportCode {
@Autowired
private DictitemMapper iDictitemDao;
@Value("${ssdw}")
private String ssdw; //所属单位
@Autowired
private StringRedisTemplate redisTemplate;
public void insertIntoRedis(String type) {
if (null != ssdw && !"".equals(ssdw) && ssdw.length() >= 2) {
ssdw = ssdw.substring(0, 2);
}
//先删除指定key缓存，再加入缓存
String keys=ssdw+":*";
if(null!=type && "null"!=type){
keys=ssdw+":"+type+"*";
}
System.out.println("ssdw="+ssdw);
System.out.println("keys="+keys);
Set<String> dictitemKeys = redisTemplate.keys(keys);
redisTemplate.delete(dictitemKeys);
List<SysDictitem> zTreeNodeList = iDictitemDao.findCodeAllByType(type);
for(SysDictitem node:zTreeNodeList){
String nodeStr= JSON.toJSONString(node);
String pid=null;
if(!StringUtils.isEmpty(node.getPid())){
pid=node.getPid();
}
String key = ssdw+":"+node.getGroupid()+":"+pid+":"+node.getCode()+":"+node.getName()+":"+node.getId()+"|"+node.getName();
redisTemplate.opsForValue().set(key,nodeStr);
}
type = (null==type || "null"==type)?"":type;
System.out.println("字典"+type+"成功加入缓存---------------------------------------------");
}
//获取字典表中相关的的groupid
public List<String> getAllTypes(String type) {
return iDictitemDao.getAllTypes(type);
}
}
src/main/java/org/springblade/founder/xzqq/controller/TbYwXzqqMjxxController.java
package org.springblade.founder.xzqq.controller;
import io.swagger.annotations.ApiOperation;
import org.springblade.founder.gnsyrzlog.LogOper;
import org.springblade.founder.utils.EasyUIPage;
import org.springblade.founder.utils.R;
import org.springblade.founder.xzqq.entity.TbYwXzqqMjxx;
import org.springblade.founder.xzqq.entity.TbYwXzqqXx;
import org.springblade.founder.xzqq.entity.TbYwXzqqZhryxx;
import org.springblade.founder.xzqq.service.TbYwXzqqMjxxService;
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
/**
* (TbYwXzqqMjxx)表控制层
......@@ -15,7 +22,7 @@ import javax.annotation.Resource;
* @since 2023-11-07 15:06:00
*/
@RestController
@RequestMapping("tbYwXzqqMjxx")
@RequestMapping("mjxx")
public class TbYwXzqqMjxxController {
/**
* 服务对象
......@@ -30,8 +37,10 @@ public class TbYwXzqqMjxxController {
* @return 单条数据
*/
@PostMapping("selectOne")
public TbYwXzqqMjxx selectOne(String id) {
return this.tbYwXzqqMjxxService.queryById(id);
public R selectOne(String id) {
return R.ok().data("rows",tbYwXzqqMjxxService.queryById(id));
}
@PostMapping("/insertMjxx")
......@@ -39,4 +48,41 @@ public class TbYwXzqqMjxxController {
tbYwXzqqMjxxService.insert(tbYwXzqqXx);
return R.ok().data("xxzjbh","");
}
@PostMapping("/updateMjxx")
public R updateMjxx(TbYwXzqqMjxx tbYwXzqqXx) {
tbYwXzqqMjxxService.update(tbYwXzqqXx);
return R.ok().data("xxzjbh","");
}
@PostMapping("/selectAll")
public R selectAll(TbYwXzqqMjxx tbYwXzqqZhryxx){
try {
EasyUIPage easyUIPage = new EasyUIPage();
easyUIPage.setPage(tbYwXzqqZhryxx.getPage());
easyUIPage.setPagePara(tbYwXzqqZhryxx.getLimit());
int begin = easyUIPage.getBegin();
int end = easyUIPage.getEnd();
tbYwXzqqZhryxx.setPage(begin);
tbYwXzqqZhryxx.setLimit(end);
Map<String,Object> map = new HashMap<>();
List<TbYwXzqqMjxx> list = tbYwXzqqMjxxService.queryAll(tbYwXzqqZhryxx);
int count = tbYwXzqqMjxxService.queryAllCount(tbYwXzqqZhryxx);
map.put("rows",list);
map.put("total",count);
return R.ok().data(map);
} catch (Exception e) {
e.printStackTrace();
return R.error(e.getMessage());
}
}
@PostMapping("/deleteById")
public R deleteById(TbYwXzqqMjxx tbYwXzqqMjxx){
try {
tbYwXzqqMjxxService.deleteById(tbYwXzqqMjxx.getXxzjbh());
return R.ok();
}catch (Exception e){
e.printStackTrace();
return R.error(e.getMessage());
}
}
}
src/main/java/org/springblade/founder/xzqq/controller/TbYwXzqqXxController.java
package org.springblade.founder.xzqq.controller;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
import org.springblade.founder.gnsyrzlog.LogOper;
import org.springblade.founder.utils.EasyUIPage;
import org.springblade.founder.utils.R;
import org.springblade.founder.xzqq.entity.TbYwDzqqFjVo;
import org.springblade.founder.xzqq.entity.TbYwDzqqXxVo;
import org.springblade.founder.xzqq.entity.TbYwXzqqMjxx;
import org.springblade.founder.xzqq.entity.TbYwXzqqXx;
import org.springblade.founder.xzqq.service.TbYwXzqqXxService;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;
import javax.annotation.Resource;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
/**
* 协作请求主表(TbYwXzqqXx)表控制层
......@@ -14,7 +25,7 @@ import javax.annotation.Resource;
* @since 2023-11-07 14:59:00
*/
@RestController
@RequestMapping("tbYwXzqqXx")
@RequestMapping("xzqqXx")
public class TbYwXzqqXxController {
/**
* 服务对象
......@@ -29,14 +40,75 @@ public class TbYwXzqqXxController {
* @return 单条数据
*/
@PostMapping("selectOne")
public TbYwXzqqXx selectOne(String id) {
return this.tbYwXzqqXxService.queryById(id);
}
public R selectOne(String id) {
return R.ok().data("rows",tbYwXzqqXxService.queryById(id));
}
@RequestMapping(value = "/imgInfo", method = {RequestMethod.POST, RequestMethod.GET})
@ApiOperation(value = "查询详情页附件信息", notes = "信息主键编号")
public R queryImgInfo(@ApiParam(name = "xxzjbh", value = "信息主键编号")
@RequestParam(required = true) String xxzjbh) {
List<TbYwDzqqFjVo> xxVo = tbYwXzqqXxService.queryImgInfo(xxzjbh);
if (xxVo == null) {
return R.error("该调证号无法查到调证信息");
}
return R.ok().data("detail", xxVo);
}
@PostMapping("/insertXzqqXx")
public R insertXzqqXx(TbYwXzqqXx tbYwXzqqXx) {
tbYwXzqqXxService.insert(tbYwXzqqXx);
public R insertXzqqXx(TbYwXzqqXx tbYwXzqqXx, @RequestParam(value = "sadjbfile",required = false) MultipartFile sadjbfile,
@RequestParam(value = "lajdsfile",required = false) MultipartFile lajdsfile,
@RequestParam(value = "xzhfile",required = false) MultipartFile xzhfile
) {
tbYwXzqqXxService.insert(tbYwXzqqXx,sadjbfile,lajdsfile,xzhfile);
return R.ok().data("xxzjbh","");
}
@PostMapping("/selectAll")
public R selectAll(TbYwXzqqXx tbYwXzqqXx){
try {
EasyUIPage easyUIPage = new EasyUIPage();
easyUIPage.setPage(tbYwXzqqXx.getPage());
easyUIPage.setPagePara(tbYwXzqqXx.getLimit());
int begin = easyUIPage.getBegin();
int end = easyUIPage.getEnd();
tbYwXzqqXx.setPage(begin);
tbYwXzqqXx.setLimit(end);
Map<String,Object> map = new HashMap<>();
List<TbYwXzqqXx> list = tbYwXzqqXxService.queryAll(tbYwXzqqXx);
int count = tbYwXzqqXxService.queryAllCount(tbYwXzqqXx);
map.put("rows",list);
map.put("total",count);
return R.ok().data(map);
} catch (Exception e) {
e.printStackTrace();
return R.error(e.getMessage());
}
}
@PostMapping("/shXzqqXx")
public R shXzqqXx(TbYwXzqqXx tbYwXzqqXx) {
tbYwXzqqXxService.shXzqqXx(tbYwXzqqXx);
return R.ok().data("xxzjbh","");
}
@PostMapping("/updateXzqqXx")
public R updateXzqqXx(TbYwXzqqXx tbYwXzqqXx, @RequestParam(value = "sadjbfile",required = false) MultipartFile sadjbfile,
@RequestParam(value = "lajdsfile",required = false) MultipartFile lajdsfile,
@RequestParam(value = "xzhfile",required = false) MultipartFile xzhfile
) {
tbYwXzqqXxService.updateXzqqXx(tbYwXzqqXx,sadjbfile,lajdsfile,xzhfile);
return R.ok().data("xxzjbh","");
}
@PostMapping("/deleteById")
public R deleteById(TbYwXzqqXx tbYwXzqqXx){
try {
tbYwXzqqXxService.deleteById(tbYwXzqqXx.getXxzjbh());
return R.ok();
}catch (Exception e){
e.printStackTrace();
return R.error(e.getMessage());
}
}
}
src/main/java/org/springblade/founder/xzqq/controller/TbYwXzqqXyrxxController.java
package org.springblade.founder.xzqq.controller;
import org.springblade.founder.utils.EasyUIPage;
import org.springblade.founder.utils.R;
import org.springblade.founder.xzqq.entity.TbYwXzqqXx;
import org.springblade.founder.xzqq.entity.TbYwXzqqXyrxx;
......@@ -7,6 +8,9 @@ import org.springblade.founder.xzqq.service.TbYwXzqqXyrxxService;
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
/**
* (TbYwXzqqXyrxx)表控制层
......@@ -15,7 +19,7 @@ import javax.annotation.Resource;
* @since 2023-11-07 15:05:02
*/
@RestController
@RequestMapping("tbYwXzqqXyrxx")
@RequestMapping("xyrxx")
public class TbYwXzqqXyrxxController {
/**
* 服务对象
......@@ -30,8 +34,9 @@ public class TbYwXzqqXyrxxController {
* @return 单条数据
*/
@PostMapping("selectOne")
public TbYwXzqqXyrxx selectOne(String id) {
return this.tbYwXzqqXyrxxService.queryById(id);
public R selectOne(String id) {
return R.ok().data("rows",tbYwXzqqXyrxxService.queryById(id));
}
......@@ -40,5 +45,40 @@ public class TbYwXzqqXyrxxController {
tbYwXzqqXyrxxService.insert(tbYwXzqqXx);
return R.ok().data("xxzjbh","");
}
@PostMapping("/updateXyrxx")
public R updateXyrxx(TbYwXzqqXyrxx tbYwXzqqXx) {
tbYwXzqqXyrxxService.update(tbYwXzqqXx);
return R.ok().data("xxzjbh","");
}
@PostMapping("/selectAll")
public R selectAll(TbYwXzqqXyrxx tbYwXzqqXyrxx){
try {
EasyUIPage easyUIPage = new EasyUIPage();
easyUIPage.setPage(tbYwXzqqXyrxx.getPage());
easyUIPage.setPagePara(tbYwXzqqXyrxx.getLimit());
int begin = easyUIPage.getBegin();
int end = easyUIPage.getEnd();
tbYwXzqqXyrxx.setPage(begin);
tbYwXzqqXyrxx.setLimit(end);
Map<String,Object> map = new HashMap<>();
List<TbYwXzqqXyrxx> list = tbYwXzqqXyrxxService.queryAll(tbYwXzqqXyrxx);
int count = tbYwXzqqXyrxxService.queryAllCount(tbYwXzqqXyrxx);
map.put("rows",list);
map.put("total",count);
return R.ok().data(map);
} catch (Exception e) {
e.printStackTrace();
return R.error(e.getMessage());
}
}
@PostMapping("/deleteById")
public R deleteById(TbYwXzqqXyrxx tbYwXzqqXyrxx){
try {
tbYwXzqqXyrxxService.deleteById(tbYwXzqqXyrxx.getXxzjbh());
return R.ok();
}catch (Exception e){
e.printStackTrace();
return R.error(e.getMessage());
}
}
}
src/main/java/org/springblade/founder/xzqq/controller/TbYwXzqqZhryxxController.java
package org.springblade.founder.xzqq.controller;
import org.springblade.founder.utils.EasyUIPage;
import org.springblade.founder.utils.R;
import org.springblade.founder.xzqq.entity.TbYwXzqqXx;
import org.springblade.founder.xzqq.entity.TbYwXzqqXyrxx;
import org.springblade.founder.xzqq.entity.TbYwXzqqZhryxx;
import org.springblade.founder.xzqq.service.TbYwXzqqZhryxxService;
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
/**
* (TbYwXzqqZhryxx)表控制层
......@@ -15,7 +20,7 @@ import javax.annotation.Resource;
* @since 2023-11-07 15:06:42
*/
@RestController
@RequestMapping("tbYwXzqqZhryxx")
@RequestMapping("zhryxx")
public class TbYwXzqqZhryxxController {
/**
* 服务对象
......@@ -30,13 +35,53 @@ public class TbYwXzqqZhryxxController {
* @return 单条数据
*/
@PostMapping("selectOne")
public TbYwXzqqZhryxx selectOne(String id) {
return this.tbYwXzqqZhryxxService.queryById(id);
}
public R selectOne(String id) {
return R.ok().data("rows",tbYwXzqqZhryxxService.queryById(id));
}
@PostMapping("/insertZhryxx")
public R insertZhryxx(TbYwXzqqZhryxx tbYwXzqqXx) {
tbYwXzqqZhryxxService.insert(tbYwXzqqXx);
return R.ok().data("xxzjbh","");
}
@PostMapping("/selectAll")
public R selectAll(TbYwXzqqZhryxx tbYwXzqqZhryxx){
try {
EasyUIPage easyUIPage = new EasyUIPage();
easyUIPage.setPage(tbYwXzqqZhryxx.getPage());
easyUIPage.setPagePara(tbYwXzqqZhryxx.getLimit());
int begin = easyUIPage.getBegin();
int end = easyUIPage.getEnd();
tbYwXzqqZhryxx.setPage(begin);
tbYwXzqqZhryxx.setLimit(end);
Map<String,Object> map = new HashMap<>();
List<TbYwXzqqZhryxx> list = tbYwXzqqZhryxxService.queryAll(tbYwXzqqZhryxx);
int count = tbYwXzqqZhryxxService.queryAllCount(tbYwXzqqZhryxx);
map.put("rows",list);
map.put("total",count);
return R.ok().data(map);
} catch (Exception e) {
e.printStackTrace();
return R.error(e.getMessage());
}
}
@PostMapping("/updateZhryxx")
public R updateZhryxx(TbYwXzqqZhryxx tbYwXzqqXx) {
tbYwXzqqZhryxxService.update(tbYwXzqqXx);
return R.ok().data("xxzjbh","");
}
@PostMapping("/deleteById")
public R deleteById(TbYwXzqqZhryxx tbYwXzqqXx){
try {
tbYwXzqqZhryxxService.deleteById(tbYwXzqqXx.getXxzjbh());
return R.ok();
}catch (Exception e){
e.printStackTrace();
return R.error(e.getMessage());
}
}
}
src/main/java/org/springblade/founder/xzqq/entity/TbYwDzqqFj.java
......@@ -41,7 +41,7 @@ public class TbYwDzqqFj {
* 电子文件内容*
*/
private byte[] dzwjnr;
//附件类型，1-受案登记表，2-立案决定书，3-协作函，4-来源证明材料，5-询问笔录，6-强制措施文书，
private String fjlx;
/**
* 创建时间*
......
src/main/java/org/springblade/founder/xzqq/entity/TbYwDzqqFjVo.java 0 → 100644
package org.springblade.founder.xzqq.entity;
import lombok.Data;
/**
* 调证请求附件信息视图对象*
*
* @author zzj*
*/
@Data
public class TbYwDzqqFjVo extends TbYwDzqqFj {
/**
* 立案决定书在法律文书表的信息主键编号*
*/
private String flwsXxzjbh;
/**
* 附件类型翻译*
*/
private String fjlxText;
/**
* 电子文件内容base64预览对象*
*/
private String dzwjnrBase64;
}
src/main/java/org/springblade/founder/xzqq/entity/TbYwDzqqXxVo.java 0 → 100644
package org.springblade.founder.xzqq.entity;
import lombok.Data;
import org.springframework.web.multipart.MultipartFile;
import java.util.List;
@Data
public class TbYwDzqqXxVo extends TbYwXzqqXx{
/**
* 立案决定书集合*
*/
private List<TbYwDzqqFjVo> lajdsList;
/**
* 立案决定书文件集合*
*/
private List<MultipartFile> lajdsFileList;
}
src/main/java/org/springblade/founder/xzqq/entity/TbYwXzqqMjxx.java
......@@ -34,7 +34,8 @@ public class TbYwXzqqMjxx implements Serializable {
private String policemanid;
private String zmjgzp;
private String lxdh;
private String xm;
/**
* 反面警官照片
*/
......@@ -43,17 +44,20 @@ public class TbYwXzqqMjxx implements Serializable {
/**
* 登记时间
*/
private Object djsj;
private Date djsj;
/**
* 更新时间
*/
private Object gxsj;
private Date gxsj;
/**
* 登记单位代码
*/
private String lrdwdm;
//分页查询开始位置
private Integer page;
//分页查询结束位置
private Integer limit;
}
src/main/java/org/springblade/founder/xzqq/entity/TbYwXzqqXx.java
......@@ -3,22 +3,26 @@ package org.springblade.founder.xzqq.entity;
import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data;
import org.springblade.modules.system.entity.XzxtUser;
import java.io.Serializable;
import java.util.Date;
import java.util.List;
@Data
public class TbYwXzqqXx implements Serializable {
private static final long serialVersionUID = 323302592009039237L;
//分页查询开始位置
private Integer page;
//分页查询结束位置
private Integer limit;
/**
* 信息主键编号
*/
private String xxzjbh;
private String xzmc;
private String gjzss;
/**
* 协作编号
*/
......@@ -48,7 +52,7 @@ public class TbYwXzqqXx implements Serializable {
* 案件类别代码
*/
private String ajlbdm;
private String ajlbmc;
/**
* 简要案情
*/
......@@ -75,10 +79,12 @@ public class TbYwXzqqXx implements Serializable {
private Date spsj;
/**
* 协作状态
* 协作状态 1-待审核，2-协作中，3-完成 ，4-审核不通过
*/
private String xzzt;
private String xzztStr;
private String removezpStr;
/**
* 信息删除判断标志
*/
......@@ -139,5 +145,34 @@ public class TbYwXzqqXx implements Serializable {
*/
private Date gxsj;
private List<TbYwXzqqXyrxx> xyrs;
private List<TbYwXzqqMjxx> mjxxs;
private String idcardparam;
// 更新人员
public void setUpUser(XzxtUser user){
this.xxczryXm=user.getRealname();
this.xxczdwGajgjgdm=user.getUnitcode();
this.xxczdwGajgmc=user.getUnitname();
this.xxczryGmsfhm=user.getIdentitycard();
this.gxsj = new Date();
}
public void setDjUser(XzxtUser user){
this.xxdjryXm=user.getRealname();
this.xxdjdwGajgjgdm=user.getUnitcode();
this.xxdjdwGajgmc=user.getUnitname();
this.xxdjryGmsfhm=user.getIdentitycard();
this.xxdjryLxdh=user.getPhone();
this.xxscPdbz="0";
this.xxczryXm=user.getRealname();
this.xxczdwGajgjgdm=user.getUnitcode();
this.xxczdwGajgmc=user.getUnitname();
this.xxczryGmsfhm=user.getIdentitycard();
this.gxsj = new Date();
this.djsj = new Date();
}
}
src/main/java/org/springblade/founder/xzqq/entity/TbYwXzqqXyrxx.java
......@@ -3,11 +3,12 @@ package org.springblade.founder.xzqq.entity;
import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data;
import org.springblade.modules.system.entity.XzxtUser;
import org.springframework.web.multipart.MultipartFile;
import java.io.Serializable;
import java.util.Date;
import java.util.List;
@Data
......@@ -18,7 +19,7 @@ public class TbYwXzqqXyrxx implements Serializable {
* 信息主键编号
*/
private String xxzjbh;
private String removezpStr;
/**
* 关联信息主键编号
*/
......@@ -28,7 +29,10 @@ public class TbYwXzqqXyrxx implements Serializable {
* 人员类型
*/
private String rylx;
/**
* 电子文件内容base64预览对象*
*/
private String dzwjnrBase64;
/**
* 网安协助
*/
......@@ -38,7 +42,7 @@ public class TbYwXzqqXyrxx implements Serializable {
* 任务编号
*/
private String rwbh;
private List<TbYwDzqqFjVo> wj;
/**
* 信息删除判断标志
*/
......@@ -108,7 +112,7 @@ public class TbYwXzqqXyrxx implements Serializable {
* 信息登记人员_联系电话
*/
private String xxdjryLxdh;
private MultipartFile lyzmcl;
/**
* 登记时间
*/
......@@ -133,11 +137,45 @@ public class TbYwXzqqXyrxx implements Serializable {
* 信息操作人员_公民身份号码/符合GB 11643《公民身份号码》
*/
private String xxczryGmsfhm;
private String wzxxmq;
private String xnsfmq;
private String dwgsmq;
private String qtmq;
/**
* 更新时间
*/
private Date gxsj;
//分页查询开始位置
private Integer page;
//分页查询结束位置
private Integer limit;
// 更新人员
public void setUpUser(XzxtUser user){
this.xxczryXm=user.getRealname();
this.xxczdwGajgjgdm=user.getUnitcode();
this.xxczdwGajgmc=user.getUnitname();
this.xxczryGmsfhm=user.getIdentitycard();
this.gxsj = new Date();
}
public void setDjUser(XzxtUser user){
this.xxdjryXm=user.getRealname();
this.xxdjdwGajgjgdm=user.getUnitcode();
this.xxdjdwGajgmc=user.getUnitname();
this.xxscPdbz="0";
this.xxdjryGmsfhm=user.getIdentitycard();
this.xxdjryLxdh=user.getPhone();
this.xxczryXm=user.getRealname();
this.xxczdwGajgjgdm=user.getUnitcode();
this.xxczdwGajgmc=user.getUnitname();
this.xxczryGmsfhm=user.getIdentitycard();
this.gxsj = new Date();
this.djsj = new Date();
}
}
src/main/java/org/springblade/founder/xzqq/entity/TbYwXzqqZhryxx.java
......@@ -3,11 +3,13 @@ package org.springblade.founder.xzqq.entity;
import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data;
import org.springblade.modules.system.entity.XzxtUser;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.multipart.MultipartFile;
import java.io.Serializable;
import java.util.Date;
import java.util.List;
@Data
......@@ -18,7 +20,7 @@ public class TbYwXzqqZhryxx implements Serializable {
* 信息主键编号
*/
private String xxzjbh;
private List<TbYwDzqqFjVo> wj;
/**
* 关联信息主键编号
*/
......@@ -119,10 +121,42 @@ public class TbYwXzqqZhryxx implements Serializable {
*/
private String xxczryGmsfhm;
private MultipartFile xwbl;
private MultipartFile qzcsws;
/**
* 更新时间
*/
private Date gxsj;
private String removezpStr;
//分页查询开始位置
private Integer page;
//分页查询结束位置
private Integer limit;
// 更新人员
public void setUpUser(XzxtUser user){
this.xxczryXm=user.getRealname();
this.xxczdwGajgjgdm=user.getUnitcode();
this.xxczdwGajgmc=user.getUnitname();
this.xxczryGmsfhm=user.getIdentitycard();
this.gxsj = new Date();
}
public void setDjUser(XzxtUser user){
this.xxdjryXm=user.getRealname();
this.xxdjdwGajgjgdm=user.getUnitcode();
this.xxdjdwGajgmc=user.getUnitname();
this.xxdjryGmsfhm=user.getIdentitycard();
this.xxdjryLxdh=user.getPhone();
this.xxscPdbz="0";
this.xxczryXm=user.getRealname();
this.xxczdwGajgjgdm=user.getUnitcode();
this.xxczdwGajgmc=user.getUnitname();
this.xxczryGmsfhm=user.getIdentitycard();
this.gxsj = new Date();
this.djsj = new Date();
}
}
src/main/java/org/springblade/founder/xzqq/mapper/TbYwXzqqMjxxMapper.xml
......@@ -7,8 +7,8 @@
<!--查询单个-->
<select id="queryById" resultType="org.springblade.founder.xzqq.entity.TbYwXzqqMjxx">
select
glxxzjbh, identitycard, policemanid, zmjgzp, fmjgzp, djsj, gxsj, lrdwdm
from xzxt.tb_yw_xzqq_mjxx
xxzjbh, glxxzjbh, identitycard, policemanid, zmjgzp, fmjgzp, djsj, gxsj, lrdwdm
from tb_yw_xzqq_mjxx
where xxzjbh = #{xxzjbh}
</select>
......@@ -24,10 +24,11 @@
<!--通过实体作为筛选条件查询-->
<select id="queryAll" resultType="org.springblade.founder.xzqq.entity.TbYwXzqqMjxx">
select
glxxzjbh, identitycard, policemanid, zmjgzp, fmjgzp, djsj, gxsj, lrdwdm
xxzjbh, glxxzjbh, identitycard, policemanid, zmjgzp, fmjgzp, djsj, gxsj, lrdwdm, lxdh, xm
from xzxt.tb_yw_xzqq_mjxx
from tb_yw_xzqq_mjxx
<where>
and xxsc_pdbz = '0'
<if test="xxzjbh != null and xxzjbh != ''">
and xxzjbh = #{xxzjbh}
</if>
......@@ -56,12 +57,48 @@
and lrdwdm = #{lrdwdm}
</if>
</where>
order by djsj desc limit #{page},#{limit}
</select>
<select id="queryAllCount" resultType="java.lang.Integer">
select
count(1)
from xzxt.tb_yw_xzqq_mjxx
<where>
and xxsc_pdbz = '0'
<if test="xxzjbh != null and xxzjbh != ''">
and xxzjbh = #{xxzjbh}
</if>
<if test="glxxzjbh != null and glxxzjbh != ''">
and glxxzjbh = #{glxxzjbh}
</if>
<if test="identitycard != null and identitycard != ''">
and identitycard = #{identitycard}
</if>
<if test="policemanid != null and policemanid != ''">
and policemanid = #{policemanid}
</if>
<if test="zmjgzp != null and zmjgzp != ''">
and zmjgzp = #{zmjgzp}
</if>
<if test="fmjgzp != null and fmjgzp != ''">
and fmjgzp = #{fmjgzp}
</if>
<if test="djsj != null">
and djsj = #{djsj}
</if>
<if test="gxsj != null">
and gxsj = #{gxsj}
</if>
<if test="lrdwdm != null and lrdwdm != ''">
and lrdwdm = #{lrdwdm}
</if>
</where>
</select>
<!--新增所有列-->
<insert id="insert" >
insert into tb_yw_xzqq_mjxx(xxzjbh,glxxzjbh, identitycard, policemanid, zmjgzp, fmjgzp, djsj, gxsj, lrdwdm)
values (#{xxzjbh},#{glxxzjbh}, #{identitycard}, #{policemanid}, #{zmjgzp}, #{fmjgzp}, #{djsj}, #{gxsj}, #{lrdwdm})
insert into tb_yw_xzqq_mjxx(xxzjbh,glxxzjbh, identitycard, policemanid, zmjgzp, fmjgzp, djsj, gxsj, lrdwdm, lxdh, xm)
values (#{xxzjbh},#{glxxzjbh}, #{identitycard}, #{policemanid}, #{zmjgzp}, #{fmjgzp}, #{djsj}, #{gxsj}, #{lrdwdm}, #{lxdh}, #{xm})
</insert>
<insert id="insertBatch" keyProperty="xxzjbh" useGeneratedKeys="true">
......@@ -83,7 +120,7 @@
<!--通过主键修改数据-->
<update id="update">
update xzxt.tb_yw_xzqq_mjxx
update tb_yw_xzqq_mjxx
<set>
<if test="glxxzjbh != null and glxxzjbh != ''">
glxxzjbh = #{glxxzjbh},
......@@ -109,14 +146,25 @@
<if test="lrdwdm != null and lrdwdm != ''">
lrdwdm = #{lrdwdm},
</if>
<if test="lxdh != null and lxdh != ''">
lxdh = #{lxdh},
</if>
<if test="xm != null and xm != ''">
xm = #{xm},
</if>
</set>
where xxzjbh = #{xxzjbh}
</update>
<!--通过主键删除-->
<delete id="deleteById">
delete from xzxt.tb_yw_xzqq_mjxx where xxzjbh = #{xxzjbh}
</delete>
<update id="deleteById">
UPDATE tb_yw_xzqq_mjxx SET
xxsc_pdbz = '1',
gxsj = now()
WHERE xxzjbh = #{xxzjbh,jdbcType=VARCHAR}
</update>
</mapper>
src/main/java/org/springblade/founder/xzqq/mapper/TbYwXzqqXxMapper.java
package org.springblade.founder.xzqq.mapper;
import org.springblade.founder.xzqq.entity.TbYwDzqqFj;
import org.springblade.founder.xzqq.entity.TbYwDzqqFjVo;
import org.springblade.founder.xzqq.entity.TbYwXzqqXx;
import org.apache.ibatis.annotations.Param;
import java.util.List;
......@@ -24,6 +25,7 @@ public interface TbYwXzqqXxMapper {
* @return 实例对象
*/
TbYwXzqqXx queryById(String xxzjbh);
List<TbYwDzqqFjVo> selectFjInfo(@Param("fjlx") String fjlx, @Param("dzXxzjbh") String dzXxzjbh);
/**
* 查询指定行数据
......@@ -79,13 +81,15 @@ public interface TbYwXzqqXxMapper {
*/
int update(TbYwXzqqXx tbYwXzqqXx);
void updateDzqqFjXxscPdbz(@Param("dzXxzjbh") String dzXxzjbh, @Param("fjlx") String fjlx, @Param("xxzjbh") String xxzjbh);
/**
* 通过主键删除数据
*
* @param xxzjbh 主键
* @return 影响行数
*/
int deleteById(String xxzjbh);
int deleteById(TbYwXzqqXx tbYwXzqqXx);
}
src/main/java/org/springblade/founder/xzqq/mapper/TbYwXzqqXxMapper.xml
......@@ -6,11 +6,32 @@
<!--查询单个-->
<select id="queryById" resultType="org.springblade.founder.xzqq.entity.TbYwXzqqXx">
select
xzbh, badwmc, badwdm, asjbh, ajmc, ajlbdm, jayq, sqsj, spr_sfzh, spyj, spsj, xzzt, xxsc_pdbz, xxdjdw_gajgjgdm, xxdjdw_gajgmc, xxdjry_xm, xxdjry_gmsfhm, xxdjry_lxdh, djsj, xxczdw_gajgjgdm, xxczdw_gajgmc, xxczry_xm, xxczry_gmsfhm, gxsj
from xzxt.tb_yw_xzqq_xx
xxzjbh, xzbh, badwmc, badwdm, asjbh, ajmc, ajlbdm,
(select name from sys_dictitem where groupid = 'CODE_AJLB' and code = ajlbdm)
as ajlbmc,
jayq, sqsj, spr_sfzh, spyj, spsj, xzzt,xzmc, xxsc_pdbz, xxdjdw_gajgjgdm, xxdjdw_gajgmc, xxdjry_xm, xxdjry_gmsfhm, xxdjry_lxdh, djsj, xxczdw_gajgjgdm, xxczdw_gajgmc, xxczry_xm, xxczry_gmsfhm, gxsj
from tb_yw_xzqq_xx
where xxzjbh = #{xxzjbh}
</select>
<select id="selectFjInfo" resultType="org.springblade.founder.xzqq.entity.TbYwDzqqFjVo">
select xxzjbh xxzjbh,
dz_xxzjbh dzXxzjbh,
dzwjbt dzwjbt,
dzwjgs dzwjgs,
dzwjwz dzwjwz,
dzwjnr dzwjnr,
fjlx fjlx
from tb_yw_xzqq_fj
where xxsc_pdbz = '0'
<if test="fjlx != null and fjlx != ''">
and fjlx = #{fjlx, jdbcType=VARCHAR}
</if>
and dz_xxzjbh = #{dzXxzjbh, jdbcType=VARCHAR}
order by fjlx asc
</select>
<!--查询指定行数据-->
<select id="queryAllByLimit" resultType="org.springblade.founder.xzqq.entity.TbYwXzqqXx">
select
......@@ -23,13 +44,30 @@
<!--通过实体作为筛选条件查询-->
<select id="queryAll" resultType="org.springblade.founder.xzqq.entity.TbYwXzqqXx">
select
xzbh, badwmc, badwdm, asjbh, ajmc, ajlbdm, jayq, sqsj, spr_sfzh, spyj, spsj, xzzt, xxsc_pdbz, xxdjdw_gajgjgdm, xxdjdw_gajgmc, xxdjry_xm, xxdjry_gmsfhm, xxdjry_lxdh, djsj, xxczdw_gajgjgdm, xxczdw_gajgmc, xxczry_xm, xxczry_gmsfhm, gxsj
from xzxt.tb_yw_xzqq_xx
xxzjbh, xzbh, badwmc, badwdm, asjbh, ajmc, ajlbdm,
(select name from sys_dictitem where groupid = 'CODE_AJLB' and code = ajlbdm)
as ajlbmc,
jayq, sqsj, spr_sfzh, spyj, spsj, xzzt,xzmc, xxsc_pdbz, xxdjdw_gajgjgdm, xxdjdw_gajgmc, xxdjry_xm, xxdjry_gmsfhm, xxdjry_lxdh, djsj, xxczdw_gajgjgdm, xxczdw_gajgmc, xxczry_xm, xxczry_gmsfhm, gxsj
,(case when xzzt = '1' then '待审核' when xzzt = '2' then '协作中' when xzzt = '4' then '审核不通过' else '已完成' end) as xzztStr
from tb_yw_xzqq_xx xx
<where>
and xxsc_pdbz = '0'
<if test="xxzjbh != null and xxzjbh != ''">
and xxzjbh = #{xxzjbh}
</if>
<if test="gjzss != null and gjzss != ''">
and ( xzmc like concat(concat('%', #{gjzss}),'%')
or asjbh like concat(concat('%', #{gjzss}),'%')
or ajmc like concat(concat('%', #{gjzss}),'%')
)
</if>
<if test="idcardparam != null and idcardparam != ''">
and (xxdjry_gmsfhm = #{idcardparam} or
#{idcardparam} in (select mjxx.identitycard from tb_yw_xzqq_mjxx mjxx where mjxx.glxxzjbh=xx.xxzjbh)
)
</if>
<if test="xzbh != null and xzbh != ''">
and xzbh = #{xzbh}
</if>
......@@ -103,12 +141,110 @@
and gxsj = #{gxsj}
</if>
</where>
order by djsj desc limit #{page},#{limit}
</select>
<select id="queryAllCount" resultType="java.lang.Integer">
select
count(1)
from tb_yw_xzqq_xx xx
<where>
and xxsc_pdbz = '0'
<if test="xxzjbh != null and xxzjbh != ''">
and xxzjbh = #{xxzjbh}
</if>
<if test="gjzss != null and gjzss != ''">
and ( xzmc like concat(concat('%', #{gjzss}),'%')
or asjbh like concat(concat('%', #{gjzss}),'%')
or ajmc like concat(concat('%', #{gjzss}),'%')
)
</if>
<if test="idcardparam != null and idcardparam != ''">
and (xxdjry_gmsfhm = #{idcardparam} or
#{idcardparam} in (select mjxx.identitycard from tb_yw_xzqq_mjxx mjxx where mjxx.glxxzjbh=xx.xxzjbh)
)
</if>
<if test="xzbh != null and xzbh != ''">
and xzbh = #{xzbh}
</if>
<if test="badwmc != null and badwmc != ''">
and badwmc = #{badwmc}
</if>
<if test="badwdm != null and badwdm != ''">
and badwdm = #{badwdm}
</if>
<if test="asjbh != null and asjbh != ''">
and asjbh = #{asjbh}
</if>
<if test="ajmc != null and ajmc != ''">
and ajmc = #{ajmc}
</if>
<if test="ajlbdm != null and ajlbdm != ''">
and ajlbdm = #{ajlbdm}
</if>
<if test="jayq != null and jayq != ''">
and jayq = #{jayq}
</if>
<if test="sqsj != null">
and sqsj = #{sqsj}
</if>
<if test="sprSfzh != null and sprSfzh != ''">
and spr_sfzh = #{sprSfzh}
</if>
<if test="spyj != null and spyj != ''">
and spyj = #{spyj}
</if>
<if test="spsj != null">
and spsj = #{spsj}
</if>
<if test="xzzt != null and xzzt != ''">
and xzzt = #{xzzt}
</if>
<if test="xxscPdbz != null and xxscPdbz != ''">
and xxsc_pdbz = #{xxscPdbz}
</if>
<if test="xxdjdwGajgjgdm != null and xxdjdwGajgjgdm != ''">
and xxdjdw_gajgjgdm = #{xxdjdwGajgjgdm}
</if>
<if test="xxdjdwGajgmc != null and xxdjdwGajgmc != ''">
and xxdjdw_gajgmc = #{xxdjdwGajgmc}
</if>
<if test="xxdjryXm != null and xxdjryXm != ''">
and xxdjry_xm = #{xxdjryXm}
</if>
<if test="xxdjryGmsfhm != null and xxdjryGmsfhm != ''">
and xxdjry_gmsfhm = #{xxdjryGmsfhm}
</if>
<if test="xxdjryLxdh != null and xxdjryLxdh != ''">
and xxdjry_lxdh = #{xxdjryLxdh}
</if>
<if test="djsj != null">
and djsj = #{djsj}
</if>
<if test="xxczdwGajgjgdm != null and xxczdwGajgjgdm != ''">
and xxczdw_gajgjgdm = #{xxczdwGajgjgdm}
</if>
<if test="xxczdwGajgmc != null and xxczdwGajgmc != ''">
and xxczdw_gajgmc = #{xxczdwGajgmc}
</if>
<if test="xxczryXm != null and xxczryXm != ''">
and xxczry_xm = #{xxczryXm}
</if>
<if test="xxczryGmsfhm != null and xxczryGmsfhm != ''">
and xxczry_gmsfhm = #{xxczryGmsfhm}
</if>
<if test="gxsj != null">
and gxsj = #{gxsj}
</if>
</where>
</select>
<!--新增所有列-->
<insert id="insert">
insert into tb_yw_xzqq_xx(xxzjbh,xzbh, badwmc, badwdm, asjbh, ajmc, ajlbdm, jayq, sqsj, spr_sfzh, spyj, spsj, xzzt, xxsc_pdbz, xxdjdw_gajgjgdm, xxdjdw_gajgmc, xxdjry_xm, xxdjry_gmsfhm, xxdjry_lxdh, djsj, xxczdw_gajgjgdm, xxczdw_gajgmc, xxczry_xm, xxczry_gmsfhm, gxsj)
values (#{xxzjbh},#{xzbh}, #{badwmc}, #{badwdm}, #{asjbh}, #{ajmc}, #{ajlbdm}, #{jayq}, #{sqsj}, #{sprSfzh}, #{spyj}, #{spsj}, #{xzzt}, #{xxscPdbz}, #{xxdjdwGajgjgdm}, #{xxdjdwGajgmc}, #{xxdjryXm}, #{xxdjryGmsfhm}, #{xxdjryLxdh}, #{djsj}, #{xxczdwGajgjgdm}, #{xxczdwGajgmc}, #{xxczryXm}, #{xxczryGmsfhm}, #{gxsj})
insert into tb_yw_xzqq_xx(xxzjbh,xzbh,xzmc, badwmc, badwdm, asjbh, ajmc, ajlbdm, jayq, sqsj, spr_sfzh, spyj, spsj, xzzt, xxsc_pdbz, xxdjdw_gajgjgdm, xxdjdw_gajgmc, xxdjry_xm, xxdjry_gmsfhm, xxdjry_lxdh, djsj, xxczdw_gajgjgdm, xxczdw_gajgmc, xxczry_xm, xxczry_gmsfhm, gxsj)
values (#{xxzjbh},#{xzbh},#{xzmc}, #{badwmc}, #{badwdm}, #{asjbh}, #{ajmc}, #{ajlbdm}, #{jayq}, #{sqsj}, #{sprSfzh}, #{spyj}, #{spsj}, #{xzzt}, #{xxscPdbz}, #{xxdjdwGajgjgdm}, #{xxdjdwGajgmc}, #{xxdjryXm}, #{xxdjryGmsfhm}, #{xxdjryLxdh}, #{djsj}, #{xxczdwGajgjgdm}, #{xxczdwGajgmc}, #{xxczryXm}, #{xxczryGmsfhm}, #{gxsj})
</insert>
<select id="queryFjById" resultType="org.springblade.founder.xzqq.entity.TbYwDzqqFj">
select
......@@ -140,11 +276,15 @@
<!--通过主键修改数据-->
<update id="update">
update xzxt.tb_yw_xzqq_xx
update tb_yw_xzqq_xx
<set>
<if test="xzbh != null and xzbh != ''">
xzbh = #{xzbh},
</if>
<if test="xzmc != null and xzmc != ''">
xzmc = #{xzmc},
</if>
<if test="badwmc != null and badwmc != ''">
badwmc = #{badwmc},
</if>
......@@ -217,11 +357,37 @@
</set>
where xxzjbh = #{xxzjbh}
</update>
<update id="updateDzqqFjXxscPdbz">
update tb_yw_xzqq_fj
set xxsc_pdbz = '1'
<where>
<if test="dzXxzjbh != null and dzXxzjbh != ''">
and dz_xxzjbh = #{dzXxzjbh}
</if>
<if test="xxzjbh != null and xxzjbh != ''">
and xxzjbh = #{xxzjbh}
</if>
<if test="fjlx != null and fjlx != ''">
and fjlx = #{fjlx}
</if>
</where>
</update>
<!--通过主键删除-->
<delete id="deleteById">
delete from xzxt.tb_yw_xzqq_xx where xxzjbh = #{xxzjbh}
</delete>
<update id="deleteById" parameterType="org.springblade.founder.xzqq.entity.TbYwXzqqXx">
UPDATE tb_yw_xzqq_xx SET
<if test="xxczdwGajgjgdm != null and xxczdwGajgjgdm != ''">xxczdw_gajgjgdm =
#{ xxczdwGajgjgdm , jdbcType=VARCHAR },
</if>
<if test="xxczdwGajgmc != null and xxczdwGajgmc != ''">xxczdw_gajgmc = #{ xxczdwGajgmc , jdbcType=VARCHAR },
</if>
<if test="xxczryGmsfhm != null and xxczryGmsfhm != ''">xxczry_gmsfhm = #{ xxczryGmsfhm , jdbcType=VARCHAR },
</if>
<if test="xxczryXm != null and xxczryXm != ''">xxczry_xm = #{ xxczryXm , jdbcType=VARCHAR },</if>
xxsc_pdbz = '1',
gxsj = now()
WHERE xxzjbh = #{xxzjbh,jdbcType=VARCHAR}
</update>
</mapper>
src/main/java/org/springblade/founder/xzqq/mapper/TbYwXzqqXyrxxMapper.java
......@@ -82,7 +82,7 @@ public interface TbYwXzqqXyrxxMapper {
* @param xxzjbh 主键
* @return 影响行数
*/
int deleteById(String xxzjbh);
int deleteById(TbYwXzqqXyrxx tbYwXzqqXyrxx);
}
src/main/java/org/springblade/founder/xzqq/mapper/TbYwXzqqXyrxxMapper.xml
......@@ -7,7 +7,7 @@
<!--查询单个-->
<select id="queryById" resultType="org.springblade.founder.xzqq.entity.TbYwXzqqXyrxx">
select
glxxzjbh, rylx, waxz, rwbh, xxsc_pdbz, xyrxm, xyrsfzh, xyrxb, xyrhjd, xyrsxzm, xyrszwz, xyrjqhdgj, xyrxzd, xxdjdw_gajgjgdm, xxdjdw_gajgmc, xxdjry_xm, xxdjry_gmsfhm, xxdjry_lxdh, djsj, xxczdw_gajgjgdm, xxczdw_gajgmc, xxczry_xm, xxczry_gmsfhm, gxsj
xxzjbh, glxxzjbh, rylx, waxz, rwbh, xxsc_pdbz, xyrxm, xyrsfzh, xyrxb, xyrhjd, xyrsxzm, xyrszwz, xyrjqhdgj, xyrxzd, xxdjdw_gajgjgdm, xxdjdw_gajgmc, xxdjry_xm, xxdjry_gmsfhm, xxdjry_lxdh, djsj, xxczdw_gajgjgdm, xxczdw_gajgmc, xxczry_xm, xxczry_gmsfhm, gxsj
from xzxt.tb_yw_xzqq_xyrxx
where xxzjbh = #{xxzjbh}
</select>
......@@ -24,10 +24,14 @@
<!--通过实体作为筛选条件查询-->
<select id="queryAll" resultType="org.springblade.founder.xzqq.entity.TbYwXzqqXyrxx">
select
glxxzjbh, rylx, waxz, rwbh, xxsc_pdbz, xyrxm, xyrsfzh, xyrxb, xyrhjd, xyrsxzm, xyrszwz, xyrjqhdgj, xyrxzd, xxdjdw_gajgjgdm, xxdjdw_gajgmc, xxdjry_xm, xxdjry_gmsfhm, xxdjry_lxdh, djsj, xxczdw_gajgjgdm, xxczdw_gajgmc, xxczry_xm, xxczry_gmsfhm, gxsj
xxzjbh,glxxzjbh, rylx, waxz, rwbh, xxsc_pdbz, xyrxm, xyrsfzh, xyrxb, xyrhjd, xyrsxzm, xyrszwz,
xyrjqhdgj, xyrxzd, xxdjdw_gajgjgdm, xxdjdw_gajgmc, xxdjry_xm, xxdjry_gmsfhm, xxdjry_lxdh,
djsj, xxczdw_gajgjgdm, xxczdw_gajgmc, xxczry_xm, xxczry_gmsfhm, gxsj,
wzxxmq,xnsfmq,dwgsmq,qtmq
from xzxt.tb_yw_xzqq_xyrxx
from tb_yw_xzqq_xyrxx
<where>
and xxsc_pdbz = '0'
<if test="xxzjbh != null and xxzjbh != ''">
and xxzjbh = #{xxzjbh}
</if>
......@@ -104,12 +108,98 @@
and gxsj = #{gxsj}
</if>
</where>
order by djsj desc limit #{page},#{limit}
</select>
<select id="queryAllCount" resultType="java.lang.Integer">
select
count(1)
from tb_yw_xzqq_xyrxx
<where>
and xxsc_pdbz = '0'
<if test="xxzjbh != null and xxzjbh != ''">
and xxzjbh = #{xxzjbh}
</if>
<if test="glxxzjbh != null and glxxzjbh != ''">
and glxxzjbh = #{glxxzjbh}
</if>
<if test="rylx != null and rylx != ''">
and rylx = #{rylx}
</if>
<if test="waxz != null and waxz != ''">
and waxz = #{waxz}
</if>
<if test="rwbh != null and rwbh != ''">
and rwbh = #{rwbh}
</if>
<if test="xxscPdbz != null and xxscPdbz != ''">
and xxsc_pdbz = #{xxscPdbz}
</if>
<if test="xyrxm != null and xyrxm != ''">
and xyrxm = #{xyrxm}
</if>
<if test="xyrsfzh != null and xyrsfzh != ''">
and xyrsfzh = #{xyrsfzh}
</if>
<if test="xyrxb != null and xyrxb != ''">
and xyrxb = #{xyrxb}
</if>
<if test="xyrhjd != null and xyrhjd != ''">
and xyrhjd = #{xyrhjd}
</if>
<if test="xyrsxzm != null and xyrsxzm != ''">
and xyrsxzm = #{xyrsxzm}
</if>
<if test="xyrszwz != null and xyrszwz != ''">
and xyrszwz = #{xyrszwz}
</if>
<if test="xyrjqhdgj != null and xyrjqhdgj != ''">
and xyrjqhdgj = #{xyrjqhdgj}
</if>
<if test="xyrxzd != null and xyrxzd != ''">
and xyrxzd = #{xyrxzd}
</if>
<if test="xxdjdwGajgjgdm != null and xxdjdwGajgjgdm != ''">
and xxdjdw_gajgjgdm = #{xxdjdwGajgjgdm}
</if>
<if test="xxdjdwGajgmc != null and xxdjdwGajgmc != ''">
and xxdjdw_gajgmc = #{xxdjdwGajgmc}
</if>
<if test="xxdjryXm != null and xxdjryXm != ''">
and xxdjry_xm = #{xxdjryXm}
</if>
<if test="xxdjryGmsfhm != null and xxdjryGmsfhm != ''">
and xxdjry_gmsfhm = #{xxdjryGmsfhm}
</if>
<if test="xxdjryLxdh != null and xxdjryLxdh != ''">
and xxdjry_lxdh = #{xxdjryLxdh}
</if>
<if test="djsj != null">
and djsj = #{djsj}
</if>
<if test="xxczdwGajgjgdm != null and xxczdwGajgjgdm != ''">
and xxczdw_gajgjgdm = #{xxczdwGajgjgdm}
</if>
<if test="xxczdwGajgmc != null and xxczdwGajgmc != ''">
and xxczdw_gajgmc = #{xxczdwGajgmc}
</if>
<if test="xxczryXm != null and xxczryXm != ''">
and xxczry_xm = #{xxczryXm}
</if>
<if test="xxczryGmsfhm != null and xxczryGmsfhm != ''">
and xxczry_gmsfhm = #{xxczryGmsfhm}
</if>
<if test="gxsj != null">
and gxsj = #{gxsj}
</if>
</where>
</select>
<!--新增所有列-->
<insert id="insert" >
insert into tb_yw_xzqq_xyrxx(xxzjbh,glxxzjbh, rylx, waxz, rwbh, xxsc_pdbz, xyrxm, xyrsfzh, xyrxb, xyrhjd, xyrsxzm, xyrszwz, xyrjqhdgj, xyrxzd, xxdjdw_gajgjgdm, xxdjdw_gajgmc, xxdjry_xm, xxdjry_gmsfhm, xxdjry_lxdh, djsj, xxczdw_gajgjgdm, xxczdw_gajgmc, xxczry_xm, xxczry_gmsfhm, gxsj)
values (#{xxzjbh},#{glxxzjbh}, #{rylx}, #{waxz}, #{rwbh}, #{xxscPdbz}, #{xyrxm}, #{xyrsfzh}, #{xyrxb}, #{xyrhjd}, #{xyrsxzm}, #{xyrszwz}, #{xyrjqhdgj}, #{xyrxzd}, #{xxdjdwGajgjgdm}, #{xxdjdwGajgmc}, #{xxdjryXm}, #{xxdjryGmsfhm}, #{xxdjryLxdh}, #{djsj}, #{xxczdwGajgjgdm}, #{xxczdwGajgmc}, #{xxczryXm}, #{xxczryGmsfhm}, #{gxsj})
insert into tb_yw_xzqq_xyrxx(xxzjbh,glxxzjbh, rylx, waxz, rwbh, xxsc_pdbz, xyrxm, xyrsfzh, xyrxb, xyrhjd, xyrsxzm, xyrszwz, xyrjqhdgj, xyrxzd, xxdjdw_gajgjgdm, xxdjdw_gajgmc, xxdjry_xm, xxdjry_gmsfhm, xxdjry_lxdh, djsj, xxczdw_gajgjgdm, xxczdw_gajgmc, xxczry_xm, xxczry_gmsfhm, gxsj, wzxxmq,xnsfmq,dwgsmq,qtmq)
values (#{xxzjbh},#{glxxzjbh}, #{rylx}, #{waxz}, #{rwbh}, #{xxscPdbz}, #{xyrxm}, #{xyrsfzh}, #{xyrxb}, #{xyrhjd}, #{xyrsxzm}, #{xyrszwz}, #{xyrjqhdgj}, #{xyrxzd}, #{xxdjdwGajgjgdm}, #{xxdjdwGajgmc}, #{xxdjryXm}, #{xxdjryGmsfhm}, #{xxdjryLxdh}, #{djsj}, #{xxczdwGajgjgdm}, #{xxczdwGajgmc}, #{xxczryXm}, #{xxczryGmsfhm}, #{gxsj}, #{wzxxmq}, #{xnsfmq}, #{dwgsmq}, #{qtmq})
</insert>
<insert id="insertBatch" keyProperty="xxzjbh" useGeneratedKeys="true">
......@@ -131,7 +221,7 @@
<!--通过主键修改数据-->
<update id="update">
update xzxt.tb_yw_xzqq_xyrxx
update tb_yw_xzqq_xyrxx
<set>
<if test="glxxzjbh != null and glxxzjbh != ''">
glxxzjbh = #{glxxzjbh},
......@@ -148,28 +238,28 @@
<if test="xxscPdbz != null and xxscPdbz != ''">
xxsc_pdbz = #{xxscPdbz},
</if>
<if test="xyrxm != null and xyrxm != ''">
<if test="xyrxm != null ">
xyrxm = #{xyrxm},
</if>
<if test="xyrsfzh != null and xyrsfzh != ''">
<if test="xyrsfzh != null ">
xyrsfzh = #{xyrsfzh},
</if>
<if test="xyrxb != null and xyrxb != ''">
<if test="xyrxb != null ">
xyrxb = #{xyrxb},
</if>
<if test="xyrhjd != null and xyrhjd != ''">
<if test="xyrhjd != null ">
xyrhjd = #{xyrhjd},
</if>
<if test="xyrsxzm != null and xyrsxzm != ''">
<if test="xyrsxzm != null ">
xyrsxzm = #{xyrsxzm},
</if>
<if test="xyrszwz != null and xyrszwz != ''">
<if test="xyrszwz != null ">
xyrszwz = #{xyrszwz},
</if>
<if test="xyrjqhdgj != null and xyrjqhdgj != ''">
<if test="xyrjqhdgj != null ">
xyrjqhdgj = #{xyrjqhdgj},
</if>
<if test="xyrxzd != null and xyrxzd != ''">
<if test="xyrxzd != null ">
xyrxzd = #{xyrxzd},
</if>
<if test="xxdjdwGajgjgdm != null and xxdjdwGajgjgdm != ''">
......@@ -205,14 +295,37 @@
<if test="gxsj != null">
gxsj = #{gxsj},
</if>
<if test="wzxxmq != null">
wzxxmq = #{wzxxmq},
</if>
<if test="xnsfmq != null ">
xnsfmq = #{xnsfmq},
</if>
<if test="dwgsmq != null ">
dwgsmq = #{dwgsmq},
</if>
<if test="qtmq != null ">
qtmq = #{qtmq},
</if>
</set>
where xxzjbh = #{xxzjbh}
</update>
<!--通过主键删除-->
<delete id="deleteById">
delete from xzxt.tb_yw_xzqq_xyrxx where xxzjbh = #{xxzjbh}
</delete>
<update id="deleteById" parameterType="org.springblade.founder.xzqq.entity.TbYwXzqqXyrxx">
UPDATE tb_yw_xzqq_xyrxx SET
<if test="xxczdwGajgjgdm != null and xxczdwGajgjgdm != ''">xxczdw_gajgjgdm =
#{ xxczdwGajgjgdm , jdbcType=VARCHAR },
</if>
<if test="xxczdwGajgmc != null and xxczdwGajgmc != ''">xxczdw_gajgmc = #{ xxczdwGajgmc , jdbcType=VARCHAR },
</if>
<if test="xxczryGmsfhm != null and xxczryGmsfhm != ''">xxczry_gmsfhm = #{ xxczryGmsfhm , jdbcType=VARCHAR },
</if>
<if test="xxczryXm != null and xxczryXm != ''">xxczry_xm = #{ xxczryXm , jdbcType=VARCHAR },</if>
xxsc_pdbz = '1',
gxsj = now()
WHERE xxzjbh = #{xxzjbh,jdbcType=VARCHAR}
</update>
</mapper>
src/main/java/org/springblade/founder/xzqq/mapper/TbYwXzqqZhryxxMapper.java
......@@ -82,7 +82,7 @@ public interface TbYwXzqqZhryxxMapper {
* @param xxzjbh 主键
* @return 影响行数
*/
int deleteById(String xxzjbh);
int deleteById(TbYwXzqqZhryxx tbYwXzqqZhryxx);
}
src/main/java/org/springblade/founder/xzqq/mapper/TbYwXzqqZhryxxMapper.xml
......@@ -23,10 +23,88 @@
<!--通过实体作为筛选条件查询-->
<select id="queryAll" resultType="org.springblade.founder.xzqq.entity.TbYwXzqqZhryxx">
select
glxxzjbh, xxsc_pdbz, xyrxm, xyrsfzh, xyrhjd, xyrsxzm, glasjbh, xyrzhdz, xsqzcs, jsdw, xxdjdw_gajgjgdm, xxdjdw_gajgmc, xxdjry_xm, xxdjry_gmsfhm, xxdjry_lxdh, djsj, xxczdw_gajgjgdm, xxczdw_gajgmc, xxczry_xm, xxczry_gmsfhm, gxsj
xxzjbh,glxxzjbh, xxsc_pdbz, xyrxm, xyrsfzh, xyrhjd, xyrsxzm, glasjbh, xyrzhdz, xsqzcs, jsdw, xxdjdw_gajgjgdm, xxdjdw_gajgmc, xxdjry_xm, xxdjry_gmsfhm, xxdjry_lxdh, djsj, xxczdw_gajgjgdm, xxczdw_gajgmc, xxczry_xm, xxczry_gmsfhm, gxsj
from xzxt.tb_yw_xzqq_zhryxx
from tb_yw_xzqq_zhryxx
<where>
and xxsc_pdbz = '0'
<if test="xxzjbh != null and xxzjbh != ''">
and xxzjbh = #{xxzjbh}
</if>
<if test="glxxzjbh != null and glxxzjbh != ''">
and glxxzjbh = #{glxxzjbh}
</if>
<if test="xxscPdbz != null and xxscPdbz != ''">
and xxsc_pdbz = #{xxscPdbz}
</if>
<if test="xyrxm != null and xyrxm != ''">
and xyrxm = #{xyrxm}
</if>
<if test="xyrsfzh != null and xyrsfzh != ''">
and xyrsfzh = #{xyrsfzh}
</if>
<if test="xyrhjd != null and xyrhjd != ''">
and xyrhjd = #{xyrhjd}
</if>
<if test="xyrsxzm != null and xyrsxzm != ''">
and xyrsxzm = #{xyrsxzm}
</if>
<if test="glasjbh != null and glasjbh != ''">
and glasjbh = #{glasjbh}
</if>
<if test="xyrzhdz != null and xyrzhdz != ''">
and xyrzhdz = #{xyrzhdz}
</if>
<if test="xsqzcs != null and xsqzcs != ''">
and xsqzcs = #{xsqzcs}
</if>
<if test="jsdw != null and jsdw != ''">
and jsdw = #{jsdw}
</if>
<if test="xxdjdwGajgjgdm != null and xxdjdwGajgjgdm != ''">
and xxdjdw_gajgjgdm = #{xxdjdwGajgjgdm}
</if>
<if test="xxdjdwGajgmc != null and xxdjdwGajgmc != ''">
and xxdjdw_gajgmc = #{xxdjdwGajgmc}
</if>
<if test="xxdjryXm != null and xxdjryXm != ''">
and xxdjry_xm = #{xxdjryXm}
</if>
<if test="xxdjryGmsfhm != null and xxdjryGmsfhm != ''">
and xxdjry_gmsfhm = #{xxdjryGmsfhm}
</if>
<if test="xxdjryLxdh != null and xxdjryLxdh != ''">
and xxdjry_lxdh = #{xxdjryLxdh}
</if>
<if test="djsj != null">
and djsj = #{djsj}
</if>
<if test="xxczdwGajgjgdm != null and xxczdwGajgjgdm != ''">
and xxczdw_gajgjgdm = #{xxczdwGajgjgdm}
</if>
<if test="xxczdwGajgmc != null and xxczdwGajgmc != ''">
and xxczdw_gajgmc = #{xxczdwGajgmc}
</if>
<if test="xxczryXm != null and xxczryXm != ''">
and xxczry_xm = #{xxczryXm}
</if>
<if test="xxczryGmsfhm != null and xxczryGmsfhm != ''">
and xxczry_gmsfhm = #{xxczryGmsfhm}
</if>
<if test="gxsj != null">
and gxsj = #{gxsj}
</if>
</where>
order by djsj desc limit #{page},#{limit}
</select>
<select id="queryAllCount" resultType="java.lang.Integer">
select
count(1)
from tb_yw_xzqq_zhryxx
<where>
and xxsc_pdbz = '0'
<if test="xxzjbh != null and xxzjbh != ''">
and xxzjbh = #{xxzjbh}
</if>
......@@ -94,12 +172,14 @@
and gxsj = #{gxsj}
</if>
</where>
</select>
<!--新增所有列-->
<insert id="insert" keyProperty="xxzjbh" useGeneratedKeys="true">
<insert id="insert" >
insert into tb_yw_xzqq_zhryxx(xxzjbh,glxxzjbh, xxsc_pdbz, xyrxm, xyrsfzh, xyrhjd, xyrsxzm, glasjbh, xyrzhdz, xsqzcs, jsdw, xxdjdw_gajgjgdm, xxdjdw_gajgmc, xxdjry_xm, xxdjry_gmsfhm, xxdjry_lxdh, djsj, xxczdw_gajgjgdm, xxczdw_gajgmc, xxczry_xm, xxczry_gmsfhm, gxsj)
values (#{glxxzjbh}, #{xxscPdbz}, #{xyrxm}, #{xyrsfzh}, #{xyrhjd}, #{xyrsxzm}, #{glasjbh}, #{xyrzhdz}, #{xsqzcs}, #{jsdw}, #{xxdjdwGajgjgdm}, #{xxdjdwGajgmc}, #{xxdjryXm}, #{xxdjryGmsfhm}, #{xxdjryLxdh}, #{djsj}, #{xxczdwGajgjgdm}, #{xxczdwGajgmc}, #{xxczryXm}, #{xxczryGmsfhm}, #{gxsj})
values (#{xxzjbh},#{glxxzjbh}, #{xxscPdbz}, #{xyrxm}, #{xyrsfzh}, #{xyrhjd}, #{xyrsxzm}, #{glasjbh}, #{xyrzhdz}, #{xsqzcs}, #{jsdw}, #{xxdjdwGajgjgdm}, #{xxdjdwGajgmc}, #{xxdjryXm}, #{xxdjryGmsfhm}, #{xxdjryLxdh}, #{djsj}, #{xxczdwGajgjgdm}, #{xxczdwGajgmc}, #{xxczryXm}, #{xxczryGmsfhm}, #{gxsj})
</insert>
<insert id="insertBatch" keyProperty="xxzjbh" useGeneratedKeys="true">
......@@ -190,10 +270,21 @@
where xxzjbh = #{xxzjbh}
</update>
<!--通过主键删除-->
<delete id="deleteById">
delete from xzxt.tb_yw_xzqq_zhryxx where xxzjbh = #{xxzjbh}
</delete>
<update id="deleteById" parameterType="org.springblade.founder.xzqq.entity.TbYwXzqqZhryxx">
UPDATE tb_yw_xzqq_zhryxx SET
<if test="xxczdwGajgjgdm != null and xxczdwGajgjgdm != ''">xxczdw_gajgjgdm =
#{ xxczdwGajgjgdm , jdbcType=VARCHAR },
</if>
<if test="xxczdwGajgmc != null and xxczdwGajgmc != ''">xxczdw_gajgmc = #{ xxczdwGajgmc , jdbcType=VARCHAR },
</if>
<if test="xxczryGmsfhm != null and xxczryGmsfhm != ''">xxczry_gmsfhm = #{ xxczryGmsfhm , jdbcType=VARCHAR },
</if>
<if test="xxczryXm != null and xxczryXm != ''">xxczry_xm = #{ xxczryXm , jdbcType=VARCHAR },</if>
xxsc_pdbz = '1',
gxsj = now()
WHERE xxzjbh = #{xxzjbh,jdbcType=VARCHAR}
</update>
</mapper>
src/main/java/org/springblade/founder/xzqq/service/TbYwXzqqMjxxService.java
package org.springblade.founder.xzqq.service;
import org.springblade.founder.xzqq.entity.TbYwXzqqMjxx;
import org.springblade.founder.xzqq.entity.TbYwXzqqXx;
import java.util.List;
/**
......@@ -18,7 +20,8 @@ public interface TbYwXzqqMjxxService {
* @return 实例对象
*/
TbYwXzqqMjxx queryById(String xxzjbh);
List<TbYwXzqqMjxx> queryAll(TbYwXzqqMjxx tbYwXzqqXx);
int queryAllCount(TbYwXzqqMjxx tbYwXzqqXx);
/**
* 查询多条数据
*
......
src/main/java/org/springblade/founder/xzqq/service/TbYwXzqqXxService.java
package org.springblade.founder.xzqq.service;
import org.springblade.founder.xzqq.entity.TbYwDzqqFjVo;
import org.springblade.founder.xzqq.entity.TbYwDzqqXxVo;
import org.springblade.founder.xzqq.entity.TbYwXzqqXx;
import org.springframework.web.multipart.MultipartFile;
import java.util.List;
/**
......@@ -18,7 +22,8 @@ public interface TbYwXzqqXxService {
* @return 实例对象
*/
TbYwXzqqXx queryById(String xxzjbh);
List<TbYwDzqqFjVo> queryImgInfo(String xxzjbh);
List<TbYwDzqqFjVo> encodeToString(List<TbYwDzqqFjVo> fjs);
/**
* 查询多条数据
*
......@@ -27,16 +32,20 @@ public interface TbYwXzqqXxService {
* @return 对象列表
*/
List<TbYwXzqqXx> queryAllByLimit(int offset, int limit);
List<TbYwXzqqXx> queryAll(TbYwXzqqXx tbYwXzqqXx);
int queryAllCount(TbYwXzqqXx tbYwXzqqXx);
/**
* 新增数据
*
* @param tbYwXzqqXx 实例对象
* @return 实例对象
*/
TbYwXzqqXx insert(TbYwXzqqXx tbYwXzqqXx);
TbYwXzqqXx insert(TbYwXzqqXx tbYwXzqqXx, MultipartFile sadjbfile, MultipartFile lajdsfile, MultipartFile xzhfile);
TbYwXzqqXx shXzqqXx(TbYwXzqqXx tbYwXzqqXx);
/**
TbYwXzqqXx updateXzqqXx(TbYwXzqqXx tbYwXzqqXx, MultipartFile sadjbfile, MultipartFile lajdsfile, MultipartFile xzhfile);
/**
* 修改数据
*
* @param tbYwXzqqXx 实例对象
......
src/main/java/org/springblade/founder/xzqq/service/TbYwXzqqXyrxxService.java
package org.springblade.founder.xzqq.service;
import org.springblade.founder.xzqq.entity.TbYwXzqqXx;
import org.springblade.founder.xzqq.entity.TbYwXzqqXyrxx;
import java.util.List;
......@@ -35,7 +36,8 @@ public interface TbYwXzqqXyrxxService {
* @return 实例对象
*/
TbYwXzqqXyrxx insert(TbYwXzqqXyrxx tbYwXzqqXyrxx);
List<TbYwXzqqXyrxx> queryAll(TbYwXzqqXyrxx tbYwXzqqXyrxx);
int queryAllCount(TbYwXzqqXyrxx tbYwXzqqXyrxx);
/**
* 修改数据
*
......
src/main/java/org/springblade/founder/xzqq/service/TbYwXzqqZhryxxService.java
package org.springblade.founder.xzqq.service;
import org.springblade.founder.xzqq.entity.TbYwXzqqXyrxx;
import org.springblade.founder.xzqq.entity.TbYwXzqqZhryxx;
import java.util.List;
......@@ -35,7 +36,8 @@ public interface TbYwXzqqZhryxxService {
* @return 实例对象
*/
TbYwXzqqZhryxx insert(TbYwXzqqZhryxx tbYwXzqqZhryxx);
List<TbYwXzqqZhryxx> queryAll(TbYwXzqqZhryxx tbYwXzqqZhryxx);
int queryAllCount(TbYwXzqqZhryxx tbYwXzqqZhryxx);
/**
* 修改数据
*
......
src/main/java/org/springblade/founder/xzqq/service/impl/TbYwXzqqMjxxServiceImpl.java
......@@ -3,6 +3,7 @@ package org.springblade.founder.xzqq.service.impl;
import org.springblade.core.secure.utils.SecureUtil;
import org.springblade.founder.utils.SysXxzjbhService;
import org.springblade.founder.xzqq.entity.TbYwXzqqMjxx;
import org.springblade.founder.xzqq.entity.TbYwXzqqXx;
import org.springblade.founder.xzqq.mapper.TbYwXzqqMjxxMapper;
import org.springblade.founder.xzqq.service.TbYwXzqqMjxxService;
import org.springblade.modules.system.entity.XzxtUser;
......@@ -10,6 +11,7 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
import java.util.Date;
import java.util.List;
import java.util.UUID;
......@@ -35,7 +37,19 @@ public class TbYwXzqqMjxxServiceImpl implements TbYwXzqqMjxxService {
public TbYwXzqqMjxx queryById(String xxzjbh) {
return this.tbYwXzqqMjxxMapper.queryById(xxzjbh);
}
@Override
public List<TbYwXzqqMjxx> queryAll(TbYwXzqqMjxx tbYwXzqqMjxx) {
return this.tbYwXzqqMjxxMapper.queryAll(tbYwXzqqMjxx);
}
@Override
public int queryAllCount(TbYwXzqqMjxx tbYwXzqqMjxx) {
return this.tbYwXzqqMjxxMapper.queryAllCount(tbYwXzqqMjxx);
}
/**
* 查询多条数据
*
......@@ -59,7 +73,8 @@ public class TbYwXzqqMjxxServiceImpl implements TbYwXzqqMjxxService {
XzxtUser xzxtUser = SecureUtil.getUserXzxt();
String blxxzjbh = getOrderIdByUUId();
tbYwXzqqMjxx.setXxzjbh(blxxzjbh);
tbYwXzqqMjxx.setDjsj(new Date());
tbYwXzqqMjxx.setLrdwdm(xzxtUser.getUnitcode());
this.tbYwXzqqMjxxMapper.insert(tbYwXzqqMjxx);
return tbYwXzqqMjxx;
}
......@@ -72,6 +87,7 @@ public class TbYwXzqqMjxxServiceImpl implements TbYwXzqqMjxxService {
*/
@Override
public TbYwXzqqMjxx update(TbYwXzqqMjxx tbYwXzqqMjxx) {
tbYwXzqqMjxx.setGxsj(new Date());
this.tbYwXzqqMjxxMapper.update(tbYwXzqqMjxx);
return this.queryById(tbYwXzqqMjxx.getXxzjbh());
}
......
src/main/java/org/springblade/founder/xzqq/service/impl/TbYwXzqqXxServiceImpl.java
package org.springblade.founder.xzqq.service.impl;
import com.alibaba.fastjson.JSON;
import org.apache.pdfbox.cos.COSDocument;
import org.apache.pdfbox.pdmodel.PDDocument;
import org.apache.pdfbox.rendering.PDFRenderer;
import org.springblade.core.secure.utils.SecureUtil;
import org.springblade.founder.utils.SysXxzjbhService;
import org.springblade.founder.xzqq.entity.TbYwDzqqFj;
import org.springblade.founder.xzqq.entity.TbYwXzqqXx;
import org.springblade.founder.xzqq.entity.*;
import org.springblade.founder.xzqq.mapper.TbYwXzqqXxMapper;
import org.springblade.founder.xzqq.service.TbYwXzqqMjxxService;
import org.springblade.founder.xzqq.service.TbYwXzqqXxService;
import org.springblade.founder.xzqq.service.TbYwXzqqXyrxxService;
import org.springblade.modules.system.entity.XzxtUser;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.util.StringUtils;
import org.springframework.web.multipart.MultipartFile;
import javax.annotation.Resource;
import javax.imageio.ImageIO;
import java.awt.*;
import java.awt.image.BufferedImage;
import java.io.ByteArrayOutputStream;
import java.io.IOException;
import java.util.Date;
import java.util.*;
import java.util.List;
import java.util.UUID;
/**
* 协作请求主表(TbYwXzqqXx)表服务实现类
......@@ -29,6 +38,11 @@ public class TbYwXzqqXxServiceImpl implements TbYwXzqqXxService {
private TbYwXzqqXxMapper tbYwXzqqXxMapper;
@Autowired
private SysXxzjbhService xxzjbhService;
@Autowired
private TbYwXzqqMjxxService tbYwXzqqMjxxService;
@Autowired
private TbYwXzqqXyrxxService tbYwXzqqXyrxxService ;
/**
* 通过ID查询单条数据
*
......@@ -39,8 +53,105 @@ public class TbYwXzqqXxServiceImpl implements TbYwXzqqXxService {
public TbYwXzqqXx queryById(String xxzjbh) {
return this.tbYwXzqqXxMapper.queryById(xxzjbh);
}
@Override
public List<TbYwDzqqFjVo> queryImgInfo(String xxzjbh) {
TbYwDzqqXxVo vo = new TbYwDzqqXxVo();
//查询立案决定书
List<TbYwDzqqFjVo> lajdsFj = tbYwXzqqXxMapper.selectFjInfo(null, xxzjbh);
lajdsFj = encodeToString(lajdsFj);
/**
return lajdsFj;
}
@Override
public List<TbYwDzqqFjVo> encodeToString(List<TbYwDzqqFjVo> fjs) {
//Base64.Encoder encoder = Base64.getEncoder();
List<TbYwDzqqFjVo> resultFj = new ArrayList<>();
for (TbYwDzqqFjVo fj : fjs) {
// 返回Base64编码过的字节数组字符串
//String zp64bite = encoder.encodeToString(fj.getDzwjnr());
//fj.setDzwjnrBase64(QqzcFinalConstants.PIC_PREFIX + zp64bite);
//fj.setDzwjnr(new byte[0]);
String dzwjgs = fj.getDzwjgs();
byte[] dzwjnr = fj.getDzwjnr();
if (dzwjnr == null || dzwjnr.length == 0) {
continue;
}
if (".jpg,.JPG,.png,.PNG,.webp,.WEBP".contains(dzwjgs)) {
fj.setDzwjnrBase64(
"data:image/jpg;base64," + Base64.getEncoder().encodeToString(fj.getDzwjnr()));
} else if (".pdf,.PDF".contains(dzwjgs.toLowerCase())) {
//PDF的转为img
try {
pdf2img(fj);
} catch (IOException e) {
e.printStackTrace();
System.out.println("pdf转图片格式出现错误: {}");
}
}
fj.setDzwjnr(null);
resultFj.add(fj);
}
return resultFj;
}
public void pdf2img(TbYwDzqqFjVo fjVo) throws IOException {
ByteArrayOutputStream byteArrayOutputStream = new ByteArrayOutputStream();
PDDocument doc = null;
try {
doc = PDDocument.load(fjVo.getDzwjnr());
PDFRenderer renderer = new PDFRenderer(doc);
int pages = doc.getNumberOfPages();
List<BufferedImage> images = new ArrayList<>();
BufferedImage image = null;
StringBuilder builder = new StringBuilder();
for (int i = 0; i < pages; i++) {
BufferedImage bufferedImage = renderer.renderImage(i);
images.add(bufferedImage);
}
if (images.size() > 1) {
//多张的话合并为一张
image = mergeImage(images);
} else {
image = images.get(0);
}
ImageIO.write(image, "jpg", byteArrayOutputStream);
String imageBase64 = builder.append("data:image/jpg;base64,").
append(Base64.getEncoder().encodeToString(byteArrayOutputStream.toByteArray())).toString();
fjVo.setDzwjnrBase64(imageBase64);
builder.delete(0, builder.length());
} finally {
byteArrayOutputStream.close();
if (doc != null) {
COSDocument document = doc.getDocument();
document.close();
doc.close();
}
}
}
//多张图片合并为一张 纵向合并
public BufferedImage mergeImage(List<BufferedImage> images) {
//总高
int heightAll = 0;
//总宽
int widthAll = 0;
for (BufferedImage image : images) {
heightAll += image.getHeight();
widthAll = image.getWidth();
}
//新建一个 BufferedImage
BufferedImage destImage = new BufferedImage(widthAll, heightAll, BufferedImage.TYPE_INT_RGB);
Graphics2D graphics = destImage.createGraphics();
//纵向绘图
int height = 0;
for (BufferedImage image : images) {
graphics.drawImage(image, 0, height, null);
height += image.getHeight();
}
graphics.dispose();
return destImage;
}
/**
* 查询多条数据
*
* @param offset 查询起始位置
......@@ -51,7 +162,48 @@ public class TbYwXzqqXxServiceImpl implements TbYwXzqqXxService {
public List<TbYwXzqqXx> queryAllByLimit(int offset, int limit) {
return this.tbYwXzqqXxMapper.queryAllByLimit(offset, limit);
}
@Override
public List<TbYwXzqqXx> queryAll(TbYwXzqqXx tbYwXzqqXx) {
XzxtUser xzxtUser = SecureUtil.getUserXzxt();
String idcardparam="";
if("1".equals(tbYwXzqqXx.getXzzt())){
idcardparam=xzxtUser.getIdentitycard();
tbYwXzqqXx.setIdcardparam(idcardparam);
}else if("2".equals(tbYwXzqqXx.getXzzt())){
idcardparam=xzxtUser.getIdentitycard();
tbYwXzqqXx.setIdcardparam(idcardparam);
}else if("3".equals(tbYwXzqqXx.getXzzt())){
idcardparam=xzxtUser.getIdentitycard();
tbYwXzqqXx.setIdcardparam(idcardparam);
}else {
idcardparam=xzxtUser.getIdentitycard();
tbYwXzqqXx.setIdcardparam(idcardparam);
}
return this.tbYwXzqqXxMapper.queryAll(tbYwXzqqXx);
}
@Override
public int queryAllCount(TbYwXzqqXx tbYwXzqqXx) {
XzxtUser xzxtUser = SecureUtil.getUserXzxt();
String idcardparam="";
if("1".equals(tbYwXzqqXx.getXzzt())){
idcardparam=xzxtUser.getIdentitycard();
tbYwXzqqXx.setIdcardparam(idcardparam);
}else if("2".equals(tbYwXzqqXx.getXzzt())){
idcardparam=xzxtUser.getIdentitycard();
tbYwXzqqXx.setIdcardparam(idcardparam);
}else if("3".equals(tbYwXzqqXx.getXzzt())){
idcardparam=xzxtUser.getIdentitycard();
tbYwXzqqXx.setIdcardparam(idcardparam);
}else {
idcardparam=xzxtUser.getIdentitycard();
tbYwXzqqXx.setIdcardparam(idcardparam);
}
return this.tbYwXzqqXxMapper.queryAllCount(tbYwXzqqXx);
}
/**
* 新增数据
*
......@@ -59,19 +211,94 @@ public class TbYwXzqqXxServiceImpl implements TbYwXzqqXxService {
* @return 实例对象
*/
@Override
public TbYwXzqqXx insert(TbYwXzqqXx tbYwXzqqXx) {
public TbYwXzqqXx insert(TbYwXzqqXx tbYwXzqqXx, MultipartFile sadjbfile, MultipartFile lajdsfile, MultipartFile xzhfile) {
XzxtUser xzxtUser = SecureUtil.getUserXzxt();
tbYwXzqqXx.setDjUser(xzxtUser);
String blxxzjbh = xxzjbhService.getXxzjbh(xzxtUser.getUnitcode(),null);//xxzjbh
tbYwXzqqXx.setXxzjbh(blxxzjbh);
tbYwXzqqXx.setXzzt("1");
this.tbYwXzqqXxMapper.insert(tbYwXzqqXx);
List<TbYwXzqqMjxx> mjxxList=tbYwXzqqXx.getMjxxs();
if(mjxxList!=null &&mjxxList.size()>0){
for(TbYwXzqqMjxx mjxx:mjxxList){
mjxx.setGlxxzjbh(blxxzjbh);
tbYwXzqqMjxxService.insert(mjxx);
}
}
List<TbYwXzqqXyrxx> xyrxxList=tbYwXzqqXx.getXyrs();
if(xyrxxList!=null &&xyrxxList.size()>0){
for(TbYwXzqqXyrxx xyrxx:xyrxxList){
xyrxx.setGlxxzjbh(blxxzjbh);
tbYwXzqqXyrxxService.insert(xyrxx);
}
}
try {
if (sadjbfile != null) {
saveAttachment(blxxzjbh, sadjbfile, "1");
}
if (lajdsfile != null) {
saveAttachment(blxxzjbh, lajdsfile, "2");
}
if (xzhfile != null) {
saveAttachment(blxxzjbh, xzhfile, "3");
}
}catch (Exception e){
e.printStackTrace();
}
return tbYwXzqqXx;
}
@Override
public TbYwXzqqXx updateXzqqXx(TbYwXzqqXx tbYwXzqqXx, MultipartFile sadjbfile, MultipartFile lajdsfile, MultipartFile xzhfile) {
XzxtUser xzxtUser = SecureUtil.getUserXzxt();
tbYwXzqqXx.setUpUser(xzxtUser);
String blxxzjbh=tbYwXzqqXx.getXxzjbh();
this.tbYwXzqqXxMapper.update(tbYwXzqqXx);
try {
if (sadjbfile != null) {
saveAttachment(blxxzjbh, sadjbfile, "1");
}
if (lajdsfile != null) {
saveAttachment(blxxzjbh, lajdsfile, "2");
}
if (xzhfile != null) {
saveAttachment(blxxzjbh, xzhfile, "3");
}
String removezpStr=tbYwXzqqXx.getRemovezpStr();
if (StringUtils.hasText(removezpStr)) {
String[] removedXxzjbhs = removezpStr.split(",");
for (String fjXxzjbh : removedXxzjbhs) {
tbYwXzqqXxMapper.updateDzqqFjXxscPdbz(blxxzjbh, "", fjXxzjbh);
}
}
}catch (Exception e){
e.printStackTrace();
}
return tbYwXzqqXx;
}
@Override
public TbYwXzqqXx shXzqqXx(TbYwXzqqXx tbYwXzqqXx) {
XzxtUser xzxtUser = SecureUtil.getUserXzxt();
//2-协作中，3-完成，4-审核不通过
// tbYwXzqqXx.setXzzt("2");
if("2".equals(tbYwXzqqXx.getXzzt())){
tbYwXzqqXx.setSprSfzh(xzxtUser.getIdentitycard());
tbYwXzqqXx.setSpsj(new Date());
}
this.tbYwXzqqXxMapper.update(tbYwXzqqXx);
return tbYwXzqqXx;
}
//保存附件至tb_yw_xzqq_fj表
private void saveAttachment(String dzXxzjbh, List<MultipartFile> fjList, String fjlx) throws IOException {
private void saveAttachment(String dzXxzjbh, MultipartFile multipartFile, String fjlx) throws IOException {
XzxtUser userXzxt = SecureUtil.getUserXzxt();
for (MultipartFile multipartFile : fjList) {
TbYwDzqqFj fj = new TbYwDzqqFj();
fj.setXxzjbh(getOrderIdByUUId());
fj.setDzXxzjbh(dzXxzjbh);
......@@ -88,7 +315,7 @@ public class TbYwXzqqXxServiceImpl implements TbYwXzqqXxService {
fj.setXxscPdbz("0");
tbYwXzqqXxMapper.insertFj(fj);
}
}
public static String getOrderIdByUUId(){
int machineId = 1;//最大支持1-9个集群机器部署
......@@ -121,6 +348,10 @@ public class TbYwXzqqXxServiceImpl implements TbYwXzqqXxService {
*/
@Override
public boolean deleteById(String xxzjbh) {
return this.tbYwXzqqXxMapper.deleteById(xxzjbh) > 0;
TbYwXzqqXx tbYwXzqqXx=new TbYwXzqqXx();
XzxtUser xzxtUser = SecureUtil.getUserXzxt();
tbYwXzqqXx.setUpUser(xzxtUser);
tbYwXzqqXx.setXxzjbh(xxzjbh);
return this.tbYwXzqqXxMapper.deleteById(tbYwXzqqXx) > 0;
}
}
src/main/java/org/springblade/founder/xzqq/service/impl/TbYwXzqqXyrxxServiceImpl.java
package org.springblade.founder.xzqq.service.impl;
import org.springblade.core.secure.utils.SecureUtil;
import org.springblade.founder.xzqq.entity.TbYwDzqqFj;
import org.springblade.founder.xzqq.entity.TbYwDzqqFjVo;
import org.springblade.founder.xzqq.entity.TbYwXzqqXx;
import org.springblade.founder.xzqq.entity.TbYwXzqqXyrxx;
import org.springblade.founder.xzqq.mapper.TbYwXzqqXxMapper;
import org.springblade.founder.xzqq.mapper.TbYwXzqqXyrxxMapper;
import org.springblade.founder.xzqq.service.TbYwXzqqXxService;
import org.springblade.founder.xzqq.service.TbYwXzqqXyrxxService;
import org.springblade.modules.system.entity.XzxtUser;
import org.springframework.stereotype.Service;
import org.springframework.util.StringUtils;
import org.springframework.web.multipart.MultipartFile;
import javax.annotation.Resource;
import java.io.IOException;
import java.util.Date;
import java.util.List;
import java.util.UUID;
......@@ -19,7 +30,10 @@ import java.util.UUID;
public class TbYwXzqqXyrxxServiceImpl implements TbYwXzqqXyrxxService {
@Resource
private TbYwXzqqXyrxxMapper tbYwXzqqXyrxxMapper;
@Resource
private TbYwXzqqXxMapper tbYwXzqqXxMapper;
@Resource
private TbYwXzqqXxService tbYwXzqqXxService;
/**
* 通过ID查询单条数据
*
......@@ -51,10 +65,61 @@ public class TbYwXzqqXyrxxServiceImpl implements TbYwXzqqXyrxxService {
*/
@Override
public TbYwXzqqXyrxx insert(TbYwXzqqXyrxx tbYwXzqqXyrxx) {
XzxtUser xzxtUser = SecureUtil.getUserXzxt();
tbYwXzqqXyrxx.setDjUser(xzxtUser);
tbYwXzqqXyrxx.setXxzjbh(getOrderIdByUUId());
this.tbYwXzqqXyrxxMapper.insert(tbYwXzqqXyrxx);
try {
if (tbYwXzqqXyrxx.getLyzmcl() != null) {
saveAttachment(tbYwXzqqXyrxx.getXxzjbh(), tbYwXzqqXyrxx.getLyzmcl(), "4");
}
}catch (Exception e){
e.printStackTrace();
}
return tbYwXzqqXyrxx;
}
//保存附件至tb_yw_xzqq_fj表 //附件类型，1-受案登记表，2-立案决定书，3-协作函，4-来源证明材料，5-询问笔录，6-强制措施文书，
private void saveAttachment(String dzXxzjbh, MultipartFile multipartFile, String fjlx) throws IOException {
XzxtUser userXzxt = SecureUtil.getUserXzxt();
TbYwDzqqFj fj = new TbYwDzqqFj();
fj.setXxzjbh(getOrderIdByUUId());
fj.setDzXxzjbh(dzXxzjbh);
String dzwjbt = multipartFile.getOriginalFilename();
fj.setDzwjbt(dzwjbt);
String dzwjgs = dzwjbt.substring(dzwjbt.lastIndexOf("."));
fj.setDzwjgs(dzwjgs.toLowerCase());
fj.setDzwjnr(multipartFile.getBytes());
fj.setFjlx(fjlx);
fj.setCreateTime(new Date());
fj.setCreateBy(userXzxt.getIdentitycard());
fj.setUpdateTime(new Date());
fj.setUpdateBy(userXzxt.getIdentitycard());
fj.setXxscPdbz("0");
tbYwXzqqXxMapper.insertFj(fj);
}
@Override
public List<TbYwXzqqXyrxx> queryAll(TbYwXzqqXyrxx tbYwXzqqXyrxx) {
List<TbYwXzqqXyrxx> xyrxxList=tbYwXzqqXyrxxMapper.queryAll(tbYwXzqqXyrxx);
for(TbYwXzqqXyrxx xx:xyrxxList){
List<TbYwDzqqFjVo> fj = tbYwXzqqXxMapper.selectFjInfo(null, xx.getXxzjbh());
fj = tbYwXzqqXxService.encodeToString(fj);
xx.setWj(fj);
}
return xyrxxList;
}
@Override
public int queryAllCount(TbYwXzqqXyrxx tbYwXzqqXyrxx) {
return this.tbYwXzqqXyrxxMapper.queryAllCount(tbYwXzqqXyrxx);
}
public static String getOrderIdByUUId(){
int machineId = 1;//最大支持1-9个集群机器部署
int hashCodev = UUID.randomUUID().toString().hashCode();
......@@ -74,8 +139,24 @@ public class TbYwXzqqXyrxxServiceImpl implements TbYwXzqqXyrxxService {
*/
@Override
public TbYwXzqqXyrxx update(TbYwXzqqXyrxx tbYwXzqqXyrxx) {
XzxtUser xzxtUser = SecureUtil.getUserXzxt();
tbYwXzqqXyrxx.setUpUser(xzxtUser);
this.tbYwXzqqXyrxxMapper.update(tbYwXzqqXyrxx);
return this.queryById(tbYwXzqqXyrxx.getXxzjbh());
try {
if (tbYwXzqqXyrxx.getLyzmcl() != null) {
saveAttachment(tbYwXzqqXyrxx.getXxzjbh(), tbYwXzqqXyrxx.getLyzmcl(), "4");
}
}catch (Exception e){
e.printStackTrace();
}
String removezpStr=tbYwXzqqXyrxx.getRemovezpStr();
if (StringUtils.hasText(removezpStr)) {
String[] removedXxzjbhs = removezpStr.split(",");
for (String fjXxzjbh : removedXxzjbhs) {
tbYwXzqqXxMapper.updateDzqqFjXxscPdbz(tbYwXzqqXyrxx.getXxzjbh(), "", fjXxzjbh);
}
}
return null;
}
/**
......@@ -86,6 +167,12 @@ public class TbYwXzqqXyrxxServiceImpl implements TbYwXzqqXyrxxService {
*/
@Override
public boolean deleteById(String xxzjbh) {
return this.tbYwXzqqXyrxxMapper.deleteById(xxzjbh) > 0;
XzxtUser xzxtUser = SecureUtil.getUserXzxt();
TbYwXzqqXyrxx tbYwXzqqXyrxx=new TbYwXzqqXyrxx();
tbYwXzqqXyrxx.setUpUser(xzxtUser);
tbYwXzqqXyrxx.setXxzjbh(xxzjbh);
return this.tbYwXzqqXyrxxMapper.deleteById(tbYwXzqqXyrxx) > 0;
}
}
src/main/java/org/springblade/founder/xzqq/service/impl/TbYwXzqqZhryxxServiceImpl.java
package org.springblade.founder.xzqq.service.impl;
import org.springblade.core.secure.utils.SecureUtil;
import org.springblade.founder.xzqq.entity.TbYwDzqqFj;
import org.springblade.founder.xzqq.entity.TbYwDzqqFjVo;
import org.springblade.founder.xzqq.entity.TbYwXzqqXyrxx;
import org.springblade.founder.xzqq.entity.TbYwXzqqZhryxx;
import org.springblade.founder.xzqq.mapper.TbYwXzqqXxMapper;
import org.springblade.founder.xzqq.mapper.TbYwXzqqZhryxxMapper;
import org.springblade.founder.xzqq.service.TbYwXzqqXxService;
import org.springblade.founder.xzqq.service.TbYwXzqqZhryxxService;
import org.springblade.modules.system.entity.XzxtUser;
import org.springframework.stereotype.Service;
import org.springframework.util.StringUtils;
import org.springframework.web.multipart.MultipartFile;
import javax.annotation.Resource;
import java.io.IOException;
import java.util.Date;
import java.util.List;
import java.util.UUID;
......@@ -19,7 +30,11 @@ import java.util.UUID;
public class TbYwXzqqZhryxxServiceImpl implements TbYwXzqqZhryxxService {
@Resource
private TbYwXzqqZhryxxMapper tbYwXzqqZhryxxMapper;
@Resource
private TbYwXzqqXxMapper tbYwXzqqXxMapper;
@Resource
private TbYwXzqqXxService tbYwXzqqXxService;
/**
* 通过ID查询单条数据
*
......@@ -51,10 +66,62 @@ public class TbYwXzqqZhryxxServiceImpl implements TbYwXzqqZhryxxService {
*/
@Override
public TbYwXzqqZhryxx insert(TbYwXzqqZhryxx tbYwXzqqZhryxx) {
XzxtUser xzxtUser = SecureUtil.getUserXzxt();
tbYwXzqqZhryxx.setDjUser(xzxtUser);
tbYwXzqqZhryxx.setXxzjbh(getOrderIdByUUId());
this.tbYwXzqqZhryxxMapper.insert(tbYwXzqqZhryxx);
try {
if (tbYwXzqqZhryxx.getXwbl() != null) {
saveAttachment(tbYwXzqqZhryxx.getXxzjbh(),tbYwXzqqZhryxx.getXwbl(), "5");
}
if (tbYwXzqqZhryxx.getQzcsws() != null) {
saveAttachment(tbYwXzqqZhryxx.getXxzjbh(),tbYwXzqqZhryxx.getQzcsws(), "6");
}
}catch (Exception e){
e.printStackTrace();
}
return tbYwXzqqZhryxx;
}
@Override
public List<TbYwXzqqZhryxx> queryAll(TbYwXzqqZhryxx tbYwXzqqZhryxx) {
List<TbYwXzqqZhryxx> zhryxxes=tbYwXzqqZhryxxMapper.queryAll(tbYwXzqqZhryxx);
for(TbYwXzqqZhryxx xx:zhryxxes){
List<TbYwDzqqFjVo> fj = tbYwXzqqXxMapper.selectFjInfo(null, xx.getXxzjbh());
fj = tbYwXzqqXxService.encodeToString(fj);
xx.setWj(fj);
}
return zhryxxes;
}
//保存附件至tb_yw_xzqq_fj表 //附件类型，1-受案登记表，2-立案决定书，3-协作函，4-来源证明材料，5-询问笔录，6-强制措施文书，
private void saveAttachment(String dzXxzjbh, MultipartFile multipartFile, String fjlx) throws IOException {
XzxtUser userXzxt = SecureUtil.getUserXzxt();
TbYwDzqqFj fj = new TbYwDzqqFj();
fj.setXxzjbh(getOrderIdByUUId());
fj.setDzXxzjbh(dzXxzjbh);
String dzwjbt = multipartFile.getOriginalFilename();
fj.setDzwjbt(dzwjbt);
String dzwjgs = dzwjbt.substring(dzwjbt.lastIndexOf("."));
fj.setDzwjgs(dzwjgs.toLowerCase());
fj.setDzwjnr(multipartFile.getBytes());
fj.setFjlx(fjlx);
fj.setCreateTime(new Date());
fj.setCreateBy(userXzxt.getIdentitycard());
fj.setUpdateTime(new Date());
fj.setUpdateBy(userXzxt.getIdentitycard());
fj.setXxscPdbz("0");
tbYwXzqqXxMapper.insertFj(fj);
}
@Override
public int queryAllCount(TbYwXzqqZhryxx tbYwXzqqZhryxx) {
return this.tbYwXzqqZhryxxMapper.queryAllCount(tbYwXzqqZhryxx);
}
public static String getOrderIdByUUId(){
int machineId = 1;//最大支持1-9个集群机器部署
int hashCodev = UUID.randomUUID().toString().hashCode();
......@@ -74,7 +141,25 @@ public class TbYwXzqqZhryxxServiceImpl implements TbYwXzqqZhryxxService {
*/
@Override
public TbYwXzqqZhryxx update(TbYwXzqqZhryxx tbYwXzqqZhryxx) {
this.tbYwXzqqZhryxxMapper.update(tbYwXzqqZhryxx);
try {
if (tbYwXzqqZhryxx.getXwbl() != null) {
saveAttachment(tbYwXzqqZhryxx.getXxzjbh(),tbYwXzqqZhryxx.getXwbl(), "5");
}
if (tbYwXzqqZhryxx.getQzcsws() != null) {
saveAttachment(tbYwXzqqZhryxx.getXxzjbh(),tbYwXzqqZhryxx.getQzcsws(), "6");
}
}catch (Exception e){
e.printStackTrace();
}
String removezpStr=tbYwXzqqZhryxx.getRemovezpStr();
if (StringUtils.hasText(removezpStr)) {
String[] removedXxzjbhs = removezpStr.split(",");
for (String fjXxzjbh : removedXxzjbhs) {
tbYwXzqqXxMapper.updateDzqqFjXxscPdbz(tbYwXzqqZhryxx.getXxzjbh(), "", fjXxzjbh);
}
}
return this.queryById(tbYwXzqqZhryxx.getXxzjbh());
}
......@@ -86,6 +171,11 @@ public class TbYwXzqqZhryxxServiceImpl implements TbYwXzqqZhryxxService {
*/
@Override
public boolean deleteById(String xxzjbh) {
return this.tbYwXzqqZhryxxMapper.deleteById(xxzjbh) > 0;
XzxtUser xzxtUser = SecureUtil.getUserXzxt();
TbYwXzqqZhryxx tbYwXzqqZhryxx=new TbYwXzqqZhryxx();
tbYwXzqqZhryxx.setUpUser(xzxtUser);
tbYwXzqqZhryxx.setXxzjbh(xxzjbh);
return this.tbYwXzqqZhryxxMapper.deleteById(tbYwXzqqZhryxx) > 0;
}
}
src/main/java/org/springblade/modules/auth/controller/AuthController.java
......@@ -35,6 +35,7 @@ import org.springblade.modules.auth.utils.SecurityUtil;
import org.springblade.modules.auth.utils.TokenUtil;
import org.springblade.modules.system.entity.SysNewUser;
import org.springblade.modules.system.entity.UserInfoResult;
import org.springblade.modules.system.mapper.SysUserMapper;
import org.springblade.modules.system.service.ISysUserService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
......@@ -63,7 +64,8 @@ public class AuthController {
@Autowired
private ISysUserService sysUserService;
@Autowired
private SysUserMapper sysUserMapper;
@PostMapping("token")
@ApiOperation(value = "获取认证token", notes = "传入租户ID:tenantId,账号:account,密码:password")
public R<AuthInfo> token(@ApiParam(value = "授权类型", required = true) @RequestParam(defaultValue = "password", required = false) String grantType,
......@@ -86,6 +88,12 @@ public class AuthController {
// UserInfo userInfo = granter.grant(tokenParameter);
UserInfoResult userInfo = granter.grant(tokenParameter);
if (userInfo == null || userInfo.getUser() == null) {
String sfzshzt = sysUserMapper.judgeShPolicemanid(account, null,null);
if (!StringUtils.isEmpty(sfzshzt) && "1".equals(sfzshzt)){
return R.fail("当前用户已注册，还未审批");
}
return R.fail(TokenUtil.USER_NOT_FOUND);
}
......
src/main/java/org/springblade/modules/system/entity/SysNewUser.java
......@@ -24,9 +24,9 @@ public class SysNewUser extends BaseModel {
private String sfbhxj; //是否包含下级(包含-1，不包含-0或者不选)
private String sfjg;
private String sfzsjgsql;
private String qhmc;
private String menuName;
private static final long serialVersionUID = 1L;
private String shzt; //审核状态（0-管理员添加；1-待审核；2-审核通过；3-审核不通过）
@ApiModelProperty(value = "主键")
private String id;
......@@ -113,16 +113,31 @@ public class SysNewUser extends BaseModel {
private String userRolesIdsStr;
private String permission;
private String permission;
private String roleId;
private String roleId;
private String menuId;
private String syRolesStr;
private String syRolesStr;
private String userUnitCode; //当前用户所在的单位
private String userUnitCode; //当前用户所在的单位
private String codeLevCol;
private String zmjgzp; //正面警官照片
private String fmjgzp; //反面警官照片
private String rldlzp;//人脸登录照片
private String sfsp; //是否审批（0否1是）
private String lsjl; //是否个人查看申请历史记录，有值就是个人历史记录查看，没有值就是管理员查看数据
private String shzt; //审核状态（0-管理员添加；1-待审核；2-审核通过；3-审核不通过）
private String blyj; //办理意见
private String gxdwdm; //更新单位代码
private String gxdwmc; //更新单位名称
//登录人员
public void setDjUser(XzxtUser user){
......@@ -131,13 +146,13 @@ public class SysNewUser extends BaseModel {
this.lrdwmc=user.getUnitname();
}
private String gxdwdm; //更新单位代码
private String gxdwmc; //更新单位名称
// 更新人员
public void setUpUser(XzxtUser user){
this.gxr=user.getRealname();
}
//更新人员和单位
public void setUpUserAll(XzxtUser user){
......
src/main/java/org/springblade/modules/system/mapper/SysUserMapper.java
......@@ -19,8 +19,14 @@ import java.util.Map;
public interface SysUserMapper {
int submit(SysNewUser user);
int shtgsubmit(SysNewUser user);
int judgePolicemanid(@Param(value = "policemanid") String policemanid, @Param(value = "identitycard") String identitycard, @Param(value = "id") String id);
int wsjudgePolicemanid(@Param(value = "policemanid") String policemanid, @Param(value = "identitycard") String identitycard, @Param(value = "id") String id);
String judgeShPolicemanid(@Param(value = "policemanid") String policemanid, @Param(value = "identitycard") String identitycard, @Param(value = "id") String id);
String getUnitnameByUnitcode(@Param(value = "unitcode") String unitcode);
// 获取用户 列表
List<SysNewUser> getUserNewList(SysNewUser sysNewUser)throws Exception;
......@@ -29,12 +35,20 @@ public interface SysUserMapper {
// 更新用户 信息
int updateUserNew(SysNewUser sysNewUser)throws Exception;
// 更新用户 信息
int updateWsUserNew(SysNewUser sysNewUser)throws Exception;
//查询数据数量
int getUserZpCount(SysNewUser sysNewUser)throws Exception;
//新增用户照片
int insertUserPhoto(SysNewUser user);
// 根据id查询用户 信息
SysNewUser getUserByBh(String id) throws Exception ;
// 根据id查询用户 信息
SysNewUser getWsUserByBh(String id) throws Exception ;
//更新用户照片
int updateUserPhoto(SysNewUser sysNewUser)throws Exception;
//删除用户信息
......
src/main/java/org/springblade/modules/system/mapper/SysUserMapper.xml
......@@ -9,13 +9,54 @@
FROM
sys_user
WHERE
policemanid = #{policemanid}
scbz = '0'
<if test="identitycard != null and identitycard != ''">
and identitycard = #{identitycard}
and scbz = '0'
</if>
<if test="policemanid != null and policemanid != ''">
and policemanid = #{policemanid}
</if>
<if test="id != null and id != ''">
and id != #{id}
</if>
</select>
<select id="wsjudgePolicemanid" resultType="int" parameterType="string">
SELECT
count(1)
FROM
sys_user_wsyh
WHERE
scbz = '0'
<if test="identitycard != null and identitycard != ''">
and identitycard = #{identitycard}
</if>
<if test="policemanid != null and policemanid != ''">
and policemanid = #{policemanid}
</if>
<if test="id != null and id != ''">
and id != #{id}
</if>
</select>
<!-- 根据警号查询是否有正在审核的数据 -->
<select id="judgeShPolicemanid" resultType="string" parameterType="string">
SELECT
shzt
FROM
sys_user_wssh
WHERE
scbz = '0'
<if test="policemanid != null and policemanid != ''">
and policemanid = #{policemanid}
</if>
<if test="identitycard != null and identitycard != ''">
and identitycard = #{identitycard}
</if>
order by lrsj desc limit 1
</select>
<!-- 根据code获取name -->
<select id="getUnitnameByUnitcode" parameterType="string" resultType="string">
SELECT
......@@ -83,6 +124,91 @@
)
</insert>
<insert id="shtgsubmit" parameterType="org.springblade.modules.system.entity.SysNewUser">
INSERT INTO sys_user_wsyh (
id,
unitcode
,username
,password
,true_name
,open_flag
,default_model
,remark
,lrr
,lrsj
,gxr
,gxsj
,lrdwdm
,lrdwmc
,identitycard
,sex
,birthday
,telephone
,unitname
,scbz
,ip
,grade
,policemanid
,default_desktop
,theme
,lastlogintime
,lastchecktime
,xxzyurl
,gzzm_zhy
,gzzm_ypy
,gzzm_zcy
,gzzm_play
,glybz
,tqyhbz
,jgz_photo_zm
,jgz_photo_fm
,zbzx_dwdm
,grdf
,passwordGxsj
)
VALUES(
#{ id , jdbcType=VARCHAR }
,#{ unitcode , jdbcType=VARCHAR }
,#{ username , jdbcType=VARCHAR }
,#{ password , jdbcType=VARCHAR }
,#{ trueName , jdbcType=VARCHAR }
,#{ openFlag , jdbcType=VARCHAR }
,#{ defaultModel , jdbcType=VARCHAR }
,#{ remark , jdbcType=VARCHAR }
,#{ lrr , jdbcType=VARCHAR }
,now()
,#{ gxr , jdbcType=VARCHAR }
,now()
,#{ lrdwdm , jdbcType=VARCHAR }
,#{ lrdwmc , jdbcType=VARCHAR }
,#{ identitycard , jdbcType=VARCHAR }
,#{ sex , jdbcType=VARCHAR }
,#{ birthday , jdbcType=VARCHAR }
,#{ telephone , jdbcType=VARCHAR }
,#{ unitname , jdbcType=VARCHAR }
,'0'
,#{ ip , jdbcType=VARCHAR }
,#{ grade , jdbcType=VARCHAR }
,#{ policemanid , jdbcType=VARCHAR }
,#{ defaultDesktop , jdbcType=VARCHAR }
,#{ theme , jdbcType=VARCHAR }
,#{ lastlogintime , jdbcType=VARCHAR }
,#{ lastchecktime , jdbcType=VARCHAR }
,#{ xxzyurl , jdbcType=VARCHAR }
,#{ gzzmZhy , jdbcType=VARCHAR }
,#{ gzzmYpy , jdbcType=VARCHAR }
,#{ gzzmZcy , jdbcType=VARCHAR }
,#{ gzzmPlay , jdbcType=VARCHAR }
,#{ glybz , jdbcType=VARCHAR }
,#{ tqyhbz , jdbcType=VARCHAR }
,#{ jgzPhotoZm , jdbcType=VARCHAR }
,#{ jgzPhotoFm , jdbcType=VARCHAR }
,#{ zbzxDwdm , jdbcType=VARCHAR }
,#{ grdf , jdbcType=VARCHAR }
,now()
)
</insert>
<!--用户信息-->
<select id="getUserNewList" parameterType="org.springblade.modules.system.entity.SysNewUser"
resultType="org.springblade.modules.system.entity.SysNewUser">
......@@ -237,19 +363,71 @@
where id=#{id ,jdbcType=VARCHAR }
</update>
<update id="updateWsUserNew" parameterType="org.springblade.modules.system.entity.SysNewUser">
UPDATE sys_user_wsyh SET
<if test="unitcode != null and unitcode != ''">unitcode = #{ unitcode , jdbcType=VARCHAR },</if>
<if test="username != null and username != ''">username = #{ username , jdbcType=VARCHAR },</if>
<if test="password != null and password != ''">password = #{ password , jdbcType=VARCHAR },</if>
<if test="trueName != null and trueName != ''">true_name = #{ trueName , jdbcType=VARCHAR },</if>
<if test="openFlag != null and openFlag != ''">open_flag = #{ openFlag , jdbcType=VARCHAR },</if>
<if test="defaultModel != null and defaultModel != ''">default_model = #{ defaultModel , jdbcType=VARCHAR },
</if>
<if test="remark != null and remark != ''">remark = #{ remark , jdbcType=VARCHAR },</if>
<if test="lrr != null and lrr != ''">lrr = #{ lrr , jdbcType=VARCHAR },</if>
<if test="gxr != null and gxr != ''">gxr = #{ gxr , jdbcType=VARCHAR },</if>
<if test="lrdwdm != null and lrdwdm != ''">lrdwdm = #{ lrdwdm , jdbcType=VARCHAR },</if>
<if test="lrdwmc != null and lrdwmc != ''">lrdwmc = #{ lrdwmc , jdbcType=VARCHAR },</if>
<if test="identitycard != null and identitycard != ''">identitycard = #{ identitycard , jdbcType=VARCHAR },</if>
<if test="sex != null and sex != ''">sex = #{ sex , jdbcType=VARCHAR },</if>
<if test="birthday != null and birthday != ''">birthday = #{ birthday , jdbcType=VARCHAR },</if>
<if test="telephone != null and telephone != ''">telephone = #{ telephone , jdbcType=VARCHAR },</if>
<if test="unitname != null and unitname != ''">unitname = #{ unitname , jdbcType=VARCHAR },</if>
<if test="ip != null and ip != ''">ip = #{ ip , jdbcType=VARCHAR },</if>
<if test="grade != null and grade != ''">grade = #{ grade , jdbcType=VARCHAR },</if>
<if test="policemanid != null and policemanid != ''">policemanid = #{ policemanid , jdbcType=VARCHAR },</if>
<if test="defaultDesktop != null and defaultDesktop != ''">default_desktop =
#{ defaultDesktop , jdbcType=VARCHAR },
</if>
<if test="theme != null and theme != ''">theme = #{ theme , jdbcType=VARCHAR },</if>
<if test="lastlogintime != null and lastlogintime != ''">lastlogintime =
#{ lastlogintime , jdbcType=VARCHAR },
</if>
<if test="lastchecktime != null and lastchecktime != ''">lastchecktime =
#{ lastchecktime , jdbcType=VARCHAR },
</if>
<if test="xxzyurl != null and xxzyurl != ''">xxzyurl = #{ xxzyurl , jdbcType=VARCHAR },</if>
<if test="gzzmZhy != null and gzzmZhy != ''">gzzm_zhy = #{ gzzmZhy , jdbcType=VARCHAR },</if>
<if test="gzzmYpy != null and gzzmYpy != ''">gzzm_ypy = #{ gzzmYpy , jdbcType=VARCHAR },</if>
<if test="gzzmZcy != null and gzzmZcy != ''">gzzm_zcy = #{ gzzmZcy , jdbcType=VARCHAR },</if>
<if test="gzzmPlay != null and gzzmPlay != ''">gzzm_play = #{ gzzmPlay , jdbcType=VARCHAR },</if>
<if test="glybz != null and glybz != ''">glybz = #{ glybz , jdbcType=VARCHAR },</if>
<if test="tqyhbz != null and tqyhbz != ''">tqyhbz = #{ tqyhbz , jdbcType=VARCHAR },</if>
<if test="jgzPhotoZm != null and jgzPhotoZm != ''">jgz_photo_zm = #{ jgzPhotoZm , jdbcType=VARCHAR },</if>
<if test="jgzPhotoFm != null and jgzPhotoFm != ''">jgz_photo_fm = #{ jgzPhotoFm , jdbcType=VARCHAR },</if>
<if test="zbzxDwdm != null and zbzxDwdm != ''">zbzx_dwdm = #{ zbzxDwdm , jdbcType=VARCHAR },</if>
<if test="grdf != null and grdf != ''">grdf = #{ grdf , jdbcType=VARCHAR },</if>
gxsj=now()
where id=#{id ,jdbcType=VARCHAR }
</update>
<!-- 查询用户照片表是否有数据 -->
<select id="getUserZpCount" resultType="int" parameterType="org.springblade.modules.system.entity.SysNewUser">
SELECT
COUNT(1)
FROM
sys_user_ryzp
sys_user_wsryzp
WHERE
identitycard = #{identitycard}
</select>
<!-- 录入用户照片 的数据-->
<insert id="insertUserPhoto" parameterType="org.springblade.modules.system.entity.SysNewUser">
INSERT INTO sys_user_ryzp (
INSERT INTO sys_user_wsryzp (
identitycard
,policemanid
,zmjgzp
......@@ -316,9 +494,56 @@
and id = #{ id , jdbcType=VARCHAR }
</select>
<select id="getWsUserByBh" parameterType="java.lang.String"
resultType="org.springblade.modules.system.entity.SysNewUser">
SELECT id as id,
unitcode as unitcode,
username as username,
password as password,
true_name as trueName,
open_flag as openFlag,
default_model as defaultModel,
remark as remark,
lrr as lrr,
lrsj as lrsj,
gxr as gxr,
gxsj as gxsj,
lrdwdm as lrdwdm,
lrdwmc as lrdwmc,
identitycard as identitycard,
sex as sex,
birthday as birthday,
telephone as telephone,
unitname as unitname,
scbz as scbz,
ip as ip,
grade as grade,
policemanid as policemanid,
default_desktop as defaultDesktop,
theme as theme,
lastlogintime as lastlogintime,
lastchecktime as lastchecktime,
xxzyurl as xxzyurl,
gzzm_zhy as gzzmZhy,
gzzm_ypy as gzzmYpy,
gzzm_zcy as gzzmZcy,
gzzm_play as gzzmPlay,
glybz as glybz,
tqyhbz as tqyhbz,
jgz_photo_zm as jgzPhotoZm,
jgz_photo_fm as jgzPhotoFm,
zbzx_dwdm as zbzxDwdm,
grdf as grdf
FROM sys_user_wsyh
where scbz = '0'
and id = #{ id , jdbcType=VARCHAR }
</select>
<!-- 修改用户照片 的数据-->
<update id="updateUserPhoto" parameterType="org.springblade.modules.system.entity.SysNewUser">
UPDATE sys_user_ryzp SET
UPDATE sys_user_wsryzp SET
<if test="policemanid != null and policemanid != ''">policemanid = #{ policemanid , jdbcType=VARCHAR },</if>
<if test="zmjgzp != null and zmjgzp != ''">zmjgzp = #{ zmjgzp , jdbcType=VARCHAR },</if>
<if test="fmjgzp != null and fmjgzp != ''">fmjgzp = #{ fmjgzp , jdbcType=VARCHAR },</if>
......@@ -582,7 +807,7 @@
<sql id="sh-where">
WHERE
us.scbz = '0'
and xz.${codeLevCol} = #{userUnitCode}
<if test="username != null and username != ''">
and us.username LIKE concat('%',#{username},'%')
</if>
......
src/main/java/org/springblade/modules/system/mapper/UserMapper.java
......@@ -49,6 +49,7 @@ public interface UserMapper extends BaseMapper<User> {
*/
User getUser(String tenantId, String account, String password);
SysNewUser getUserNew(@Param("account")String account, @Param("password")String password);
SysNewUser getWsUserNew(@Param("account")String account, @Param("password")String password);
SysNewUser getUserNewByID(String id);
/**
* 获取角色名
......
src/main/java/org/springblade/modules/system/mapper/UserMapper.xml
......@@ -102,6 +102,50 @@
</select>
<select id="getWsUserNew" resultType="org.springblade.modules.system.entity.SysNewUser" parameterType="java.lang.String">
SELECT
id as id,
unitcode as unitcode,
username as username,
password as password,
true_name as trueName,
open_flag as openFlag,
default_model as defaultModel,
remark as remark,
lrr as lrr,
lrsj as lrsj,
gxr as gxr,
gxsj as gxsj,
lrdwdm as lrdwdm,
lrdwmc as lrdwmc,
identitycard as identitycard,
sex as sex,
birthday as birthday,
telephone as telephone,
unitname as unitname,
scbz as scbz,
ip as ip,
grade as grade,
policemanid as policemanid,
default_desktop as defaultDesktop,
theme as theme,
lastlogintime as lastlogintime,
lastchecktime as lastchecktime,
xxzyurl as xxzyurl,
gzzm_zhy as gzzmZhy,
gzzm_ypy as gzzmYpy,
gzzm_zcy as gzzmZcy,
gzzm_play as gzzmPlay,
glybz as glybz,
tqyhbz as tqyhbz,
jgz_photo_zm as jgzPhotoZm,
jgz_photo_fm as jgzPhotoFm,
zbzx_dwdm as zbzxDwdm,
grdf as grdf
FROM sys_user_wsyh
where open_flag='1' and scbz='0'
and username = #{account} and password = #{password}
</select>
<select id="getUserNewByID" resultType="org.springblade.modules.system.entity.SysNewUser" parameterType="java.lang.String">
SELECT
......
src/main/java/org/springblade/modules/system/service/impl/ISysUserServiceImpl.java
......@@ -38,10 +38,52 @@ public class ISysUserServiceImpl implements ISysUserService {
if(StringUtils.isEmpty(identitycard)){
throw new Exception("身份证号不能为空");
}
int count = sysUserMapper.judgePolicemanid(policemanid, identitycard, id);
if(count > 0){
int jhcount = sysUserMapper.judgePolicemanid(policemanid, null, id);
jhcount =jhcount+ sysUserMapper.wsjudgePolicemanid(policemanid, null, id);
if(jhcount > 0){
throw new Exception("当前警号已有数据, 请更换警号");
}
int sfzcount = sysUserMapper.judgePolicemanid(null, identitycard, id);
sfzcount =sfzcount+ sysUserMapper.wsjudgePolicemanid(null, identitycard, id);
if(sfzcount > 0){
throw new Exception("当前证件号码已有数据, 请更换证件号码");
}
String jhshzt = sysUserMapper.judgeShPolicemanid(policemanid, null, null);
if (!org.springframework.util.StringUtils.isEmpty(jhshzt) && "1".equals(jhshzt)){
throw new Exception("当前警号信息已申请注册，暂未审核，请联系管理员。");
}
String sfzshzt = sysUserMapper.judgeShPolicemanid(null, identitycard, null);
if (!org.springframework.util.StringUtils.isEmpty(sfzshzt) && "1".equals(sfzshzt)){
throw new Exception("当前身份证号码已申请注册，暂未审核，请联系管理员。");
}
return true;
}
private boolean shjudgePolicemanidCount(String policemanid, String identitycard, String id) throws Exception{
//判断该警号是否唯一
if(StringUtils.isEmpty(policemanid)){
throw new Exception("警号不能为空");
}
if(StringUtils.isEmpty(identitycard)){
throw new Exception("身份证号不能为空");
}
int jhcount = sysUserMapper.judgePolicemanid(policemanid, null, id);
jhcount =jhcount+ sysUserMapper.wsjudgePolicemanid(policemanid, null, id);
if(jhcount > 0){
throw new Exception("当前警号已有数据, 请更换警号");
}
int sfzcount = sysUserMapper.judgePolicemanid(null, identitycard, id);
sfzcount =sfzcount+ sysUserMapper.wsjudgePolicemanid(null, identitycard, id);
if(sfzcount > 0){
throw new Exception("当前证件号码已有数据, 请更换证件号码");
}
return true;
}
@Override
......@@ -81,6 +123,33 @@ public class ISysUserServiceImpl implements ISysUserService {
public String shtgsubmit(SysNewUser user) throws Exception {
if(shjudgePolicemanidCount(user.getPolicemanid(), user.getIdentitycard(),null)){
XzxtUser xzxtUser = SecureUtil.getUserXzxt();
String jyxxzjbh = xxzjbhService.getXxzjbh(xzxtUser.getUnitcode(),null);//xxzjbh
user.setId(jyxxzjbh);
user.setPassword(user.getPassword());
// String xxzjbh = xxzjbhService.getXxzjbh(xzxtUser.getUnitcode(),null);//xxzjbh
// user.setId(xxzjbh);
user.setDjUser(xzxtUser);
sysUserMapper.shtgsubmit(user);
//默认赋值基础角色的权限
//获取基础角色的roleid
//判断数据库里是否有当前身份证号码的数据，如果有就修改，如果没有就新增
if(sysUserMapper.getUserZpCount(user) == 0){
sysUserMapper.insertUserPhoto(user);
}else{
sysUserMapper.updateUserPhoto(user);
}
return jyxxzjbh;
}
return null;
}
// 用户的列表展示
@Override
......@@ -145,19 +214,34 @@ public class ISysUserServiceImpl implements ISysUserService {
String newPassword = sysNewUser.getNewPassword();//新密码
String newPassword1 = sysNewUser.getNewPassword1();//新密码
SysNewUser userByBh = sysUserMapper.getUserByBh(id);
if (!newPassword.equals(newPassword1)) {
throw new ServiceException("请输入正确的确认密码!");
}
if (!userByBh.getPassword().equals(DigestUtil.encrypt(oldPassword))) {
throw new ServiceException("原密码不正确!");
}
XzxtUser xzxtUser = SecureUtil.getUserXzxt();
sysNewUser.setUpUser(xzxtUser);
if(userByBh!=null) {
if (!newPassword.equals(newPassword1)) {
throw new ServiceException("请输入正确的确认密码!");
}
if (!userByBh.getPassword().equals(DigestUtil.encrypt(oldPassword))) {
throw new ServiceException("原密码不正确!");
}
XzxtUser xzxtUser = SecureUtil.getUserXzxt();
sysNewUser.setUpUser(xzxtUser);
// id
sysNewUser.setPassword(DigestUtil.encrypt(newPassword));
sysUserMapper.updateUserNew(sysNewUser);
sysNewUser.setPassword(DigestUtil.encrypt(newPassword));
sysUserMapper.updateUserNew(sysNewUser);
}else {
userByBh = sysUserMapper.getWsUserByBh(id);
if (!newPassword.equals(newPassword1)) {
throw new ServiceException("请输入正确的确认密码!");
}
if (!userByBh.getPassword().equals(DigestUtil.encrypt(oldPassword))) {
throw new ServiceException("原密码不正确!");
}
XzxtUser xzxtUser = SecureUtil.getUserXzxt();
sysNewUser.setUpUser(xzxtUser);
// id
sysNewUser.setPassword(DigestUtil.encrypt(newPassword));
sysUserMapper.updateWsUserNew(sysNewUser);
}
}
......@@ -248,24 +332,15 @@ public class ISysUserServiceImpl implements ISysUserService {
public List<SysNewUser> getUserShList(SysNewUser sysNewUser) throws Exception {
XzxtUser xzxtUser = SecureUtil.getUserXzxt();
String dwUnitCode = xzxtUser.getUnitcode(); //当前单位代码
String userGrade = xzxtUser.getGrade(); //用户等级
System.out.println("从系统中获取的用户等级" + userGrade);
//加一个判断，如果有这个权限，表明可以看所有的用户
//------2023-03-17 去掉F010101和F010102菜单，用户信息管理菜单默认权限为本单位及以下 begin------
// int a = sysUserMapper.getCodeNum(xzxtUser.getId(), "F010101");
int a = 0;
//------2023-03-17 去掉F010101和F010102菜单，用户信息管理菜单默认权限为本单位及以下 end------
// if(a > 0){
dwUnitCode = "460000000000";
userGrade = "S";
// }else{
// return new ArrayList<>();
// }
String grade = sysUserMapper.getHqdwGrade(dwUnitCode); //单位所在级别
Map<String, String> mapDwLevCode = HqXjDwCommon.getMapDwLevCode(dwUnitCode, grade);
sysNewUser.setCodeLevCol(mapDwLevCode.get("codeLevCol"));
sysNewUser.setUserUnitCode(dwUnitCode);
// String userGrade = xzxtUser.getGrade(); //用户等级
// System.out.println("从系统中获取的用户等级" + userGrade);
//
// dwUnitCode = "460000000000";
// String grade = sysUserMapper.getHqdwGrade(dwUnitCode); //单位所在级别
//
// Map<String, String> mapDwLevCode = HqXjDwCommon.getMapDwLevCode(dwUnitCode, grade);
// sysNewUser.setCodeLevCol(mapDwLevCode.get("codeLevCol"));
// sysNewUser.setUserUnitCode(dwUnitCode);
List<SysNewUser> userNewList = sysUserMapper.getUserShList(sysNewUser);
return userNewList;
......@@ -291,7 +366,7 @@ public class ISysUserServiceImpl implements ISysUserService {
}
SysNewUser user = sysUserMapper.getShUserDetail(sysNewUser.getId());
user.setOpenFlag("1");
String xxzjbh = submit(user);
String xxzjbh = shtgsubmit(user);
if (StringUtils.isNotEmpty(xxzjbh)){
sysNewUser.setOpenFlag("1");
a = sysUserMapper.updateUserSh(sysNewUser);
......
src/main/java/org/springblade/modules/system/service/impl/UserServiceImpl.java
......@@ -145,6 +145,8 @@ public class UserServiceImpl extends BaseServiceImpl<UserMapper, User> implement
}
}else {
userNew = baseMapper.getWsUserNew(account, password);
}
userInfo.setUser(userNew);
......
src/main/resources/application-dev.yml
......@@ -11,9 +11,9 @@ spring:
# password: Hnxzxt
# database: 0
# ssl: false
host: 47.92.223.200
port: 7779
password: p!ssw0rd1
host: 192.168.1.123
port: 6379
password:
database: 0
ssl: false
##redis 集群环境配置
......
src/main/resources/application.yml
......@@ -121,3 +121,6 @@ blade:
column: tenant_id
tables:
- blade_notice
#字典码文件存放位置
jsonPath: E://data//cgccjjson
ssdw: '460000000000'
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment