Skip to content

J
jyzb_platformV2
Commit 03383b2d by 李小惠
Options

修改表单接口，新增一键生成账号接口，添加定时任务

parent 5daed088
正在显示 包含 100 行增加 和 14 行删除
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/EquipmentTypeController.java
......@@ -52,7 +52,7 @@ public class EquipmentTypeController {
return ApiRes.success(equipmentTypeService.changeEquipmentState(req));
}
@PostMapping(path="/",name="查询类别列表#enable")
@PostMapping(path="/ShowEquipmentList",name="查询类别列表#enable")
@ApiOperation("查询类别列表")
public ApiRes<List<EquipmentTypeDto>> ShowEquipmentList(@RequestBody QueryEquipmentTypeReq req) {
return ApiRes.success(equipmentTypeService.getEquipmentList(req));
......
jyzb-biz/src/main/java/com/junmp/jyzb/controller/PoliceController.java
......@@ -32,6 +32,7 @@ import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
import java.io.IOException;
import java.util.List;
import java.util.Map;
......@@ -313,7 +314,7 @@ public class PoliceController {
}
@PostMapping(path = "/oneClickAccountCreation",name = "一键生成账号（运维，管理，审核）#logType=30")
public ApiRes<Boolean> oneClickAccountCreation(@RequestBody PubOrg pubOrg){
public ApiRes<Boolean> oneClickAccountCreation(@RequestBody PubOrg pubOrg) throws IOException {
return ApiRes.success(policemanService.oneClickAccountCreation(pubOrg));
}
......
jyzb-biz/src/main/java/com/junmp/jyzb/controller/PublicController.java
......@@ -2,7 +2,9 @@ package com.junmp.jyzb.controller;
import cn.hutool.core.util.ObjectUtil;
import cn.hutool.core.util.StrUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.AES;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.junmp.jyzb.api.bean.dto.UploadPolicePhotoDto;
import com.junmp.jyzb.api.bean.query.DbAccessReq;
import com.junmp.jyzb.api.bean.query.PolicemanReq;
......@@ -13,10 +15,19 @@ import com.junmp.jyzb.entity.Policeman;
import com.junmp.jyzb.entity.PubOrg;
import com.junmp.jyzb.service.PolicemanService;
import com.junmp.jyzb.service.PubOrgService;
import com.junmp.jyzb.service.PublicService;
import com.junmp.jyzb.utils.FileUtil;
import com.junmp.v2.common.bean.request.ValidationApi;
import com.junmp.v2.common.bean.response.ApiRes;
import com.junmp.v2.common.enums.StatusEnum;
import com.junmp.v2.common.exception.base.ServiceException;
import com.junmp.v2.common.exception.enums.DefaultBizExceptionEnum;
import com.junmp.v2.common.util.BeanPlusUtil;
import com.junmp.v2.dict.api.bean.req.SysDictItemReq;
import com.junmp.v2.dict.api.exception.DictException;
import com.junmp.v2.dict.api.exception.DictExceptionEnum;
import com.junmp.v2.dict.entity.SysDictItem;
import com.junmp.v2.dict.service.SysDictItemService;
import com.junmp.v2.file.api.bean.req.SysFileInfoReq;
import com.junmp.v2.file.api.bean.res.SysFileInfoResp;
import com.junmp.v2.file.biz.entity.SysFileInfo;
......@@ -24,6 +35,7 @@ import com.junmp.v2.file.biz.service.SysFileInfoService;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.compress.utils.IOUtils;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;
......@@ -56,6 +68,9 @@ public class PublicController {
@Resource
private PolicemanService policemanService;
@Resource
private PublicService publicService;
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";
......@@ -86,4 +101,14 @@ public class PublicController {
return ApiRes.success(policemanService.uploadPolicePhoto(picture,req));
}
@PostMapping(
name = "添加字典类型#logType=30",
path = {"/sys/dictType"}
)
public ApiRes<Long> addDictType(@RequestBody @Validated({ValidationApi.add.class}) SysDictItemReq req) {
return ApiRes.success(publicService.addDictType(req));
}
}
jyzb-biz/src/main/java/com/junmp/jyzb/mapper/PolicemanMapper.java
......@@ -63,5 +63,5 @@ public interface PolicemanMapper extends BaseMapper<Policeman> {
List<UserDto> alignUserInfo(@Param("orgId") Long orgId, @Param("date")String date);
List<UserDto> oneClickAccountCreation(@Param("orgId") Long orgId);
List<UserDto> oneClickAccountCreation(@Param("orgId") Long orgId,@Param("account")String account,@Param("roleId")Long roleId);
}
\ No newline at end of file
jyzb-biz/src/main/java/com/junmp/jyzb/service/PolicemanService.java
......@@ -22,6 +22,7 @@ import com.junmp.v2.sys.api.bean.user.req.SysUserReq;
import com.junmp.v2.sys.api.bean.user.req.UserOrgReq;
import org.springframework.web.multipart.MultipartFile;
import java.io.IOException;
import java.util.List;
public interface PolicemanService extends IService<Policeman> {
......@@ -123,5 +124,5 @@ public interface PolicemanService extends IService<Policeman> {
List<UserDto> alignUserInfo(PolicemanReq req);
boolean oneClickAccountCreation(PubOrg pubOrg);
boolean oneClickAccountCreation(PubOrg pubOrg) throws IOException;
}
jyzb-biz/src/main/java/com/junmp/jyzb/service/PublicService.java 0 → 100644
package com.junmp.jyzb.service;
import com.junmp.v2.dict.api.bean.req.SysDictItemReq;
public interface PublicService {
Long addDictType(SysDictItemReq req);
}
jyzb-biz/src/main/java/com/junmp/jyzb/service/impl/PublicServiceImpl.java 0 → 100644
package com.junmp.jyzb.service.impl;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.junmp.jyzb.service.PublicService;
import com.junmp.v2.common.enums.StatusEnum;
import com.junmp.v2.common.util.BeanPlusUtil;
import com.junmp.v2.dict.api.bean.req.SysDictItemReq;
import com.junmp.v2.dict.api.exception.DictException;
import com.junmp.v2.dict.api.exception.DictExceptionEnum;
import com.junmp.v2.dict.entity.SysDictItem;
import com.junmp.v2.dict.service.SysDictItemService;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
@Service
@Slf4j
public class PublicServiceImpl implements PublicService {
@Resource
private SysDictItemService sysDictItemService;
public Long addDictType(SysDictItemReq req){
SysDictItem sysDictType = (SysDictItem) BeanPlusUtil.toBean(req, SysDictItem.class);
LambdaQueryWrapper<SysDictItem> eq = new LambdaQueryWrapper<SysDictItem>().eq(SysDictItem::getDictId, req.getItemText()).eq(SysDictItem::getItemText, req.getDictId());
boolean flag = sysDictItemService.count(eq) > 0L;
if (flag) {
throw new DictException(DictExceptionEnum.DICT_NAME_REPEAT);
} else {
sysDictType.setStatusFlag(StatusEnum.ENABLE.getCode());
sysDictItemService.save(sysDictType);
}
return sysDictType.getDictItemId();
}
}
jyzb-biz/src/main/resources/mapper/PolicemanMapper.xml
......@@ -360,13 +360,26 @@ WHERE o.org_id IN
</select>
<select id="oneClickAccountCreation" resultType="com.junmp.jyzb.api.bean.dto.FetchingDataDto.UserDto">
select t.*,uo.org_id FROM (
SELECT u.* FROM `sys_user_copy1` u where u.account like "gl33%" or u.account like "yw33%" or u.account like "sh33%") as t
join sys_user_org_copy1 uo on t.user_id=uo.user_id
SELECT u.* FROM `sys_user` u
<if test="account==null">
where u.account like "gl33%" or u.account like "yw33%" or u.account like "sh33%"
</if>
<if test="account != null and account != ''">
where u.account like #{account}
</if>
) as t
join sys_user_org uo on t.user_id=uo.user_id
<if test="orgId != null and orgId != ''">
and uo.org_id=#{orgId}
</if>
join sys_user_role_copy1 ur on t.user_id=ur.user_id
join sys_role r on ur.role_id=r.role_id and r.role_id in ("1528003832557232130","1663372320355389441","1663372027127402498")
join sys_user_role ur on t.user_id=ur.user_id
join sys_role r on ur.role_id=r.role_id
<if test="roleId==null">
and r.role_id in ("1528003832557232130","1663372320355389441","1663372027127402498")
</if>
<if test="roleId != null and roleId != ''">
and r.role_id =#{roleId}
</if>
order by uo.org_id
</select>
......
jyzb-process/src/main/java/com/junmp/junmpProcess/controller/BpmnController.java
......@@ -86,7 +86,7 @@ public class BpmnController {
}
@ApiOperation("创建新表单")
@PostMapping("createForm")
public ApiRes<Boolean> createForm(@RequestBody FormReq formReq) {
public ApiRes<String> createForm(@RequestBody FormReq formReq) {
return ApiRes.success(WorkProcessService.createNewForm(formReq));
}
@ApiOperation("终止流程")
......
jyzb-process/src/main/java/com/junmp/junmpProcess/service/Bussiness/WorkProcessService.java
......@@ -25,7 +25,7 @@ public interface WorkProcessService {
*
* @return
*/
Boolean createNewForm(FormReq processVO) ;
String createNewForm(FormReq processVO) ;
/**
* 终止流程实例
......
jyzb-process/src/main/java/com/junmp/junmpProcess/service/Bussiness/impl/WorkProcessServiceImpl.java
......@@ -274,7 +274,7 @@ public class WorkProcessServiceImpl extends ServiceImpl<ProcessTemplatesMapper,
* @Params:
* @Return
*/
public Boolean createNewForm(FormReq req) {
public String createNewForm(FormReq req) {
ProcessTemplates processTemplates = ProcessTemplates.builder().build();
String templateId = idWorker.nextId()+"";
......@@ -284,10 +284,10 @@ public class WorkProcessServiceImpl extends ServiceImpl<ProcessTemplatesMapper,
processTemplates.setRemark(req.getRemark());
processTemplates.setIsStop(false);
Date date= new Date();
processTemplates.setConfig(req.getConfig());
processTemplates.setUpdated(date);
processTemplateService.save(processTemplates);
return true;
return processTemplates.getTemplateId();
}
......@@ -399,7 +399,7 @@ public class WorkProcessServiceImpl extends ServiceImpl<ProcessTemplatesMapper,
processTemplates.setFormName(process.getFormName());
processTemplates.setRemark(process.getRemark());
processTemplates.setUpdated(new Date());
processTemplates.setConfig(process.getConfig());
return processTemplateService.updateById(processTemplates);//更新表单明细表信息
......
jyzb-process/src/main/java/com/junmp/junmpProcess/service/impl/SysFormServiceImpl.java
......@@ -62,6 +62,7 @@ public class SysFormServiceImpl extends ServiceImpl<ProcessTemplatesMapper, Proc
processTemplates.setIsStop(true);
Date date= new Date();
processTemplates.setUpdated(date);
processTemplates.setConfig(req.getConfig());
processTemplateService.save(processTemplates);
return templateId;
}
......
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论