Skip to content

J
jyzb_platformV2
Commit 90f5ac16 by 李小惠
Options

新增字典配置获取接口（目的是为修复表单流程bug）

parent 950837f9
正在显示 包含 52 行增加 和 8 行删除
app-log/log_error.log
This source diff could not be displayed because it is too large. You can view the blob instead.
app-log/log_total.log
This source diff could not be displayed because it is too large. You can view the blob instead.
jyzb-biz/src/main/java/com/junmp/jyzb/controller/PublicController.java
package com.junmp.jyzb.controller; package com.junmp.jyzb.controller;
import cn.hutool.core.collection.CollectionUtil;
import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.ObjectUtil;
import cn.hutool.core.util.StrUtil; import cn.hutool.core.util.StrUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
...@@ -24,10 +25,14 @@ import com.junmp.v2.common.exception.base.ServiceException; ...@@ -24,10 +25,14 @@ import com.junmp.v2.common.exception.base.ServiceException;
import com.junmp.v2.common.exception.enums.DefaultBizExceptionEnum; import com.junmp.v2.common.exception.enums.DefaultBizExceptionEnum;
import com.junmp.v2.common.util.BeanPlusUtil; import com.junmp.v2.common.util.BeanPlusUtil;
import com.junmp.v2.dict.api.bean.req.SysDictItemReq; import com.junmp.v2.dict.api.bean.req.SysDictItemReq;
import com.junmp.v2.dict.api.bean.vo.SimpleDictItemVo;
import com.junmp.v2.dict.api.bean.vo.SimpleDictVo;
import com.junmp.v2.dict.api.exception.DictException; import com.junmp.v2.dict.api.exception.DictException;
import com.junmp.v2.dict.api.exception.DictExceptionEnum; import com.junmp.v2.dict.api.exception.DictExceptionEnum;
import com.junmp.v2.dict.entity.SysDict;
import com.junmp.v2.dict.entity.SysDictItem; import com.junmp.v2.dict.entity.SysDictItem;
import com.junmp.v2.dict.service.SysDictItemService; import com.junmp.v2.dict.service.SysDictItemService;
import com.junmp.v2.dict.service.SysDictService;
import com.junmp.v2.file.api.bean.req.SysFileInfoReq; import com.junmp.v2.file.api.bean.req.SysFileInfoReq;
import com.junmp.v2.file.api.bean.res.SysFileInfoResp; import com.junmp.v2.file.api.bean.res.SysFileInfoResp;
import com.junmp.v2.file.biz.entity.SysFileInfo; import com.junmp.v2.file.biz.entity.SysFileInfo;
...@@ -47,6 +52,8 @@ import java.io.File; ...@@ -47,6 +52,8 @@ import java.io.File;
import java.io.FileInputStream; import java.io.FileInputStream;
import java.io.IOException; import java.io.IOException;
import java.net.URL; import java.net.URL;
import java.util.List;
import java.util.stream.Collectors;
/** /**
* <pre> * <pre>
...@@ -71,6 +78,9 @@ public class PublicController { ...@@ -71,6 +78,9 @@ public class PublicController {
@Resource @Resource
private PublicService publicService; private PublicService publicService;
@Resource
private SysDictService sysDictService;
private final static String DB_URL_TEMPLATE = "jdbc:mysql://{}:{}/{}?autoReconnect=true&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=CONVERT_TO_NULL&useSSL=false&serverTimezone=CTT&nullCatalogMeansCurrent=true"; private final static String DB_URL_TEMPLATE = "jdbc:mysql://{}:{}/{}?autoReconnect=true&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=CONVERT_TO_NULL&useSSL=false&serverTimezone=CTT&nullCatalogMeansCurrent=true";
...@@ -110,11 +120,24 @@ public class PublicController { ...@@ -110,11 +120,24 @@ public class PublicController {
return ApiRes.success(publicService.addDictType(req)); return ApiRes.success(publicService.addDictType(req));
} }
// @PostMapping("/aaa") @GetMapping(
// public ApiRes<String> aaa(PolicemanReq req){ name = "查询所有字典项#enable",
// path = {"/getAllDictItem"}
// return String; )
// } public ApiRes<List<SimpleDictVo>> getAllDictItem() {
List<SysDict> list = sysDictService.list();
if (CollectionUtil.isNotEmpty(list)) {
List<SimpleDictVo> tempList = (List)list.stream().map((it) -> {
SimpleDictVo dict = (SimpleDictVo)BeanPlusUtil.toBean(it, SimpleDictVo.class);
List<SimpleDictItemVo> itemVoList = publicService.findListByDict(dict.getDictId());
dict.setItemList(itemVoList);
return dict;
}).collect(Collectors.toList());
return ApiRes.success(tempList);
} else {
return ApiRes.failure("暂无数据");
}
}
} }
jyzb-biz/src/main/java/com/junmp/jyzb/service/PublicService.java
package com.junmp.jyzb.service; package com.junmp.jyzb.service;
import com.junmp.v2.dict.api.bean.req.SysDictItemReq; import com.junmp.v2.dict.api.bean.req.SysDictItemReq;
import com.junmp.v2.dict.api.bean.vo.SimpleDictItemVo;
import java.util.List;
public interface PublicService { public interface PublicService {
Long addDictType(SysDictItemReq req); Long addDictType(SysDictItemReq req);
List<SimpleDictItemVo> findListByDict(Long dictId);
} }
jyzb-biz/src/main/java/com/junmp/jyzb/service/impl/PublicServiceImpl.java
package com.junmp.jyzb.service.impl; package com.junmp.jyzb.service.impl;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.junmp.jyzb.service.PublicService; import com.junmp.jyzb.service.PublicService;
import com.junmp.v2.common.enums.StatusEnum; import com.junmp.v2.common.enums.StatusEnum;
import com.junmp.v2.common.util.BeanPlusUtil; import com.junmp.v2.common.util.BeanPlusUtil;
import com.junmp.v2.dict.api.bean.req.SysDictItemReq; import com.junmp.v2.dict.api.bean.req.SysDictItemReq;
import com.junmp.v2.dict.api.bean.vo.SimpleDictItemVo;
import com.junmp.v2.dict.api.exception.DictException; import com.junmp.v2.dict.api.exception.DictException;
import com.junmp.v2.dict.api.exception.DictExceptionEnum; import com.junmp.v2.dict.api.exception.DictExceptionEnum;
import com.junmp.v2.dict.entity.SysDictItem; import com.junmp.v2.dict.entity.SysDictItem;
...@@ -13,6 +15,8 @@ import lombok.extern.slf4j.Slf4j; ...@@ -13,6 +15,8 @@ import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import javax.annotation.Resource; import javax.annotation.Resource;
import java.util.List;
@Service @Service
@Slf4j @Slf4j
public class PublicServiceImpl implements PublicService { public class PublicServiceImpl implements PublicService {
...@@ -20,6 +24,8 @@ public class PublicServiceImpl implements PublicService { ...@@ -20,6 +24,8 @@ public class PublicServiceImpl implements PublicService {
@Resource @Resource
private SysDictItemService sysDictItemService; private SysDictItemService sysDictItemService;
public Long addDictType(SysDictItemReq req){ public Long addDictType(SysDictItemReq req){
SysDictItem sysDictType = (SysDictItem) BeanPlusUtil.toBean(req, SysDictItem.class); SysDictItem sysDictType = (SysDictItem) BeanPlusUtil.toBean(req, SysDictItem.class);
LambdaQueryWrapper<SysDictItem> eq = new LambdaQueryWrapper<SysDictItem>().eq(SysDictItem::getDictId, req.getItemText()).eq(SysDictItem::getItemText, req.getDictId()); LambdaQueryWrapper<SysDictItem> eq = new LambdaQueryWrapper<SysDictItem>().eq(SysDictItem::getDictId, req.getItemText()).eq(SysDictItem::getItemText, req.getDictId());
...@@ -34,4 +40,14 @@ public class PublicServiceImpl implements PublicService { ...@@ -34,4 +40,14 @@ public class PublicServiceImpl implements PublicService {
return sysDictType.getDictItemId(); return sysDictType.getDictItemId();
} }
@Override
public List<SimpleDictItemVo> findListByDict(Long dictId) {
LambdaQueryWrapper<SysDictItem> wp = Wrappers.lambdaQuery();
wp.eq(SysDictItem::getDictId, dictId);
wp.eq(SysDictItem::getDelFlag,0);
List<SimpleDictItemVo> voList = BeanPlusUtil.toBeanList(sysDictItemService.list(wp), SimpleDictItemVo.class);
return voList;
}
} }
jyzb-biz/src/main/resources/mapper/OrderMainMapper.xml
...@@ -88,7 +88,7 @@ ...@@ -88,7 +88,7 @@
and ( end_org_user_id = #{userId} and ( end_org_user_id = #{userId}
or history_assign like CONCAT('%', #{userId}, '%') or current_assign like CONCAT('%', #{userId}, '%')) or history_assign like CONCAT('%', #{userId}, '%') or current_assign like CONCAT('%', #{userId}, '%'))
</if> </if>
<if test="req.orderType=='out'"> <if test="req.orderType=='out' or req.orderType=='OUT'">
and (start_org_user_id = #{userId} and (start_org_user_id = #{userId}
or history_assign like CONCAT('%', #{userId}, '%') or current_assign like CONCAT('%', #{userId}, '%')) or history_assign like CONCAT('%', #{userId}, '%') or current_assign like CONCAT('%', #{userId}, '%'))
</if> </if>
...@@ -100,7 +100,7 @@ ...@@ -100,7 +100,7 @@
and (end_org_name LIKE CONCAT('%', #{req.name}, '%') and (end_org_name LIKE CONCAT('%', #{req.name}, '%')
or supplier_name LIKE CONCAT('%', #{req.name}, '%') or return_user LIKE CONCAT('%', #{req.name}, '%') ) or supplier_name LIKE CONCAT('%', #{req.name}, '%') or return_user LIKE CONCAT('%', #{req.name}, '%') )
</if> </if>
<if test="req.name!=null and req.name!='' and req.orderType=='out'"> <if test="req.name!=null and req.name!='' and (req.orderType=='out' or req.orderType=='OUT')">
and (start_org_name LIKE CONCAT('%', #{req.name}, '%') and (start_org_name LIKE CONCAT('%', #{req.name}, '%')
or supplier_name LIKE CONCAT('%', #{req.name}, '%') or return_user LIKE CONCAT('%', #{req.name}, '%') ) or supplier_name LIKE CONCAT('%', #{req.name}, '%') or return_user LIKE CONCAT('%', #{req.name}, '%') )
</if> </if>
......
jyzb-boot/src/main/resources/application-prod.yml
...@@ -32,7 +32,7 @@ knife4j: ...@@ -32,7 +32,7 @@ knife4j:
spring: spring:
datasource: datasource:
driver-class-name: com.mysql.cj.jdbc.Driver driver-class-name: com.mysql.cj.jdbc.Driver
url: jdbc:mysql://192.168.1.128:3306/db_jyzb?autoReconnect=true&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=CONVERT_TO_NULL&useSSL=false&serverTimezone=CTT&nullCatalogMeansCurrent=true url: jdbc:mysql://192.168.1.128:3306/db_jyzb_test?autoReconnect=true&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=CONVERT_TO_NULL&useSSL=false&serverTimezone=CTT&nullCatalogMeansCurrent=true
username: root username: root
password: 123456 password: 123456
......
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论