OA/zentao
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compare commits

base: OA:storymuchexec_250108
Branches Tags
OA:main OA:storymuchexec_250108
..
compare: OA:main
Branches Tags
OA:storymuchexec_250108 OA:main

1 Commits
storymuche ... main

Author SHA1 Message Date
郭其兵
84a7595792 发布id查询 2025-01-08 14:54:33 +08:00
266 changed files with 3326 additions and 23873 deletions
Expand all files Collapse all files

0
src/main/resources/templates/scope测试.xlsx → README.md
View File

81
pom.xml
View File

@ -19,80 +19,13 @@
</properties>
<dependencies>
<dependency>
<groupId>com.itextpdf</groupId>
<artifactId>itextpdf</artifactId>
<version>5.5.12</version>
</dependency>
<dependency>
<groupId>com.itextpdf.tool</groupId>
<artifactId>xmlworker</artifactId>
<version>5.5.12</version>
</dependency>
<dependency>
<groupId>com.itextpdf</groupId>
<artifactId>itext-asian</artifactId>
<version>5.2.0</version>
</dependency>
<dependency>
<groupId>com.itextpdf</groupId>
<artifactId>itext7-core</artifactId>
<version>7.1.16</version>
<type>pom</type>
</dependency>
<dependency>
<groupId>com.itextpdf</groupId>
<artifactId>html2pdf</artifactId>
<version>3.0.4</version>
</dependency>
<dependency>
<groupId>org.apache.pdfbox</groupId>
<artifactId>pdfbox</artifactId>
<version>2.0.33</version>
</dependency>
<!-- <dependency>-->
<!-- <groupId>org.jsoup</groupId>-->
<!-- <artifactId>jsoup</artifactId>-->
<!-- <version>1.13.1</version>-->
<!-- </dependency>-->
<!-- <dependency>-->
<!-- <groupId>com.itextpdf</groupId>-->
<!-- <artifactId>itext7-core</artifactId>-->
<!-- <version>7.1.9</version>-->
<!-- <type>pom</type>-->
<!-- </dependency>-->
<dependency>
<groupId>org.apache.poi</groupId>
<artifactId>poi-ooxml</artifactId>
<version>5.2.2</version> <!-- 使用最新版本 -->
</dependency>
<dependency>
<groupId>com.deepoove</groupId>
<artifactId>poi-tl</artifactId>
<version>1.5.0</version>
</dependency>
<dependency>
<groupId>com.sun.mail</groupId>
<artifactId>javax.mail</artifactId>
<version>1.5.2</version>
</dependency>
<dependency>
<groupId>com.alibaba</groupId>
<artifactId>easyexcel</artifactId>
<version>3.0.5</version>
</dependency>
@ -169,18 +102,6 @@
<version>3.5.5</version>
</dependency>
<!-- <dependency>-->
<!-- <groupId>com.baomidou</groupId>-->
<!-- <artifactId>mybatis-plus-spring-boot3-starter</artifactId>-->
<!-- <version>3.5.5</version>-->
<!-- </dependency>-->
<!-- <dependency>-->
<!-- <groupId>com.baomidou</groupId>-->
<!-- <artifactId>dynamic-datasource-spring-boot3-starter</artifactId>-->
<!-- <version>4.2.0</version>-->
<!-- </dependency>-->
<!-- <dependency>-->
<!-- <groupId>com.baomidou</groupId>-->
<!-- <artifactId>mybatis-plus-spring-boot3-starter</artifactId>-->

8
src/main/java/com/sa/zentao/ZentaoApplication.java
View File

@ -3,18 +3,20 @@ package com.sa.zentao;
import org.mybatis.spring.annotation.MapperScan;
import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication;
import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration;
import org.springframework.context.annotation.ComponentScan;
import org.springframework.scheduling.annotation.EnableScheduling;
//,exclude = DataSourceAutoConfiguration.class
@SpringBootApplication(scanBasePackages = {"com.sa.zentao"})
@MapperScan({"com.sa.zentao.mapper","com.sa.**.mapper"})
@EnableScheduling
public class ZentaoApplication {
//
public static void main(String[] args) {
SpringApplication.run(ZentaoApplication.class, args);
}
}

4
src/main/java/com/sa/zentao/conf/AfterRunner.java
View File

@ -30,8 +30,7 @@ public class AfterRunner implements ApplicationRunner {
@Autowired
private com.sa.zentao.task.SpringTaskJob springTaskJob;
@Autowired
private IZtYwTaskService ywTaskService;
@ -43,7 +42,6 @@ public class AfterRunner implements ApplicationRunner {
springTaskJob.dkEveryDay();
new Thread(new DevopsRunner()).start();
// ywTaskService.remindMail();;
}

4
src/main/java/com/sa/zentao/conf/CodeGenerator.java
View File

@ -22,7 +22,7 @@ public class CodeGenerator {
//自己的名字
static String Author = "gqb";
public static String tableName = "car_driving_license";
public static String tableName = "zt_notice";
/**
* <p>
@ -53,7 +53,7 @@ public class CodeGenerator {
mpg.setGlobalConfig(gc);
// 数据源配置
DataSourceConfig dsc = new DataSourceConfig();
dsc.setUrl("jdbc:mysql://192.168.1.161:3306/zentao_dev?useUnicode=true&useSSL=false&characterEncoding=utf8");
dsc.setUrl("jdbc:mysql://192.168.1.161:3306/zentao?useUnicode=true&useSSL=false&characterEncoding=utf8");
// dsc.setSchemaName("public");
dsc.setDriverName("com.mysql.cj.jdbc.Driver");
// dsc.setUsername("root");

2
src/main/java/com/sa/zentao/conf/DevopsRunner.java
View File

@ -46,7 +46,7 @@ public class DevopsRunner implements Runnable{
List<ZtCronDevopsUser> list = cronDevopsUserService.list(new QueryWrapper<ZtCronDevopsUser>().lambda().eq(ZtCronDevopsUser::getDevopsId, d.getId()));
if(!CollectionUtils.isEmpty(list)){
for (ZtCronDevopsUser u:list) {
SendEmail.sendMail(u.getMail(),"尊敬的"+u.getUsername()+d.getContent(),null);
SendEmail.sendMail(u.getMail(),"尊敬的"+u.getUsername()+d.getContent());
}
}

5
src/main/java/com/sa/zentao/conf/JwtAuthenticationFilter.java
View File

@ -29,6 +29,9 @@ import java.util.Objects;
public class JwtAuthenticationFilter implements jakarta.servlet.Filter {
public void init(FilterConfig filterConfig) throws ServletException {
}
public void doFilter(jakarta.servlet.ServletRequest request, jakarta.servlet.ServletResponse servletResponse
@ -66,8 +69,6 @@ public class JwtAuthenticationFilter implements jakarta.servlet.Filter {
RiskUserThreadLocal.set(u);
RiskUserThreadLocal.risk.set(u);
}
}else{
RiskUserThreadLocal.risk.set(null);
}
filterChain.doFilter(request,servletResponse);
}

5
src/main/java/com/sa/zentao/conf/LoginRiskUser.java
View File

@ -76,11 +76,10 @@ public class LoginRiskUser implements Serializable {
* 联系电话
*/
private String contactTel;
//用户属性
private UserType userType;
public String getRiskUserId(){
public int getRiskUserId(){
return name;
return userId;
}
}

28
src/main/java/com/sa/zentao/conf/ParamOutAspect.java
View File

@ -5,7 +5,6 @@ import com.fasterxml.jackson.annotation.PropertyAccessor;
import com.fasterxml.jackson.core.JsonProcessingException;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.fasterxml.jackson.databind.SerializationFeature;
import com.sa.zentao.dao.BusinessException;
import jakarta.servlet.http.HttpServletResponse;
import lombok.extern.slf4j.Slf4j;
import org.aspectj.lang.ProceedingJoinPoint;
@ -55,13 +54,7 @@ public class ParamOutAspect {
*/
MethodSignature signature = (MethodSignature) joinPoint.getSignature();
Method method = signature.getMethod();
String params ="";
try {
params=getRequestParams(request, joinPoint);
}catch (Exception e){
log.error("",e);
}
String params = getRequestParams(request, joinPoint);
/**
* 入参日志
@ -76,15 +69,9 @@ public class ParamOutAspect {
log.info("token : " + authorization);
String str =request.getRequestURI().replaceAll("/+$","");
Object proceed=null;
try {
proceed = joinPoint.proceed();
}catch (Exception e){
log.error("",e);
throw new BusinessException(e.getMessage());
}
Object proceed = joinPoint.proceed();
@ -95,17 +82,8 @@ public class ParamOutAspect {
// }
// }
//17462126 proceed,proceed==null?null:proceed.toString().length()
try {
int length = proceed==null?null:proceed.toString().length(); //分页日志太多不打印
if(length<59591){
log.info("[AOP-LOG-END-返回 ]\n\t{} {} size=", proceed,proceed==null?null:proceed.toString().length());
}
}catch (Exception e){
}
log.info("[AOP-LOG-END-返回]\n\t{}", proceed);
return proceed;
}

10
src/main/java/com/sa/zentao/conf/RiskUserThreadLocal.java
View File

@ -37,11 +37,11 @@ public class RiskUserThreadLocal {
if(loginRiskUser==null){
return false;
}
if("admin".equals(loginRiskUser.getAccount())){
return true;
}else{
return false;
}
if(loginRiskUser.getRiskUserId()==2){
return true;
}else{
return false;
}
}
}

119
src/main/java/com/sa/zentao/controller/BaseMenuController.java
View File

@ -1,119 +0,0 @@
package com.sa.zentao.controller;
import com.alibaba.fastjson.JSON;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.sa.zentao.conf.LoginRiskUser;
import com.sa.zentao.conf.RiskUserThreadLocal;
import com.sa.zentao.dao.BusinessException;
import com.sa.zentao.dao.Result;
import com.sa.zentao.entity.BaseMenu;
import com.sa.zentao.entity.BaseRoleAuthority;
import com.sa.zentao.qo.BaseMenuQo;
import com.sa.zentao.service.IBaseMenuService;
import com.sa.zentao.service.IBaseRoleAuthorityService;
import com.sa.zentao.service.IBaseRoleService;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import java.util.List;
import java.util.stream.Collectors;
/**
* <p>
* 前端控制器
* </p>
*
* @author jobob
* @since 2021-05-28
*/
@Slf4j
@RestController
@RequestMapping("/base-menu")
public class BaseMenuController {
@Autowired
private IBaseMenuService baseMenuService;
@Autowired
private IBaseRoleAuthorityService baseRoleAuthorityService;
@Autowired
private IBaseRoleService baseRoleService;
@RequestMapping("/insertMenu")
public Result insertMenu(@RequestBody BaseMenuQo vo){
log.info("--- 新增菜单 param --{}", JSON.toJSONString(vo));
LoginRiskUser loginRiskUser = RiskUserThreadLocal.risk.get();
return Result.success(baseMenuService.saveMenu(vo,loginRiskUser));
}
@RequestMapping("/getInfoById")
public Result<BaseMenu> getInfoById(@RequestParam("id") Integer id){
log.info("--- 通过ID获取菜单信息 param --{}", id);
return Result.success(baseMenuService.selectById(id));
}
@RequestMapping("/updateMenu")
public Result updateMenu(@RequestBody BaseMenuQo vo){
log.info("--- 修改菜单 param --{}", JSON.toJSONString(vo));
LoginRiskUser loginRiskUser = RiskUserThreadLocal.risk.get();
return Result.success(baseMenuService.saveMenu(vo, loginRiskUser));
}
@RequestMapping("/deleteMenu")
public Result deleteMenu(@RequestParam("id") Integer id){
log.info("--- 删除菜单 param --{}", id);
LoginRiskUser loginRiskUser = RiskUserThreadLocal.risk.get();
return Result.success(baseMenuService.deleteMenu(id,loginRiskUser));
}
@RequestMapping("/moveUp")
public Result moveUp(@RequestParam("id") Integer id){
log.info("--- 上移菜单 param --{}", id);
return Result.success(baseMenuService.moveUp(id));
}
@RequestMapping("/moveDown")
public Result moveDown(@RequestParam("id") Integer id){
log.info("--- 下移菜单 param --{}", id);
return Result.success(baseMenuService.moveDown(id));
}
@PostMapping("/menuTree")
public Result menuTree(){
log.info("--- Tree param --{}");
List<BaseMenu> list = baseMenuService.list();
LoginRiskUser loginRiskUser = RiskUserThreadLocal.risk.get();
if(loginRiskUser==null){
throw new BusinessException("未登录");
}
// if(loginRiskUser.getUserId()==1){
// return Result.success(list);
// }
return Result.success(baseMenuService.menuTree(loginRiskUser));
}
@GetMapping("/baseMenuTree")
public Result baseMenuTree(){
return Result.success(baseMenuService.baseMenuTree());
}
@GetMapping("/roleMenuIds")
public Result roleMenuIds(@RequestParam("roleId") Long roleId){
log.info("--- Tree param --{}");
List<BaseMenu> list = baseMenuService.list();
LoginRiskUser loginRiskUser = RiskUserThreadLocal.risk.get();
if(loginRiskUser==null){
throw new BusinessException("未登录");
}
List<BaseRoleAuthority> listAuth = baseRoleAuthorityService.list(new QueryWrapper<BaseRoleAuthority>().lambda().eq(BaseRoleAuthority::getRoleId, roleId));
return Result.success(listAuth.stream().map(o->o.getMenuId()).collect(Collectors.toList()));
}
}

151
src/main/java/com/sa/zentao/controller/BaseRoleController.java
View File

@ -1,151 +0,0 @@
package com.sa.zentao.controller;
import com.alibaba.fastjson.JSON;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.github.pagehelper.PageInfo;
import com.sa.zentao.conf.LoginRiskUser;
import com.sa.zentao.conf.RiskUserThreadLocal;
import com.sa.zentao.dao.BaseRoleDTO;
import com.sa.zentao.dao.BusinessException;
import com.sa.zentao.dao.Result;
import com.sa.zentao.entity.BaseRole;
import com.sa.zentao.qo.BaseRoleQo;
import com.sa.zentao.service.IBaseRoleService;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import org.springframework.web.context.request.RequestContextHolder;
import org.springframework.web.context.request.ServletRequestAttributes;
import javax.servlet.http.HttpServletRequest;
import java.util.List;
import java.util.Objects;
/**
* <p>
* 前端控制器
* </p>
*
* @author jobob
* @since 2021-05-28
*/
@Slf4j
@RestController
@RequestMapping("/base-role")
public class BaseRoleController {
@Autowired
private IBaseRoleService baseRoleService;
/**
* 新增
*/
@RequestMapping("add")
public Result add(@RequestBody BaseRoleDTO baseRoleDTO) {
LoginRiskUser loginRiskUser = RiskUserThreadLocal.risk.get();
log.info("新增角色 --{},操作人--{}", JSON.toJSONString(baseRoleDTO), JSON.toJSONString(loginRiskUser));
if (Objects.isNull(loginRiskUser)){
throw new BusinessException("未登录");
}
ServletRequestAttributes servletRequestAttributes = (ServletRequestAttributes) RequestContextHolder.getRequestAttributes();
jakarta.servlet.http.HttpServletRequest request = servletRequestAttributes.getRequest();
BaseRole oldName = baseRoleService.getOne(new QueryWrapper<BaseRole>().eq("name", baseRoleDTO.getName()));
if (oldName != null) {
throw new BusinessException("重复");
}
baseRoleService.add(baseRoleDTO);
return Result.success();
}
/**
* 删除
*/
@RequestMapping("delete")
public Result delete(@RequestBody BaseRoleQo baseRoleVo) {
LoginRiskUser loginRiskUser = RiskUserThreadLocal.risk.get();
if (Objects.isNull(loginRiskUser)){
throw new BusinessException("未登录");
}
ServletRequestAttributes servletRequestAttributes = (ServletRequestAttributes) RequestContextHolder.getRequestAttributes();
if (baseRoleVo.getRoleId()==null) {
throw new BusinessException("当前不存在");
}
BaseRole baseRole = baseRoleService.getById(baseRoleVo.getRoleId());
log.info("删除角色 --{},操作人--{}", JSON.toJSONString(baseRole), JSON.toJSONString(loginRiskUser));
baseRoleService.delete(baseRole,baseRoleVo);
return Result.success();
}
/**
* 修改
*/
@RequestMapping("modify")
public Result modify(@RequestBody BaseRoleDTO baseRoleDTO) {
LoginRiskUser loginRiskUser = RiskUserThreadLocal.risk.get();
log.info("修改角色 --{},操作人--{}", JSON.toJSONString(baseRoleDTO), JSON.toJSONString(loginRiskUser));
if (Objects.isNull(loginRiskUser)){
throw new BusinessException("请登录");
}
ServletRequestAttributes servletRequestAttributes = (ServletRequestAttributes) RequestContextHolder.getRequestAttributes();
BaseRole oldName = baseRoleService.getOne(new QueryWrapper<BaseRole>().eq("name", baseRoleDTO.getName()));
BaseRole baseRole = baseRoleService.getById(baseRoleDTO.getId());
if (Objects.nonNull(oldName) && !Objects.equals(oldName.getId(),baseRole.getId())){
throw new BusinessException("数据重复");
}
baseRoleService.modify(baseRoleDTO, baseRole);
return Result.success();
}
/**
* 角色列表
*/
@RequestMapping("/pageList")
public Result<PageInfo<BaseRoleDTO>> pageList(@RequestBody BaseRoleQo vo){
log.info("--- 用户列表 param --{}", JSON.toJSONString(vo));
LoginRiskUser loginRiskUser = RiskUserThreadLocal.risk.get();
if (Objects.isNull(loginRiskUser)){
throw new BusinessException("请登录");
}
PageInfo<BaseRoleDTO> list = baseRoleService.selectPageList(vo);
return Result.success(list);
}
/**
* 根据角色id查询对应信息
* @return
*/
@RequestMapping("/getInfoById")
public Result getInfoById(Integer id){
log.info("--- 据角色id查询对应信息 param --{}", JSON.toJSONString(id));
BaseRoleDTO baseRoleDTO = baseRoleService.getInfoById(id);
return Result.success(baseRoleDTO);
}
/**
* 根据角色id查询对应信息
* @return
*/
@RequestMapping("/getUserRoleIds")
public Result getUserRoleIds(@RequestBody BaseRoleQo vo ){
List<Integer> userRoles= baseRoleService.getUserRoleIds(vo.getAccount());
return Result.success(userRoles);
}
}

20
src/main/java/com/sa/zentao/controller/BaseUserRoleController.java
View File

@ -1,20 +0,0 @@
package com.sa.zentao.controller;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
/**
* <p>
* 前端控制器
* </p>
*
* @author gqb
* @since 2025-04-16
*/
@RestController
@RequestMapping("/base-user-role")
public class BaseUserRoleController {
}

20
src/main/java/com/sa/zentao/controller/CarDrivingLicenseController.java
View File

@ -1,20 +0,0 @@
package com.sa.zentao.controller;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
/**
* <p>
* 前端控制器
* </p>
*
* @author gqb
* @since 2025-06-16
*/
@RestController
@RequestMapping("/car-driving-license")
public class CarDrivingLicenseController {
}

20
src/main/java/com/sa/zentao/controller/CarFiveTypeController.java
View File

@ -1,20 +0,0 @@
package com.sa.zentao.controller;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
/**
* <p>
* 前端控制器
* </p>
*
* @author gqb
* @since 2025-06-16
*/
@RestController
@RequestMapping("/car-five-type")
public class CarFiveTypeController {
}

118
src/main/java/com/sa/zentao/controller/CarManageController.java
View File

@ -1,118 +0,0 @@
package com.sa.zentao.controller;
import com.sa.zentao.dao.*;
import com.sa.zentao.entity.CarDrivingLicense;
import com.sa.zentao.entity.CarFiveType;
import com.sa.zentao.entity.CarOperatingVehicleLevel;
import com.sa.zentao.entity.ZtFile;
import com.sa.zentao.service.impl.CarManageService;
import com.sa.zentao.utils.BeanCopyUtil;
import com.sa.zentao.utils.BeanCopyUtilCallBack;
import com.sa.zentao.utils.CarConstant;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import java.util.List;
import java.util.Map;
/**
* <p>
* 前端控制器
* </p>
*
* @author gqb
* @since 2025-04-16
*/
@RestController
@RequestMapping("/car-manage")
public class CarManageController {
@Autowired
private CarManageService carManageService;
/**
* 查询五项
* @param plate
* @param model
* @return
*/
@GetMapping("/searchFive")
public Result removeFile(@RequestParam(value = "plate",required = true)String plate,@RequestParam(value = "model",required = false)String model,@RequestParam(value = "userName",required = false)String userName){
if(plate.length()==8&&"02".equals(model)){
model="52";
}
if(plate.length()==8&&"01".equals(model)){
model="51";
}
CarFiveType carFiveType = carManageService.searchFive(plate, model,userName);
if(carFiveType!=null){
CarFiveTypeDTO carFiveTypeDTO = new CarFiveTypeDTO();
BeanUtils.copyProperties(carFiveType,carFiveTypeDTO);
return Result.success(carFiveTypeDTO);
}
return Result.success(carFiveType);
}
/**
* 查询行驶证
* @param plate
* @param model
* @return
*/
@GetMapping("/drivingLicense")
public Result drivingLicense(@RequestParam(value = "plate",required = true)String plate,@RequestParam(value = "model",required = true)String model,@RequestParam(value = "owner",required = false)String owner){
if(plate.length()==8&&"02".equals(model)){
model="52";
}
if(plate.length()==8&&"01".equals(model)){
model="51";
}
CarDrivingLicense carDrivingLicense = carManageService.drivingLicense(plate, model, owner);
if(carDrivingLicense!=null){
CarDrivingLicenseDTO carDrivingLicenseDTO = new CarDrivingLicenseDTO();
BeanUtils.copyProperties(carDrivingLicense, carDrivingLicenseDTO);
return Result.success(carDrivingLicenseDTO);
}
return Result.success(carDrivingLicense);
}
/**
* 查询行驶证
* @param plate
* @param
* @return
*/
@GetMapping("/operatingVehicle")
public Result operatingVehicle(@RequestParam(value = "plate",required = true)String plate){
List<CarOperatingVehicleLevel> carOperatingVehicleLevel = carManageService.operatingVehicle(plate);
if(carOperatingVehicleLevel!=null){
List<CarOperatingVehicleLevelDTO> carOperatingVehicleLevels = BeanCopyUtil.copyListProperties(carOperatingVehicleLevel, CarOperatingVehicleLevelDTO::new, new BeanCopyUtilCallBack<CarOperatingVehicleLevel, CarOperatingVehicleLevelDTO>() {
@Override
public void callBack(CarOperatingVehicleLevel t, CarOperatingVehicleLevelDTO s) {
if(s.getStatus().equals(3)){
s.setDescription(t.getMsg());
return ;
}
if (s.getName().equals("疑似营运车辆")) {
} else {
Map<String, String> stringStringMap = CarConstant.OPERATINGCAR.get(s.getName());
String s1 = stringStringMap.get(s.getValue());
s.setDescription(s1);
}
}
});
return Result.success(carOperatingVehicleLevels);
}
return Result.success(carOperatingVehicleLevel);
}
}

20
src/main/java/com/sa/zentao/controller/CarOperatingVehicleLevelController.java
View File

@ -1,20 +0,0 @@
package com.sa.zentao.controller;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
/**
* <p>
* 前端控制器
* </p>
*
* @author gqb
* @since 2025-06-16
*/
@RestController
@RequestMapping("/car-operating-vehicle-level")
public class CarOperatingVehicleLevelController {
}

210
src/main/java/com/sa/zentao/controller/CommonsController.java
View File

@ -1,7 +1,6 @@
package com.sa.zentao.controller;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.sa.zentao.ZentaoApplication;
import com.sa.zentao.conf.RiskUserThreadLocal;
import com.sa.zentao.dao.BusinessException;
import com.sa.zentao.dao.Code;
@ -9,20 +8,18 @@ import com.sa.zentao.dao.Result;
import com.sa.zentao.dao.UploadDTO;
import com.sa.zentao.entity.ZtFile;
import com.sa.zentao.service.IZtFileService;
import com.sa.zentao.service.VxService;
import com.sa.zentao.utils.DateUtils;
import com.sa.zentao.utils.UploadUtil;
import jakarta.servlet.http.HttpServletRequest;
import jakarta.servlet.http.HttpServletResponse;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils;
import org.apache.poi.ss.usermodel.*;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;
import java.io.*;
import java.io.ByteArrayOutputStream;
import java.io.FileInputStream;
import java.io.IOException;
import java.io.InputStream;
import java.lang.reflect.Method;
import java.net.URL;
import java.util.*;
@ -93,7 +90,7 @@ public class CommonsController {
// 写入文件到服务器的指定目录
java.nio.file.Files.write(path, bytes);
ZtFile f=new ZtFile();
f.setAddedby(RiskUserThreadLocal.get()==null?null:RiskUserThreadLocal.get().getName());
f.setAddedby(RiskUserThreadLocal.get().getName());
f.setAddeddate(new Date());
f.setDeleted("0");
f.setExtension(extension);
@ -109,27 +106,6 @@ public class CommonsController {
}
}
@PostMapping("/copyFile")
public Result copyFile( UploadDTO file){
String files = file.getFiles();
if(StringUtils.isEmpty(files)){
return Result.success();
}
String[] split = files.split(",");
List<ZtFile> ztFiles = this.fileService.listByIds(Arrays.asList(split));
for (ZtFile f:ztFiles) {
f.setId(null);
f.setObjecttype(null);
f.setObjectid(null);
}
this.fileService.saveBatch(ztFiles);
return Result.success(ztFiles);
}
@PostMapping("/removeFile")
public Result removeFile( UploadDTO file){
ZtFile ztFile = this.fileService.getById(file.getId());
@ -150,139 +126,79 @@ public class CommonsController {
return Result.success(list);
}
@Autowired
VxService vxxervice;
@GetMapping("/test")
public Result<String> upload(){
// downLoad("http://192.168.1.161:8088/file-download-1.html");
// vxxervice.sendMessageToVx("GuoQiBing","测试消息",new Date());
// 定义数据
// 定义数据
downLoad("http://192.168.1.161:8088/file-download-1.html");
return Result.success();
}
@PostMapping("/downLoad")
public void downLoad(UploadDTO file, HttpServletRequest request, HttpServletResponse response){
Integer id = file.getId();
if(id==null){
throw new BusinessException("未查询到数据");
}
ZtFile zfFile = this.fileService.getById(id);
if(zfFile==null){
throw new BusinessException("未查询到数据");
}
String pathname = zfFile.getPathname();
String substring = pathname.substring(pathname.lastIndexOf("/")+1, pathname.length());
try {
File f = new File(linuxFilePath+"/"+substring);
// File f = new File("D:\\1.bmp");
InputStream fis = new BufferedInputStream(new FileInputStream(linuxFilePath+"/"+substring));
// InputStream fis = new BufferedInputStream(new FileInputStream("D:\\1.bmp"));
byte[] buffer = new byte[fis.available()];
fis.read(buffer);
fis.close();
// 清空response
response.reset();
// 设置response的Header
response.addHeader("Content-Disposition", "attachment;filename=" + new String(substring.getBytes()));
response.addHeader("Content-Length", "" + f.length());
OutputStream toClient = new BufferedOutputStream(response.getOutputStream());
response.setContentType("application/octet-stream");
toClient.write(buffer);
toClient.flush();
toClient.close();
} catch (Exception e) {
e.printStackTrace();
}
}
public ZtFile downLoad(String u){
String os = System.getProperty("os.name");
String path=null;
if (os.toLowerCase().startsWith("win")) { //如果是Windows系统
log.info("win");
path=windowsFilePath ;
}else{ //linux和mac系统
log.info("linux");
path=linuxFilePath+"/";
}
int i = u.lastIndexOf("?");
int i2 = u.lastIndexOf("/");
String uname = u.substring(i2+1, i);
downloadByIO(u,path,uname);
public String downLoad(String u){
String ext = u.substring(u.lastIndexOf(".") + 1).toLowerCase();
StringBuffer buffername = new StringBuffer(u.substring(u.lastIndexOf("/")+1));
ZtFile f=new ZtFile();
f.setAddedby(RiskUserThreadLocal.get()==null?null:RiskUserThreadLocal.get().getName());
f.setAddeddate(new Date());
f.setDeleted("0");
f.setExtension(uname.substring(uname.lastIndexOf(".")+1, uname.length()));
f.setTitle(uname);
f.setSize(0);
f.setPathname(baseUrl+"/zentao/img/"+uname);
fileService.save(f);
return f;
}
public static void downloadByIO(String url, String saveDir, String fileName) {
BufferedOutputStream bos = null;
InputStream is = null;
URL url = null;
try {
byte[] buff = new byte[8192];
is = new URL(url).openStream();
File file = new File(saveDir, fileName);
file.getParentFile().mkdirs();
bos = new BufferedOutputStream(new FileOutputStream(file));
int count = 0;
while ((count = is.read(buff)) != -1) {
bos.write(buff, 0, count);
url = new URL(u);
InputStream inputStream = url.openStream();
// byte[] buffer = new byte[1024];
// int len;
ByteArrayOutputStream outStream = new ByteArrayOutputStream();
// while ((len = inputStream.read(buffer)) != -1) {
// outStream.write(buffer, 0, len);
// }
// byte[] buffer = new byte[1024];
// int len;
// String path="/data/"+"202407/03103347085011a0";
// FileInputStream fileInputStream = new FileInputStream(path);
// while ((len = fileInputStream.read(buffer)) != -1) {
// outStream.write(buffer, 0, len);
// }
// fileInputStream.close();
// 获取文件名
String fName = "1.png";
fName=fName.substring(fName.lastIndexOf("."),fName.length());
fName= DateUtils.formatDate(new Date(),"yyyyMMddHHmmss")+UUID.randomUUID().toString().replaceAll("-","")+fName;
// 获取文件的字节
byte[] bytes = outStream.toByteArray();
String p ="";
String os = System.getProperty("os.name");
if (os.toLowerCase().startsWith("win")) { //如果是Windows系统
log.info("win");
os=windowsFilePath +"\\";
}else{ //linux和mac系统
log.info("linux");
os=linuxFilePath+"/";
}
} catch (IOException e) {
// 使用文件名在服务器端创建文件
java.nio.file.Path path = java.nio.file.Paths.get(os + fName);
// 写入文件到服务器的指定目录
java.nio.file.Files.write(path, bytes);
String fileAbsolutePath =baseUrl+"/zentao/img/"+fName;
System.out.print(fileAbsolutePath);
outStream.close();
inputStream.close();
return fileAbsolutePath;
} catch (Exception e) {
e.printStackTrace();
} finally {
if (is != null) {
try {
is.close();
} catch (IOException e) {
e.printStackTrace();
}
}
if (bos != null) {
try {
bos.close();
} catch (IOException e) {
e.printStackTrace();
}
}
}
return null;
}
public static void main(String[] args) {
String u ="http://file-gk.sinoassist.com:38888/group1/M00/95/9E/wKgDd2etgTmAcL-gABfjLU1YfoI166.jpg?date=2025-02-13";
int i = u.lastIndexOf("?");
int i2 = u.lastIndexOf("/");
String substring = u.substring(i2+1, i);
String uname="wKgDd2etgTmAcL-gABfjLU1YfoI166.jpg";
String substring1 = uname.substring(uname.lastIndexOf(".")+1, uname.length());
System.out.print(substring1);
}
}

29
src/main/java/com/sa/zentao/controller/ZtBugBindUserController.java
View File

@ -1,29 +0,0 @@
package com.sa.zentao.controller;
import com.sa.zentao.dao.Result;
import com.sa.zentao.dao.UploadDTO;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
/**
* <p>
* 前端控制器
* </p>
*
* @author gqb
* @since 2025-05-13
*/
@RestController
@RequestMapping("/zt-bug-bound-user")
public class ZtBugBindUserController {
@PostMapping("/test")
public Result<String> upload(String name1,String name2){
return Result.success("<UNK>");
}
}

44
src/main/java/com/sa/zentao/controller/ZtBugController.java
View File

@ -2,7 +2,10 @@ package com.sa.zentao.controller;
import com.github.pagehelper.PageInfo;
import com.sa.zentao.dao.*;
import com.sa.zentao.dao.BusinessException;
import com.sa.zentao.dao.Result;
import com.sa.zentao.dao.ZtBugDTO;
import com.sa.zentao.dao.ZtCaseDTO;
import com.sa.zentao.entity.ZtBug;
import com.sa.zentao.qo.ZtBugQo;
import com.sa.zentao.qo.ZtProjectQo;
@ -52,21 +55,6 @@ public class ZtBugController {
return Result.success();
}
@RequestMapping(value = "/taskStoryAddBug", method = RequestMethod.POST, produces = "application/json; charset=UTF-8")
public Result taskStoryAddBug(@RequestBody ZtBugDTO dto){
bugService.taskStoryAddBug(dto);
return Result.success();
}
//批量新增bug
@RequestMapping(value = "/batchAddBug", method = RequestMethod.POST, produces = "application/json; charset=UTF-8")
public Result batchAddBug(@RequestBody ZtBugDTO dto){
bugService.batchAddBug(dto);
return Result.success();
}
@RequestMapping(value = "/editBug", method = RequestMethod.POST, produces = "application/json; charset=UTF-8")
public Result editBug(@RequestBody ZtBugDTO dto){
bugService.editBug(dto);
@ -88,8 +76,7 @@ public class ZtBugController {
@RequestMapping(value = "/bugById", method = RequestMethod.POST, produces = "application/json; charset=UTF-8")
public Result bugById(@RequestBody ZtBugQo qo){
return Result.success(bugService.getBugById(qo.getId()));
return Result.success(bugService.getById(qo.getId()));
}
@RequestMapping(value = "/assignedTo", method = RequestMethod.POST, produces = "application/json; charset=UTF-8")
@ -105,31 +92,12 @@ public class ZtBugController {
return Result.success(ztBugDTO);
}
//完成
//完成
@RequestMapping(value = "/resolved", method = RequestMethod.POST, produces = "application/json; charset=UTF-8")
public Result resolved(@RequestBody ZtBugDTO dto){
bugService.resolved(dto);
return Result.success();
}
//验收
@RequestMapping(value = "/bugYs", method = RequestMethod.POST, produces = "application/json; charset=UTF-8")
public Result bugYs(@RequestBody ZtBugDTO dto){
bugService.bugYs(dto);
return Result.success();
}
@RequestMapping(value = "/bugListByTaskStory", method = RequestMethod.POST, produces = "application/json; charset=UTF-8")
public Result bugListByTaskStory(@RequestBody ZtBugDTO dto){
return Result.success(bugService.bugListByTaskStory(dto));
}
//添加备注
@RequestMapping(value = "/addRemark", method = RequestMethod.POST, produces = "application/json; charset=UTF-8")
public Result addRemark(@RequestBody ZtBugDTO dto){
bugService.addRemark(dto);
return Result.success();
}
}

47
src/main/java/com/sa/zentao/controller/ZtComputerSourceController.java
View File

@ -1,47 +0,0 @@
package com.sa.zentao.controller;
import com.sa.zentao.dao.Result;
import com.sa.zentao.dao.ZtComputerSourceDTO;
import com.sa.zentao.dao.ZtStoryDTO;
import com.sa.zentao.qo.ZtComputerSourceQo;
import com.sa.zentao.qo.ZtProjectQo;
import com.sa.zentao.service.IZtComputerSourceService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.bind.annotation.RestController;
/**
* <p>
* 前端控制器
* </p>
*
* @author gqb
* @since 2025-04-07
*/
@RestController
@RequestMapping("/zt-computer-source")
public class ZtComputerSourceController {
@Autowired
private IZtComputerSourceService computerSourceService;
@RequestMapping(value = "/pageList", method = RequestMethod.POST, produces = "application/json; charset=UTF-8")
public Result<ZtComputerSourceDTO> storyPageList(@RequestBody ZtComputerSourceQo qo){
return Result.success(computerSourceService.pageList(qo));
}
@RequestMapping(value = "/add", method = RequestMethod.POST, produces = "application/json; charset=UTF-8")
public Result<ZtComputerSourceDTO> add(@RequestBody ZtComputerSourceDTO dto){
computerSourceService.addComputerSource(dto);
return Result.success();
}
@RequestMapping(value = "/modify", method = RequestMethod.POST, produces = "application/json; charset=UTF-8")
public Result<ZtComputerSourceDTO> modify(@RequestBody ZtComputerSourceDTO dto){
computerSourceService.modify(dto);
return Result.success();
}
}

90
src/main/java/com/sa/zentao/controller/ZtCountController.java
View File

@ -1,23 +1,29 @@
package com.sa.zentao.controller;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.sa.zentao.conf.RiskUserThreadLocal;
import com.sa.zentao.dao.*;
import com.sa.zentao.entity.ZtBug;
import com.sa.zentao.entity.ZtProject;
import com.sa.zentao.entity.ZtStory;
import com.sa.zentao.entity.ZtTask;
import com.sa.zentao.qo.ZtCountQo;
import com.sa.zentao.qo.ZtProjectQo;
import com.sa.zentao.service.IZtBugService;
import com.sa.zentao.service.IZtProjectService;
import com.sa.zentao.service.IZtStoryService;
import com.sa.zentao.service.IZtTaskService;
import com.sa.zentao.service.impl.IZtCountService;
import com.sa.zentao.utils.DateUtils;
import jakarta.servlet.ServletOutputStream;
import jakarta.servlet.http.HttpServletResponse;
import lombok.SneakyThrows;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.util.CollectionUtils;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.bind.annotation.RestController;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import java.math.BigDecimal;
import java.util.Date;
import java.util.HashMap;
@ -88,30 +94,11 @@ public class ZtCountController {
//导出项目统计
//work总量 月
@SneakyThrows
@RequestMapping(value = "/exportProjectCount", method = RequestMethod.POST, produces = "application/json; charset=UTF-8")
public void exportProjectCount(@RequestBody ZtCountQo qo, jakarta.servlet.ServletRequest request, jakarta.servlet.ServletResponse response){
ServletOutputStream outputStream = response.getOutputStream();
try {
response.setContentType("application/vnd.ms-excel;charset=UTF-8");
countService.exportProjectCount(qo,request,outputStream) ;
}catch (Exception e){
response.setContentType("application/json;charset=UTF-8");
throw new BusinessException("导出失败");
}finally {
outputStream.close();
response.flushBuffer();
}
countService.exportProjectCount(qo,request,response) ;
}
//导出员工绩效
@RequestMapping(value = "/exportScope", method = RequestMethod.POST, produces = "application/json; charset=UTF-8")
public void exportScope(@RequestBody ZtCountQo qo, jakarta.servlet.ServletRequest request, HttpServletResponse response){
countService.exportScope(qo,request,response) ;
}
//
@RequestMapping(value = "/projectList", method = RequestMethod.POST, produces = "application/json; charset=UTF-8")
public Result projectList(@RequestBody ZtCaseDTO dto){
@ -121,23 +108,6 @@ public class ZtCountController {
);
return Result.success(project) ;
}
@RequestMapping(value = "/projectListAsc", method = RequestMethod.POST, produces = "application/json; charset=UTF-8")
public Result projectListAsc(@RequestBody ZtCaseDTO dto){
List<Integer> authList = this.projectService.authList();
if(CollectionUtils.isEmpty(authList)){
return Result.success() ;
}
List<ZtProject> project = projectService.list(new QueryWrapper<ZtProject>().lambda().eq(ZtProject::getType, "program")
.in(ZtProject::getId,authList)
.eq(ZtProject::getStatus,"doing")
.eq(ZtProject::getDeleted,"0")
.orderByAsc(ZtProject::getId)
);
return Result.success(project) ;
}
//项目 任务 需求 等统计 项目统计 24-12-13改为项目集统计
@RequestMapping(value = "/projectInfoById", method = RequestMethod.POST, produces = "application/json; charset=UTF-8")
public Result projectInfoById(@RequestBody ZtCaseDTO dto){
@ -147,14 +117,17 @@ public class ZtCountController {
}
//系统需求
// @RequestMapping(value = "/projectInfoById", method = RequestMethod.POST, produces = "application/json; charset=UTF-8")
// public Result storyFeedbackCount(@RequestBody ZtCaseDTO dto){
//
// ZtStoryCountDTO result=countService.storyFeedbackCount(dto);
//
// return Result.success(result) ;
// }
@RequestMapping(value = "/myWorkScore", method = RequestMethod.POST, produces = "application/json; charset=UTF-8")
public Result<ZtStoryDTO> myWorkScore(@RequestBody ZtProjectQo qo){
if(qo.getDate()==null){
throw new BusinessException("请选择日期");
}
return Result.success(countService.myWorkScore(qo));
}
//我的需求列表
@RequestMapping(value = "/myStoryList", method = RequestMethod.POST, produces = "application/json; charset=UTF-8")
public Result<ZtStoryDTO> myStoryList(@RequestBody ZtProjectQo qo){
@ -186,23 +159,4 @@ public class ZtCountController {
public Result<ZtCronDevopsDTO> myDevops(@RequestBody ZtProjectQo qo){
return Result.success(countService.myDevops(qo));
}
//柱状图需求
@RequestMapping(value = "/storyBarChart", method = RequestMethod.POST, produces = "application/json; charset=UTF-8")
public Result<Map<String,String>> storyBarChart(@RequestBody ZtProjectQo qo){
return Result.success(countService.storyBarChart(qo));
}
//柱状图BUG
@RequestMapping(value = "/bugBarChart", method = RequestMethod.POST, produces = "application/json; charset=UTF-8")
public Result<Map<String,String>> bugBarChart(@RequestBody ZtProjectQo qo){
return Result.success(countService.bugBarChart(qo));
}
//绩效统计根据产品集
@RequestMapping(value = "/monthScopeByProgram", method = RequestMethod.POST, produces = "application/json; charset=UTF-8")
public Result<Map<String,String>> monthScopeByProgram(@RequestBody ZtProjectQo qo){
return Result.success(countService.monthScopeByProgram(qo));
}
}

65
src/main/java/com/sa/zentao/controller/ZtDevelopFeedbackController.java
View File

@ -1,65 +0,0 @@
package com.sa.zentao.controller;
import com.sa.zentao.dao.Result;
import com.sa.zentao.dao.ZtDevelopFeedbackDTO;
import com.sa.zentao.dao.ZtMeetingDTO;
import com.sa.zentao.qo.ZtFeedbackQo;
import com.sa.zentao.qo.ZtMeetingQo;
import com.sa.zentao.service.IZtDevelopFeedbackService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.bind.annotation.RestController;
import java.util.List;
/**
* <p>
* 前端控制器
* </p>
*
* @author gqb
* @since 2025-02-05
*/
@RestController
@RequestMapping("/zt-develop-feedback")
public class ZtDevelopFeedbackController {
@Autowired
private IZtDevelopFeedbackService developFeedbackService;
@RequestMapping(value = "/pageList", method = RequestMethod.POST, produces = "application/json; charset=UTF-8")
public Result<ZtMeetingDTO> storyPageList(@RequestBody ZtFeedbackQo qo){
return Result.success(developFeedbackService.pageList(qo));
}
@RequestMapping(value = "/add", method = RequestMethod.POST, produces = "application/json; charset=UTF-8")
public Result<ZtMeetingDTO> add(@RequestBody ZtDevelopFeedbackDTO dto){
developFeedbackService.add(dto);
return Result.success();
}
@RequestMapping(value = "/modify", method = RequestMethod.POST, produces = "application/json; charset=UTF-8")
public Result modify(@RequestBody ZtDevelopFeedbackDTO dto){
developFeedbackService.modify(dto);
return Result.success();
}
@RequestMapping(value = "/myFeedbackList", method = RequestMethod.POST, produces = "application/json; charset=UTF-8")
public Result myFeedbackList(@RequestBody ZtFeedbackQo qo){
List<ZtDevelopFeedbackDTO> list =developFeedbackService.myFeedbackList(qo);
return Result.success(list);
}
@RequestMapping(value = "/getFeedbackById", method = RequestMethod.POST, produces = "application/json; charset=UTF-8")
public Result getFeedbackById(@RequestBody ZtFeedbackQo qo){
ZtDevelopFeedbackDTO d =developFeedbackService.getFeedbackById(qo);
return Result.success(d);
}
}

18
src/main/java/com/sa/zentao/controller/ZtEffortController.java
View File

@ -6,10 +6,8 @@ import com.sa.zentao.dao.Result;
import com.sa.zentao.dao.ZtBugDTO;
import com.sa.zentao.dao.ZtEffortDTO;
import com.sa.zentao.entity.ZtEffort;
import com.sa.zentao.entity.ZtUser;
import com.sa.zentao.qo.EffortQo;
import com.sa.zentao.service.IZtEffortService;
import com.sa.zentao.service.IZtUserService;
import com.sa.zentao.utils.BeanCopyUtil;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.util.CollectionUtils;
@ -37,8 +35,7 @@ public class ZtEffortController {
@Autowired
private IZtEffortService effortService;
@Autowired
private IZtUserService userService;
@RequestMapping(value = "/batchAdd", method = RequestMethod.POST, produces = "application/json; charset=UTF-8")
public Result batchAdd(@RequestBody ZtEffortDTO dto){
@ -63,18 +60,7 @@ public class ZtEffortController {
if(CollectionUtils.isEmpty(list)){
return Result.success();
}
List<ZtEffortDTO> ztEffortDTOS = BeanCopyUtil.copyListProperties(list, ZtEffortDTO::new);
if(!CollectionUtils.isEmpty(ztEffortDTOS)){
Map<String, ZtUser> userMap = this.userService.userMapByIds(null);
for (ZtEffortDTO d:ztEffortDTOS){
ZtUser ztUser = userMap.get(d.getAccount());
if(ztUser!=null){
d.setAccountName(ztUser.getNickname());
}
}
}
return Result.success(ztEffortDTOS);
return Result.success(BeanCopyUtil.copyListProperties(list,ZtEffortDTO::new));
}
}

66
src/main/java/com/sa/zentao/controller/ZtMeetingController.java
View File

@ -1,66 +0,0 @@
package com.sa.zentao.controller;
import com.sa.zentao.dao.Result;
import com.sa.zentao.dao.ZtMeetingDTO;
import com.sa.zentao.qo.ZtMeetingQo;
import com.sa.zentao.qo.ZtProjectQo;
import com.sa.zentao.service.IZtMeetingService;
import jakarta.servlet.http.HttpServletRequest;
import jakarta.servlet.http.HttpServletResponse;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.bind.annotation.RestController;
/**
* <p>
* 前端控制器
* </p>
*
* @author gqb
* @since 2025-01-24
*/
@RestController
@RequestMapping("/zt-meeting")
public class ZtMeetingController {
@Autowired
private IZtMeetingService meetingService;
@RequestMapping(value = "/pageList", method = RequestMethod.POST, produces = "application/json; charset=UTF-8")
public Result<ZtMeetingDTO> storyPageList(@RequestBody ZtMeetingQo qo){
return Result.success(meetingService.pageList(qo));
}
@RequestMapping(value = "/add", method = RequestMethod.POST, produces = "application/json; charset=UTF-8")
public Result<ZtMeetingDTO> add(@RequestBody ZtMeetingDTO dto){
meetingService.add(dto);
return Result.success();
}
@RequestMapping(value = "/modify", method = RequestMethod.POST, produces = "application/json; charset=UTF-8")
public Result<ZtMeetingDTO> modify(@RequestBody ZtMeetingDTO dto){
meetingService.modify(dto);
return Result.success();
}
@RequestMapping(value = "/getMeetingById", method = RequestMethod.POST, produces = "application/json; charset=UTF-8")
public Result<ZtMeetingDTO> getMeetingById(@RequestBody ZtMeetingDTO dto){
ZtMeetingDTO d = meetingService.getMeetingById(dto);
return Result.success(d);
}
@RequestMapping(value = "/downLoadById", method = RequestMethod.POST)
public void downLoadById(@RequestBody ZtMeetingDTO dto, HttpServletResponse res, HttpServletRequest request){
meetingService.downLoadById(dto,res,request);
}
}

1
src/main/java/com/sa/zentao/controller/ZtModuleController.java
View File

@ -77,7 +77,6 @@ public class ZtModuleController {
if("story".equalsIgnoreCase(qo.getType())){
List<ZtModule> list = moduleService.list(new QueryWrapper<ZtModule>().lambda()
.eq(ZtModule::getRoot, qo.getId()).eq(ZtModule::getType, qo.getType())
.eq(ZtModule::getDeleted,"0")
);
return Result.success(list);
}

45
src/main/java/com/sa/zentao/controller/ZtMonthScoreController.java
View File

@ -1,45 +0,0 @@
package com.sa.zentao.controller;
import com.sa.zentao.dao.PerformanceDTO;
import com.sa.zentao.dao.Result;
import com.sa.zentao.dao.ZtMeetingDTO;
import com.sa.zentao.dao.ZtMonthScopeDTO;
import com.sa.zentao.service.IZtMonthScoreService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.bind.annotation.RestController;
/**
* <p>
* 前端控制器
* </p>
*
* @author gqb
* @since 2025-04-24
*/
@RestController
@RequestMapping("/zt-month-scope")
public class ZtMonthScoreController {
@Autowired
private IZtMonthScoreService monthScoreService;
@RequestMapping(value = "/save", method = RequestMethod.POST, produces = "application/json; charset=UTF-8")
public Result save(@RequestBody PerformanceDTO dto){
monthScoreService.saveScope(dto);
return Result.success();
}
@RequestMapping(value = "/resetScope", method = RequestMethod.POST, produces = "application/json; charset=UTF-8")
public Result resetScope(@RequestBody PerformanceDTO dto){
monthScoreService.resetScope(dto);
return Result.success();
}
}

6
src/main/java/com/sa/zentao/controller/ZtNoticeController.java
View File

@ -8,7 +8,6 @@ import com.sa.zentao.dao.ZtProjectDTO;
import com.sa.zentao.entity.ZtNotice;
import com.sa.zentao.qo.ZtProjectQo;
import com.sa.zentao.service.IZtNoticeService;
import com.sa.zentao.utils.DateUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
@ -16,7 +15,6 @@ import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.bind.annotation.RestController;
import java.util.Date;
import java.util.List;
/**
@ -39,9 +37,7 @@ public class ZtNoticeController {
public Result<PageInfo<ZtProjectDTO>> pageList(@RequestBody ZtProjectQo qo){
List<ZtNotice> list = noticeService.list(new QueryWrapper<ZtNotice>().lambda()
.eq(ZtNotice::getFlag, 0).orderByDesc(ZtNotice::getId)
.gt(ZtNotice::getLoseDate, DateUtils.dateSubDay(new Date(),15))
);
.eq(ZtNotice::getFlag, 0).orderByDesc(ZtNotice::getId));
return Result.success(list);

55
src/main/java/com/sa/zentao/controller/ZtProductController.java
View File

@ -3,12 +3,12 @@ package com.sa.zentao.controller;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.github.pagehelper.PageInfo;
import com.sa.zentao.dao.*;
import com.sa.zentao.entity.ZtExecutionproject;
import com.sa.zentao.dao.Result;
import com.sa.zentao.dao.ZtProductDTO;
import com.sa.zentao.dao.ZtProjectDTO;
import com.sa.zentao.entity.ZtProduct;
import com.sa.zentao.entity.ZtProjectproduct;
import com.sa.zentao.qo.ZtProjectQo;
import com.sa.zentao.service.IZtExecutionprojectService;
import com.sa.zentao.service.IZtProductService;
import com.sa.zentao.service.IZtProjectproductService;
import org.springframework.beans.factory.annotation.Autowired;
@ -40,9 +40,6 @@ public class ZtProductController {
@Autowired
private IZtProjectproductService projectproductService;
@Autowired
private IZtExecutionprojectService executionprojectService;
//项目集
@ -53,12 +50,6 @@ public class ZtProductController {
}
@RequestMapping(value = "/productTeamUpdate", method = RequestMethod.POST, produces = "application/json; charset=UTF-8")
public Result projectTeamUpdate(@RequestBody ZtProjectQo qo){
this.ztProductService.productTeamUpdate(qo);
return Result.success();
}
//产品
@RequestMapping(value = "/productPageList", method = RequestMethod.POST, produces = "application/json; charset=UTF-8")
public Result<PageInfo<ZtProjectDTO>> productPageList(@RequestBody ZtProjectQo qo){
@ -82,12 +73,6 @@ public class ZtProductController {
public Result<PageInfo<ZtProjectDTO>> productList(@RequestBody ZtProjectQo qo){
return Result.success(ztProductService.productList(qo));
}
@RequestMapping(value = "/myProductList", method = RequestMethod.POST, produces = "application/json; charset=UTF-8")
public Result<PageInfo<ZtProjectDTO>> myProductList(@RequestBody ZtProjectQo qo){
return Result.success(ztProductService.myProductList(qo));
}
@RequestMapping(value = "/productListByProductId", method = RequestMethod.POST, produces = "application/json; charset=UTF-8")
public Result<PageInfo<ZtProjectDTO>> productListByProductId(@RequestBody ZtProjectQo qo){
return Result.success(ztProductService.productListByProductId
@ -125,39 +110,5 @@ public class ZtProductController {
}
@RequestMapping(value = "/getProductByExecution", method = RequestMethod.POST, produces = "application/json; charset=UTF-8")
public Result getProductByExecution(@RequestBody ZtProductDTO dto){
ZtExecutionproject executionproject = this.executionprojectService.getOne(new QueryWrapper<ZtExecutionproject>().lambda().eq(ZtExecutionproject::getExecution, dto.getId()));
if(executionproject==null){
throw new BusinessException("未查询到迭代");
}
ZtProjectproduct project = projectproductService.getOne(new QueryWrapper<ZtProjectproduct>().lambda()
.eq(ZtProjectproduct::getProject, executionproject.getProject()));
if(project==null){
return Result.success();
}
ZtProduct product = ztProductService.getById(project.getProduct());
return Result.success(product);
}
@RequestMapping(value = "/getAllBusinessSelect", method = RequestMethod.POST, produces = "application/json; charset=UTF-8")
public Result getAllBusinessSelect(@RequestBody ZtAllBusinessDTO dto){
return Result.success(ztProductService.getAllBusinessSelect(dto));
}
@RequestMapping(value = "/searchObj", method = RequestMethod.POST, produces = "application/json; charset=UTF-8")
public Result searchObj(@RequestBody ZtAllBusinessDTO dto){
return Result.success(ztProductService.searchObj(dto));
}
//
@RequestMapping(value = "/productTeamByPid", method = RequestMethod.POST, produces = "application/json; charset=UTF-8")
public Result projectTeamById(@RequestBody ZtProjectQo qo){
return Result.success(this.ztProductService.productTeamByPid(qo));
}
}

86
src/main/java/com/sa/zentao/controller/ZtProjectController.java
View File

@ -13,7 +13,6 @@ import com.sa.zentao.service.IZtKanbancolumnService;
import com.sa.zentao.service.IZtKanbanlaneService;
import com.sa.zentao.service.IZtProductService;
import com.sa.zentao.service.IZtProjectService;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.util.CollectionUtils;
import org.springframework.web.bind.annotation.RequestBody;
@ -23,9 +22,7 @@ import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.bind.annotation.RestController;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
/**
* <p>
@ -37,7 +34,6 @@ import java.util.Map;
*/
@RestController
@RequestMapping("/zt-project")
@Slf4j
public class ZtProjectController {
@Autowired
@ -56,18 +52,6 @@ public class ZtProjectController {
return Result.success();
}
//获取项目信息
@RequestMapping(value = "/getProjectById", method = RequestMethod.POST, produces = "application/json; charset=UTF-8")
public Result getProjectById(@RequestBody ZtProjectDTO dto){
ZtProjectDTO p =ztProjectService.getProjectById(dto);
return Result.success(p);
}
//获取迭代信息
@RequestMapping(value = "/getExecutionById", method = RequestMethod.POST, produces = "application/json; charset=UTF-8")
public Result getExecutionById(@RequestBody ZtProjectDTO dto){
ZtProjectDTO p =ztProjectService.getExecutionById(dto);
return Result.success(p);
}
//修改执行
@RequestMapping(value = "/editImplement", method = RequestMethod.POST, produces = "application/json; charset=UTF-8")
public Result editImplement(@RequestBody ZtProjectDTO dto){
@ -227,7 +211,7 @@ public class ZtProjectController {
}
//项目列表
@RequestMapping(value = "/typeProjectList", method = RequestMethod.POST, produces = "application/json; charset=UTF-8")
@RequestMapping(value = "/typeProductList", method = RequestMethod.POST, produces = "application/json; charset=UTF-8")
public Result<List<ZtProjectDTO>> typeProductList(@RequestBody ZtProjectQo qo){
return Result.success(ztProjectService.typeProductList(qo));
@ -243,14 +227,9 @@ public class ZtProjectController {
//执行列表
@RequestMapping(value = "/implementPageList", method = RequestMethod.POST, produces = "application/json; charset=UTF-8")
public Result<PageInfo<ZtProjectDTO>> implementPageList(@RequestBody ZtProjectQo qo){
return Result.success(ztProjectService.implementPageList(qo));
}
//执行下拉列表 包含本人且 未完成的迭代
@RequestMapping(value = "/myProgressImplementPageList", method = RequestMethod.POST, produces = "application/json; charset=UTF-8")
public Result<PageInfo<ZtProjectDTO>> myProgressImplementPageList(@RequestBody ZtProjectQo qo){
return Result.success(ztProjectService.myProgressImplementPageList(qo));
}
//执行下拉
@RequestMapping(value = "/implementList", method = RequestMethod.POST, produces = "application/json; charset=UTF-8")
public Result<List<ZtProjectDTO>> implementList(@RequestBody ZtProjectQo qo){
@ -263,7 +242,7 @@ public class ZtProjectController {
if(project==null){
return Result.success(new ArrayList<ZtProjectDTO>());
}
List<ZtProject> list = ztProjectService.list(new QueryWrapper<ZtProject>().lambda().ne(ZtProject::getStatus,"closed").eq(ZtProject::getProject, project.getProject()));
List<ZtProject> list = ztProjectService.list(new QueryWrapper<ZtProject>().lambda().eq(ZtProject::getProject, project.getProject()));
return Result.success(list);
}
@ -294,12 +273,6 @@ public class ZtProjectController {
return Result.success(this.ztProjectService.executionListByProduct(qo));
}
//搜索执行根据产品 和 项目
@RequestMapping(value = "/executionListNoClosedByProduct", method = RequestMethod.POST, produces = "application/json; charset=UTF-8")
public Result executionListNoClosedByProduct(@RequestBody ZtProjectQo qo){
return Result.success(this.ztProjectService.executionListNoClosedByProduct(qo));
}
@RequestMapping(value = "/executionListByProject", method = RequestMethod.POST, produces = "application/json; charset=UTF-8")
public Result executionListByProject(@RequestBody ZtProjectQo qo){
return Result.success(this.ztProjectService.executionListByProject(qo));
@ -313,7 +286,6 @@ public class ZtProjectController {
}
//countProject
@RequestMapping(value = "/countProject", method = RequestMethod.POST, produces = "application/json; charset=UTF-8")
public Result countProject(@RequestBody ZtProjectQo qo){
@ -325,17 +297,6 @@ public class ZtProjectController {
public Result execTeamById(@RequestBody ZtProjectQo qo){
return Result.success(this.ztProjectService.execTeamById(qo));
}
//查询team根据项目id
@RequestMapping(value = "/projectTeamById", method = RequestMethod.POST, produces = "application/json; charset=UTF-8")
public Result projectTeamById(@RequestBody ZtProjectQo qo){
return Result.success(this.ztProjectService.projectTeamById(qo));
}
@RequestMapping(value = "/projectTeamUpdate", method = RequestMethod.POST, produces = "application/json; charset=UTF-8")
public Result projectTeamUpdate(@RequestBody ZtProjectQo qo){
this.ztProjectService.projectTeamUpdate(qo);
return Result.success();
}
@RequestMapping(value = "/execTeamUpdate", method = RequestMethod.POST, produces = "application/json; charset=UTF-8")
public Result execTeamUpdate(@RequestBody ZtProjectQo qo){
this.ztProjectService.execTeamUpdate(qo);
@ -353,30 +314,6 @@ public class ZtProjectController {
return Result.success(this.ztProjectService.projectTeamTimeWork(qo));
}
//产品集工时项目工时 每个人 按月份 工时统计 日报
@RequestMapping(value = "/pageDaysTimeWorkCount", method = RequestMethod.POST, produces = "application/json; charset=UTF-8")
public Result pageDaysTimeWorkCount(@RequestBody ZtProjectQo qo){
return Result.success(this.ztProjectService.pageDaysTimeWorkCount(qo));
}
@RequestMapping(value = "/getWorkInfoByDate", method = RequestMethod.POST, produces = "application/json; charset=UTF-8")
public Result getWorkInfoByDate(@RequestBody ZtProjectQo qo){
return Result.success(this.ztProjectService.getWorkInfoByDate(qo));
}
//迭代工时 每个人
@RequestMapping(value = "/execWorkCount", method = RequestMethod.POST, produces = "application/json; charset=UTF-8")
public Result execWorkCount(@RequestBody ZtProjectQo qo){
return Result.success(this.ztProjectService.execWorkCount(qo));
}
//项目统计 每个人 按月份 工时统计 月报
@RequestMapping(value = "/pageMonthReport", method = RequestMethod.POST, produces = "application/json; charset=UTF-8")
public Result pageMonthReport(@RequestBody ZtProjectQo qo){
return Result.success(this.ztProjectService.pageMonthReport(qo));
}
//迭代列表根据项目
@RequestMapping(value = "/executionByProject", method = RequestMethod.POST, produces = "application/json; charset=UTF-8")
public Result executionByProject(@RequestBody ZtProjectQo qo){
@ -386,22 +323,5 @@ public class ZtProjectController {
}
//迭代列表根据项目
@RequestMapping(value = "/projectProductByExecution", method = RequestMethod.POST, produces = "application/json; charset=UTF-8")
public Result projectProductByExecution(@RequestBody ZtProjectQo qo){
ZtProjectDTO p = this.ztProjectService.projectProductByExecution(qo.getExecution());
return Result.success(p);
}
@RequestMapping(value = "/executionBatchRemoveStory", method = RequestMethod.POST, produces = "application/json; charset=UTF-8")
public Result executionBatchRemoveStory(@RequestBody ZtProjectQo qo){
this.ztProjectService.executionBatchRemoveStory(qo.getExecution(),qo.getStoryIds());
return Result.success();
}
}

69
src/main/java/com/sa/zentao/controller/ZtReleaseController.java
View File

@ -2,8 +2,11 @@ package com.sa.zentao.controller;
import com.github.pagehelper.PageInfo;
import com.sa.zentao.dao.*;
import com.sa.zentao.entity.ZtBug;
import com.sa.zentao.dao.Result;
import com.sa.zentao.dao.ZtReleaseDTO;
import com.sa.zentao.dao.ZtStoryDTO;
import com.sa.zentao.dao.ZtTaskDTO;
import com.sa.zentao.entity.ZtRelease;
import com.sa.zentao.entity.ZtStory;
import com.sa.zentao.qo.ZtProjectQo;
import com.sa.zentao.qo.ZtReleaseQo;
@ -37,25 +40,6 @@ public class ZtReleaseController {
releaseService.addRelease(dto);
return Result.success();
}
//提交评审
@RequestMapping(value = "/submitReviewing", method = RequestMethod.POST, produces = "application/json; charset=UTF-8")
public Result submitReviewing(@RequestBody ZtReleaseDTO dto){
releaseService.submitReviewing(dto);
return Result.success();
}
//提交重新评审
@RequestMapping(value = "/submitAgainReviewing", method = RequestMethod.POST, produces = "application/json; charset=UTF-8")
public Result submitAgainReviewing(@RequestBody ZtReleaseDTO dto){
releaseService.submitAgainReviewing(dto);
return Result.success();
}
@RequestMapping(value = "/releaseList", method = RequestMethod.POST, produces = "application/json; charset=UTF-8")
public Result releaseList(@RequestBody ZtReleaseDTO dto){
List<ZtReleaseDTO> list= releaseService.releaseList(dto);
return Result.success(list);
}
@RequestMapping(value = "/getById", method = RequestMethod.POST, produces = "application/json; charset=UTF-8")
public Result getById(@RequestBody ZtReleaseQo qo){
@ -63,7 +47,6 @@ public class ZtReleaseController {
return Result.success(ztRelease);
}
@RequestMapping(value = "/modifyRelease", method = RequestMethod.POST, produces = "application/json; charset=UTF-8")
public Result modifyRelease(@RequestBody ZtReleaseDTO dto){
releaseService.modifyRelease(dto);
@ -74,24 +57,13 @@ public class ZtReleaseController {
public Result<ZtReleaseDTO> pageList(@RequestBody ZtReleaseQo qo){
return Result.success(releaseService.pageList(qo));
}
//发布下已关联的需求
@RequestMapping(value = "/releaseStoryPageList", method = RequestMethod.POST, produces = "application/json; charset=UTF-8")
public Result<ZtReleaseDTO> releaseStoryPageList(@RequestBody ZtReleaseQo qo){
PageInfo<ZtStoryDTO> info=releaseService.releaseStoryPageList(qo);
return Result.success(info);
}
@RequestMapping(value = "/releaseBugPageList", method = RequestMethod.POST, produces = "application/json; charset=UTF-8")
public Result<ZtReleaseDTO> releaseBugPageList(@RequestBody ZtReleaseQo qo){
PageInfo<ZtBugDTO> info=releaseService.releaseBugPageList(qo);
return Result.success(info);
}
@RequestMapping(value = "/releaseNotSyncBugPageList", method = RequestMethod.POST, produces = "application/json; charset=UTF-8")
public Result<ZtReleaseDTO> releaseNotSyncBugPageList(@RequestBody ZtReleaseQo qo){
PageInfo<ZtBugDTO> info=releaseService.releaseNotSyncBugPageList(qo);
return Result.success(info);
}
//迭代下需求
@RequestMapping(value = "/projectStoryPageList", method = RequestMethod.POST, produces = "application/json; charset=UTF-8")
public Result<ZtReleaseDTO> projectStoryPageList(@RequestBody ZtReleaseQo qo){
PageInfo<ZtStoryDTO> info=releaseService.projectStoryPageList(qo);
@ -103,23 +75,12 @@ public class ZtReleaseController {
releaseService.removeStory(qo);
return Result.success();
}
@RequestMapping(value = "/removeBug", method = RequestMethod.POST, produces = "application/json; charset=UTF-8")
public Result<ZtReleaseDTO> removeBug(@RequestBody ZtReleaseQo qo){
releaseService.removeBug(qo);
return Result.success();
}
@RequestMapping(value = "/batchSyncStory", method = RequestMethod.POST, produces = "application/json; charset=UTF-8")
public Result<ZtReleaseDTO> batchSyncStory(@RequestBody ZtReleaseQo qo){
releaseService.batchSyncStory(qo);
return Result.success();
}
@RequestMapping(value = "/batchSyncBug", method = RequestMethod.POST, produces = "application/json; charset=UTF-8")
public Result<ZtReleaseDTO> batchSyncBug(@RequestBody ZtReleaseQo qo){
releaseService.batchSyncBug(qo);
return Result.success();
}
@RequestMapping(value = "/assignedTo", method = RequestMethod.POST, produces = "application/json; charset=UTF-8")
public Result assignedTo(@RequestBody ZtReleaseQo dto){
@ -133,24 +94,12 @@ public class ZtReleaseController {
return Result.success();
}
//发布
@RequestMapping(value = "/release", method = RequestMethod.POST, produces = "application/json; charset=UTF-8")
public Result release(@RequestBody ZtReleaseQo dto){
releaseService.release(dto);
return Result.success();
}
//催促验收
@RequestMapping(value = "/urgeYs", method = RequestMethod.POST, produces = "application/json; charset=UTF-8")
public Result urgeYs(@RequestBody ZtReleaseQo qo){
releaseService.urgeYs(qo);
return Result.success();
}
@RequestMapping(value = "/closeRelease", method = RequestMethod.POST, produces = "application/json; charset=UTF-8")
public Result closeRelease(@RequestBody ZtReleaseQo dto){
releaseService.closeRelease(dto);
return Result.success();
}
@RequestMapping(value = "/execMenu", method = RequestMethod.POST, produces = "application/json; charset=UTF-8")
public Result execMenu(@RequestBody ZtReleaseQo dto){
@ -158,4 +107,6 @@ public class ZtReleaseController {
}
}

62
src/main/java/com/sa/zentao/controller/ZtStoryCaseController.java
View File

@ -1,62 +0,0 @@
package com.sa.zentao.controller;
import com.sa.zentao.dao.Result;
import com.sa.zentao.dao.ZtStoryCaseDTO;
import com.sa.zentao.dao.ZtStoryDTO;
import com.sa.zentao.qo.ZtStoryCaseQo;
import com.sa.zentao.service.IZtStoryCaseService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.bind.annotation.RestController;
/**
* <p>
* 前端控制器
* </p>
*
* @author gqb
* @since 2025-05-07
*/
@RestController
@RequestMapping("/zt-story-case")
public class ZtStoryCaseController {
@Autowired
private IZtStoryCaseService storyCaseService;
// ZtStoryCaseDTO
@RequestMapping(value = "/addCase", method = RequestMethod.POST, produces = "application/json; charset=UTF-8")
public Result addStory(@RequestBody ZtStoryCaseDTO dto) {
storyCaseService.addCase(dto);
return Result.success();
}
@RequestMapping(value = "/modifyCase", method = RequestMethod.POST, produces = "application/json; charset=UTF-8")
public Result modifyCase(@RequestBody ZtStoryCaseDTO dto) {
storyCaseService.modifyCase(dto);
return Result.success();
}
@RequestMapping(value = "/userReview", method = RequestMethod.POST, produces = "application/json; charset=UTF-8")
public Result userReview(@RequestBody ZtStoryCaseQo qo){
storyCaseService.userReview(qo);
return Result.success();
}
@RequestMapping(value = "/submitUserReview", method = RequestMethod.POST, produces = "application/json; charset=UTF-8")
public Result submitUserReview(@RequestBody ZtStoryCaseQo qo){
storyCaseService.submitUserReview(qo);
return Result.success();
}
@RequestMapping(value = "/getById", method = RequestMethod.POST, produces = "application/json; charset=UTF-8")
public Result getById(@RequestBody ZtStoryCaseQo qo){
return Result.success(storyCaseService.getById(qo.getId()));
}
}

32
src/main/java/com/sa/zentao/controller/ZtStoryController.java
View File

@ -3,7 +3,9 @@ package com.sa.zentao.controller;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.github.pagehelper.PageInfo;
import com.sa.zentao.dao.*;
import com.sa.zentao.dao.Result;
import com.sa.zentao.dao.ZtProjectDTO;
import com.sa.zentao.dao.ZtStoryDTO;
import com.sa.zentao.entity.ZtProject;
import com.sa.zentao.entity.ZtProjectproduct;
import com.sa.zentao.qo.ZtProjectQo;
@ -35,10 +37,6 @@ public class ZtStoryController {
@Autowired
private IZtStoryService ztStoryService;
@Autowired
private IZtProjectproductService projectproductService;
@RequestMapping(value = "/pageList", method = RequestMethod.POST, produces = "application/json; charset=UTF-8")
public Result<ZtStoryDTO> storyPageList(@RequestBody ZtProjectQo qo){
@ -98,13 +96,6 @@ public class ZtStoryController {
ztStoryService.addStory(dto);
return Result.success();
}
@RequestMapping(value = "/batchAddStory", method = RequestMethod.POST, produces = "application/json; charset=UTF-8")
public Result batchAddStory(@RequestBody ZtStoryDTO dto){
ztStoryService.batchAddStory(dto);
return Result.success();
}
@RequestMapping(value = "/editStory", method = RequestMethod.POST, produces = "application/json; charset=UTF-8")
public Result editStory(@RequestBody ZtStoryDTO dto){
ztStoryService.editStory(dto);
@ -155,7 +146,7 @@ public class ZtStoryController {
//获取需求 根据id
@RequestMapping(value = "/getStoryById", method = RequestMethod.POST, produces = "application/json; charset=UTF-8")
public Result getStoryById(@RequestBody ZtStoryDTO dto){
ZtStoryDTO storyDTO = ztStoryService.getStoryById(dto.getId(),dto.getExecution());
ZtStoryDTO storyDTO = ztStoryService.getStoryById(dto.getId());
return Result.success(storyDTO);
}
@ -178,14 +169,8 @@ public class ZtStoryController {
return Result.success();
}
//切换指派
@RequestMapping(value = "/storyListByUserStory", method = RequestMethod.POST, produces = "application/json; charset=UTF-8")
public Result storyListByUserStory(@RequestBody ZtStoryDTO dto){
List<ZtStoryDTO> list = ztStoryService.storyListByUserStory(dto);
return Result.success(list);
}
@Autowired
private IZtProjectproductService projectproductService;
//迭代列表根据项目id
@RequestMapping(value = "/execListByProject", method = RequestMethod.POST, produces = "application/json; charset=UTF-8")
@ -199,15 +184,10 @@ public class ZtStoryController {
}
dto.setProjects(list.stream().map(o->o.getProject()).collect(Collectors.toList()));
}
if(CollectionUtils.isEmpty(dto.getProjects())){
return Result.success();
}
List<ZtProject> list = ztStoryService.execListByProject(dto);
return Result.success(list);
}
}

51
src/main/java/com/sa/zentao/controller/ZtStoryFeedbackController.java
View File

@ -5,7 +5,6 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.sa.zentao.dao.Result;
import com.sa.zentao.dao.ZtStoryDTO;
import com.sa.zentao.dao.ZtStoryFeedbackDTO;
import com.sa.zentao.dao.ZtStoryUserDTO;
import com.sa.zentao.entity.ZtStoryFeedback;
import com.sa.zentao.qo.ZtProjectQo;
import com.sa.zentao.service.IZtStoryFeedbackService;
@ -38,25 +37,12 @@ public class ZtStoryFeedbackController {
return Result.success(storyFeedbackService.pageList(qo));
}
@RequestMapping(value = "/getFeedbackById", method = RequestMethod.POST, produces = "application/json; charset=UTF-8")
public Result<ZtStoryFeedbackDTO> getFeedbackById(@RequestBody ZtProjectQo qo){
return Result.success(storyFeedbackService.getFeedbackById(qo));
}
@RequestMapping(value = "/addFeedback", method = RequestMethod.POST, produces = "application/json; charset=UTF-8")
public Result addStory(@RequestBody ZtStoryFeedbackDTO dto){
storyFeedbackService.addFeedback(dto);
return Result.success();
}
@RequestMapping(value = "/approval", method = RequestMethod.POST, produces = "application/json; charset=UTF-8")
public Result approval(@RequestBody ZtStoryFeedbackDTO dto){
storyFeedbackService.approval(dto);
return Result.success();
}
@RequestMapping(value = "/editFeedback", method = RequestMethod.POST, produces = "application/json; charset=UTF-8")
public Result editFeedback(@RequestBody ZtStoryFeedbackDTO dto){
storyFeedbackService.editFeedback(dto);
@ -68,25 +54,12 @@ public class ZtStoryFeedbackController {
storyFeedbackService.changeStatus(dto);
return Result.success();
}
@RequestMapping(value = "/dontHand", method = RequestMethod.POST, produces = "application/json; charset=UTF-8")
public Result dontHand(@RequestBody ZtStoryFeedbackDTO dto){
storyFeedbackService.dontHand(dto);
return Result.success();
}
@RequestMapping(value = "/closedStory", method = RequestMethod.POST, produces = "application/json; charset=UTF-8")
public Result closedStory(@RequestBody ZtStoryFeedbackDTO dto){
storyFeedbackService.closedFeedback(dto);
return Result.success();
}
@RequestMapping(value = "/list", method = RequestMethod.POST, produces = "application/json; charset=UTF-8")
public Result list(@RequestBody ZtStoryFeedbackDTO dto){
List<ZtStoryFeedback> waitList = storyFeedbackService.list(new QueryWrapper<ZtStoryFeedback>()
.lambda()
.select()
.eq(ZtStoryFeedback::getStatus, "wait"));
.lambda().eq(ZtStoryFeedback::getStatus, "wait"));
return Result.success(waitList);
@ -94,7 +67,7 @@ public class ZtStoryFeedbackController {
//指派
@RequestMapping(value = "/assignedTo", method = RequestMethod.POST, produces = "application/json; charset=UTF-8")
public Result assignedTo(@RequestBody ZtStoryFeedbackDTO dto){
public Result assignedTo(@RequestBody ZtStoryDTO dto){
storyFeedbackService.assignedTo(dto);
return Result.success();
}
@ -105,24 +78,4 @@ public class ZtStoryFeedbackController {
return Result.success();
}
//提交验收
@RequestMapping(value = "/submitVerified", method = RequestMethod.POST, produces = "application/json; charset=UTF-8")
public Result submitVerified(@RequestBody ZtStoryFeedbackDTO dto){
storyFeedbackService.submitVerified(dto);
return Result.success();
}
//提交验收
@RequestMapping(value = "/storyYs", method = RequestMethod.POST, produces = "application/json; charset=UTF-8")
public Result storyYs(@RequestBody ZtStoryFeedbackDTO dto){
storyFeedbackService.storyYs(dto);
return Result.success();
}
//添加备注
@RequestMapping(value = "/addRemark", method = RequestMethod.POST, produces = "application/json; charset=UTF-8")
public Result addRemark(@RequestBody ZtStoryDTO dto){
storyFeedbackService.addRemark(dto);
return Result.success();
}
}

72
src/main/java/com/sa/zentao/controller/ZtStoryUserController.java
View File

@ -1,22 +1,16 @@
package com.sa.zentao.controller;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.github.pagehelper.PageInfo;
import com.sa.zentao.dao.Result;
import com.sa.zentao.dao.ZtStoryDTO;
import com.sa.zentao.dao.ZtStoryUserDTO;
import com.sa.zentao.entity.ZtStory;
import com.sa.zentao.entity.ZtStoryUser;
import com.sa.zentao.enums.UserStoryEnums;
import com.sa.zentao.qo.StoryQo;
import com.sa.zentao.qo.ZtProjectQo;
import com.sa.zentao.service.IZtStoryUserService;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.util.CollectionUtils;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
@ -25,7 +19,6 @@ import org.springframework.web.bind.annotation.RestController;
import java.util.Arrays;
import java.util.List;
import java.util.Map;
/**
* <p>
@ -37,7 +30,6 @@ import java.util.Map;
*/
@RestController
@RequestMapping("/zt-story-user")
@Slf4j
public class ZtStoryUserController {
@Autowired
@ -51,12 +43,6 @@ public class ZtStoryUserController {
return Result.success();
}
@RequestMapping(value = "/closedStory", method = RequestMethod.POST, produces = "application/json; charset=UTF-8")
public Result closedStory(@RequestBody ZtStoryUserDTO dto){
storyUserService.closedStory(dto);
return Result.success();
}
@RequestMapping(value = "/addStory", method = RequestMethod.POST, produces = "application/json; charset=UTF-8")
public Result addStory(@RequestBody ZtStoryUserDTO dto){
@ -72,29 +58,15 @@ public class ZtStoryUserController {
@RequestMapping(value = "/pageList", method = RequestMethod.POST, produces = "application/json; charset=UTF-8")
public Result pageList(@RequestBody StoryQo qo){
Long l = System.currentTimeMillis();
Long l2 = System.currentTimeMillis();
PageInfo<ZtStoryUserDTO> p = storyUserService.pageList(qo);
log.info("总耗时---------------------------------- {}",l2-l);
return Result.success(p);
}
@RequestMapping(value = "/storyList", method = RequestMethod.POST, produces = "application/json; charset=UTF-8")
public Result storyList(@RequestBody StoryQo qo){
LambdaQueryWrapper<ZtStoryUser> eq = new QueryWrapper<ZtStoryUser>()
.lambda().eq(ZtStoryUser::getProduct, qo.getId())
.orderByDesc(ZtStoryUser::getId);
if(CollectionUtils.isEmpty( qo.getStatusList())){
eq.notIn(ZtStoryUser::getStatus,UserStoryEnums.CLOSED.getCode());
}else {
eq.in(ZtStoryUser::getStatus, UserStoryEnums.CFM.getCode(),UserStoryEnums.KFZ.getCode());
}
eq.select(ZtStoryUser::getId,ZtStoryUser::getTitle,ZtStoryUser::getProduct,
ZtStoryUser::getOpenedby,ZtStoryUser::getAssignedto,ZtStoryUser::getYsUser
);
List<ZtStoryUser> list = storyUserService.list(eq
);
List<ZtStoryUser> list = storyUserService.list(new QueryWrapper<ZtStoryUser>()
.lambda().eq(ZtStoryUser::getProduct,qo.getId()).in(ZtStoryUser::getStatus, "wait","active"));
return Result.success(list);
}
@ -111,42 +83,4 @@ public class ZtStoryUserController {
return Result.success();
}
//评审
@RequestMapping(value = "/getUserStoryById", method = RequestMethod.POST, produces = "application/json; charset=UTF-8")
public Result getUserStoryById(@RequestBody ZtStoryDTO dto){
ZtStoryUserDTO storyUserDTO = storyUserService.getUserStoryById(dto);
return Result.success(storyUserDTO);
}
//添加备注
@RequestMapping(value = "/addRemark", method = RequestMethod.POST, produces = "application/json; charset=UTF-8")
public Result addRemark(@RequestBody ZtStoryDTO dto){
storyUserService.addRemark(dto);
return Result.success();
}
@RequestMapping(value = "/myWaitYsStory", method = RequestMethod.POST, produces = "application/json; charset=UTF-8")
public Result myWaitYsStory(@RequestBody ZtStoryDTO dto){
List list = storyUserService.myWaitYsStory(dto);
return Result.success(CollectionUtils.isEmpty(list)?list:list.get(0));
}
//明确需求 以设计状态下去提交交付物 到待确认
@RequestMapping(value = "/improveStory", method = RequestMethod.POST, produces = "application/json; charset=UTF-8")
public Result improveStory(@RequestBody ZtStoryUserDTO dto){
this.storyUserService.improveStory(dto);
return Result.success();
}
//确认交付物按钮 待确认 到已确认
@RequestMapping(value = "/confirmStory", method = RequestMethod.POST, produces = "application/json; charset=UTF-8")
public Result confirmStory(@RequestBody ZtStoryUserDTO dto){
this.storyUserService.confirmStory(dto);
return Result.success();
}
//
@RequestMapping(value = "/needMeetOrDesign", method = RequestMethod.POST, produces = "application/json; charset=UTF-8")
public Result needMeetOrDesign(@RequestBody ZtStoryUserDTO dto){
this.storyUserService.needMeetOrDesign(dto);
return Result.success();
}
}

88
src/main/java/com/sa/zentao/controller/ZtStoryUserTaskController.java
View File

@ -1,88 +0,0 @@
package com.sa.zentao.controller;
import com.github.pagehelper.PageInfo;
import com.sa.zentao.dao.Result;
import com.sa.zentao.dao.ZtStoryUserDTO;
import com.sa.zentao.dao.ZtStoryUserTaskDTO;
import com.sa.zentao.dao.ZtTaskDTO;
import com.sa.zentao.entity.ZtStoryUserTask;
import com.sa.zentao.qo.ZtProjectQo;
import com.sa.zentao.service.IZtStoryUserTaskService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.bind.annotation.RestController;
/**
* <p>
* 前端控制器
* </p>
*
* @author gqb
* @since 2025-03-25
*/
@RestController
@RequestMapping("/zt-story-user-task")
public class ZtStoryUserTaskController {
@Autowired
private IZtStoryUserTaskService storyUserTaskService;
@RequestMapping(value = "/pageList", method = RequestMethod.POST, produces = "application/json; charset=UTF-8")
public Result<PageInfo<ZtStoryUserDTO>> pageList(@RequestBody ZtProjectQo qo){
return Result.success(storyUserTaskService.taskPageList(qo));
}
@RequestMapping(value = "/add", method = RequestMethod.POST, produces = "application/json; charset=UTF-8")
public Result add(@RequestBody ZtStoryUserTaskDTO dto){
storyUserTaskService.add(dto);
return Result.success();
}
@RequestMapping(value = "/modify", method = RequestMethod.POST, produces = "application/json; charset=UTF-8")
public Result modify(@RequestBody ZtStoryUserTaskDTO dto){
storyUserTaskService.modify(dto);
return Result.success();
}
@RequestMapping(value = "/closed", method = RequestMethod.POST, produces = "application/json; charset=UTF-8")
public Result closed(@RequestBody ZtStoryUserTaskDTO dto){
storyUserTaskService.closed(dto);
return Result.success();
}
@RequestMapping(value = "/cancel", method = RequestMethod.POST, produces = "application/json; charset=UTF-8")
public Result cancel(@RequestBody ZtStoryUserTaskDTO dto){
storyUserTaskService.cancel(dto);
return Result.success();
}
@RequestMapping(value = "/addRemark", method = RequestMethod.POST, produces = "application/json; charset=UTF-8")
public Result addRemark(@RequestBody ZtStoryUserTaskDTO dto){
storyUserTaskService.addRemark(dto);
return Result.success();
}
@RequestMapping(value = "/getUserStoryTaskById", method = RequestMethod.POST, produces = "application/json; charset=UTF-8")
public Result getUserStoryTaskById(@RequestBody ZtProjectQo qo){
return Result.success(storyUserTaskService.getUserStoryTaskById(qo));
}
@RequestMapping(value = "/finishedTask", method = RequestMethod.POST, produces = "application/json; charset=UTF-8")
public Result<PageInfo<ZtStoryUserDTO>> finishedTask(@RequestBody ZtStoryUserTaskDTO dto){
storyUserTaskService.finishedTask(dto);
return Result.success();
}
@RequestMapping(value = "/assignedTo", method = RequestMethod.POST, produces = "application/json; charset=UTF-8")
public Result assignedTo(@RequestBody ZtStoryUserTaskDTO dto){
storyUserTaskService.assignedTo(dto);
return Result.success();
}
}

20
src/main/java/com/sa/zentao/controller/ZtStoryUserspecController.java
View File

@ -1,20 +0,0 @@
package com.sa.zentao.controller;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
/**
* <p>
* 前端控制器
* </p>
*
* @author gqb
* @since 2025-04-15
*/
@RestController
@RequestMapping("/zt-story-userspec")
public class ZtStoryUserspecController {
}

193
src/main/java/com/sa/zentao/controller/ZtTaskController.java
View File

@ -12,7 +12,6 @@ import com.sa.zentao.dao.*;
import com.sa.zentao.entity.*;
import com.sa.zentao.qo.ZtProjectQo;
import com.sa.zentao.service.*;
import com.sa.zentao.utils.BeanCopyUtil;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.BeanUtils;
@ -45,30 +44,6 @@ public class ZtTaskController {
@Autowired
private IZtTaskService ztTaskService;
@Autowired
private IZtProjectService projectService;
@Autowired
private IZtStoryService storyService;
@Autowired
private IZtUserService userService;
@Autowired
private IZtProjectstoryService projectstoryService;
@Autowired
private IZtKanbanlaneService kanbanlaneService;
@Autowired
private IZtExecutionprojectService executionprojectService;
@Autowired
private IZtProjectproductService projectproductService;
@Autowired
private IZtStoryspecService storyspecService;
@RequestMapping(value = "/taskPageList", method = RequestMethod.POST, produces = "application/json; charset=UTF-8")
public Result<PageInfo<ZtTaskDTO>> taskPageList(@RequestBody ZtProjectQo qo){
@ -126,7 +101,7 @@ public class ZtTaskController {
//结束任务
@RequestMapping(value = "/finishTask", method = RequestMethod.POST, produces = "application/json; charset=UTF-8")
public Result finishTask(@RequestBody ZtTaskDTO dto){
ztTaskService.finishTask(dto,null);
ztTaskService.finishTask(dto);
return Result.success();
}
@ -160,7 +135,6 @@ public class ZtTaskController {
@RequestMapping(value = "/getTaskById", method = RequestMethod.POST, produces = "application/json; charset=UTF-8")
public Result getTaskById(@RequestBody ZtTaskDTO dto){
ZtTaskDTO task=ztTaskService.getTaskById(dto.getId());
return Result.success(task);
}
@ -174,25 +148,28 @@ public class ZtTaskController {
// 需求关联的迭代
List<ZtTask> list = this.ztTaskService.list(new QueryWrapper<ZtTask>().lambda().eq(ZtTask::getStory, dto.getStory()));
if(CollectionUtils.isEmpty(list)){
return Result.success();
}
Map<String, ZtUser> userMap = this.userService.userMapByIds(null);
List<ZtTaskDTO> ztTaskDTOS = BeanCopyUtil.copyListProperties(list, ZtTaskDTO::new);
for (ZtTaskDTO t:ztTaskDTOS) {
for (ZtTask t:list) {
ZtUser ztUser = userMap.get(t.getAssignedTo());
if(ztUser!=null){
t.setAssignedToName(ztUser.getNickname());
t.setAssignedTo(ztUser.getNickname());
}
}
return Result.success(ztTaskDTOS);
return Result.success(list);
}
@Autowired
private IZtProjectService projectService;
@Autowired
private IZtStoryService storyService;
@Autowired
private IZtUserService userService;
@Autowired
private IZtProjectstoryService projectstoryService;
@Autowired
private IZtKanbanlaneService kanbanlaneService;
@RequestMapping(value = "/uploadTask", method = RequestMethod.POST, produces = "application/json; charset=UTF-8")
@ -279,6 +256,19 @@ public class ZtTaskController {
@Autowired
private com.sa.zentao.service.IZtStoryService IZtStoryService;
@Autowired
private IZtExecutionprojectService executionprojectService;
@Autowired
private IZtProjectproductService projectproductService;
@Autowired
private IZtStoryspecService storyspecService;
//同步中道
@ -401,12 +391,6 @@ public class ZtTaskController {
List<ZtProjectstory> oldPStoryList = this.projectstoryService.prdList(oldStory.getId());
if(!CollectionUtils.isEmpty(oldPStoryList)&&oldPStoryList.size()>1){
System.out.print(1);
}
//创建新的需求
oldStory.setProduct(product);
@ -421,35 +405,9 @@ public class ZtTaskController {
}
});
dto.setProject(project);
try {
this.projectService.projectSyncStory(dto);
}catch (Exception e){
log.error("",e);
}
for (ZtProjectstory st:oldPStoryList) {
ZtProjectDTO pro = this.projectService.selectPrdById(st.getProject());
if(pro!=null){
//老的迭代
List<ZtProject> newExec = this.projectService.list(new QueryWrapper<ZtProject>().lambda()
.eq(ZtProject::getName, pro.getName()).eq(ZtProject::getType, "sprint"));
if(!CollectionUtils.isEmpty(newExec)){
ZtProject project1 = newExec.get(0);
dto.setExcludeId(project1.getId());
try {
this.projectService.executionSyncStory(dto);
}catch (Exception e){
}
}
}
}
this.projectService.projectSyncStory(dto);
dto.setExcludeId(id1);
this.projectService.executionSyncStory(dto);
@ -463,87 +421,6 @@ public class ZtTaskController {
//同步中道
@RequestMapping(value = "/syncZdTaskByExecution", method = RequestMethod.GET, produces = "application/json; charset=UTF-8")
public Result syncZdTaskByExecution(@RequestParam("implementName")String implementName){
if(StringUtils.isEmpty(implementName)){
return Result.success();
}
List<ZtProject> list1 = this.projectService.list(new QueryWrapper<ZtProject>().lambda().eq(ZtProject::getName, implementName)
.eq(ZtProject::getType,"sprint")
);
if(CollectionUtils.isEmpty(list1)){
throw new BusinessException("未查询到");
}
ZtProject sprint = this.projectService.getOne(new QueryWrapper<ZtProject>().lambda().eq(ZtProject::getName, implementName)
.eq(ZtProject::getType, "sprint"));
ZtProjectDTO d=projectService.selectPrdByName(implementName);
if(d!=null){
// 新系统执行id
Integer myExecId = list1.get(0).getId();
//执行id
Integer id = d.getId();
List<ZtTaskDTO> taskDTOS=this.ztTaskService.taskListPrd(id);
for (ZtTaskDTO task:taskDTOS) {
List<ZtTask> list = this.ztTaskService.list(new QueryWrapper<ZtTask>().lambda().eq(ZtTask::getName, task.getName()));
// if(!CollectionUtils.isEmpty(list)){
// continue;
// }
//老的
ZtTask ztTask = new ZtTask();
BeanUtils.copyProperties(task,ztTask,"id");
if(ztTask.getDeadline()!=null){
ztTask.setDeadlineTime(ztTask.getDeadline().getTime()/1000);
}
ZtExecutionproject project = this.executionprojectService.getOne(new QueryWrapper<ZtExecutionproject>().lambda()
.eq(ZtExecutionproject::getExecution, myExecId));
Integer projectId = project.getProject();
ztTask.setExecution(myExecId);
ztTask.setProject(projectId);
this.ztTaskService.save(ztTask);
kanbanlaneService.addTask( myExecId, Arrays.asList(ztTask));
if(ztTask.getStatus().equals("closed")){
kanbanlaneService.changeStatus(myExecId,ztTask.getId(),"task","closed");
}
if(ztTask.getStatus().equals("doing")){
try {
kanbanlaneService.changeStatus(myExecId,ztTask.getId(),"task","developing");
}catch (Exception e){
log.error("",e);
}
}
if(ztTask.getStatus().equals("done")){
kanbanlaneService.changeStatus(myExecId,ztTask.getId(),"task","developed");
}
if(ztTask.getStatus().equals("cancel")){
kanbanlaneService.changeStatus(myExecId,ztTask.getId(),"task","canceled");
}
if(ztTask.getStatus().equals("wait")){
kanbanlaneService.changeStatus(myExecId,ztTask.getId(),"task","wait");
}
if(ztTask.getStatus().equals("pause")){
kanbanlaneService.changeStatus(myExecId,ztTask.getId(),"task","pause");
}
}
}
return Result.success();
}
//同步中道
@RequestMapping(value = "/test", method = RequestMethod.GET, produces = "application/json; charset=UTF-8")
public Result test(@RequestParam("implementName")String implementName){
@ -621,14 +498,4 @@ public class ZtTaskController {
return Result.success();
}
@Autowired
private VxService vxService;
@RequestMapping(value = "/testMessage", method = RequestMethod.GET, produces = "application/json; charset=UTF-8")
public Result testMessage(@RequestParam("implementName")String implementName){
vxService.sendMessageToVx("guoqibing","测试",new Date());
return Result.success();
}
}

162
src/main/java/com/sa/zentao/controller/ZtUserController.java
View File

@ -6,25 +6,24 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import com.github.pagehelper.PageInfo;
import com.sa.zentao.conf.RiskUserThreadLocal;
import com.sa.zentao.dao.*;
import com.sa.zentao.entity.ZtTeam;
import com.sa.zentao.dao.BusinessException;
import com.sa.zentao.dao.Result;
import com.sa.zentao.dao.ZtProjectDTO;
import com.sa.zentao.dao.ZtUserDTO;
import com.sa.zentao.entity.ZtUser;
import com.sa.zentao.enums.ActionStatus;
import com.sa.zentao.enums.ActionType;
import com.sa.zentao.mapper.ZtUserMapper;
import com.sa.zentao.qo.ZtUserQo;
import com.sa.zentao.service.IZtActionService;
import com.sa.zentao.service.IZtTeamService;
import com.sa.zentao.service.IZtUserService;
import com.sa.zentao.utils.ChineseUtil;
import com.sa.zentao.utils.CryptoUtils;
import com.sa.zentao.utils.JwtUtil;
import com.tencentcloudapi.common.Credential;
import com.tencentcloudapi.common.exception.TencentCloudSDKException;
import com.tencentcloudapi.sms.v20190711.SmsClient;
import com.tencentcloudapi.sms.v20190711.models.SendSmsRequest;
import com.tencentcloudapi.sms.v20190711.models.SendSmsResponse;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
@ -36,9 +35,7 @@ import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.bind.annotation.RestController;
import java.util.ArrayList;
import java.util.List;
import java.util.stream.Collectors;
/**
* <p>
@ -50,7 +47,6 @@ import java.util.stream.Collectors;
*/
@RestController
@RequestMapping("/zt-user")
@Slf4j
public class ZtUserController {
@Autowired
@ -62,47 +58,11 @@ public class ZtUserController {
@Autowired
private ZtUserMapper userMapper;
@Autowired
private IZtTeamService teamService;
@RequestMapping(value = "/allList", method = RequestMethod.POST, produces = "application/json; charset=UTF-8")
public Result allList(@RequestBody ZtUser user){
List<ZtUserDTO> ztUserDTOS = userMapper.listAll(null);
return Result.success();
}
@RequestMapping(value = "/syncOldZentaoUser", method = RequestMethod.GET, produces = "application/json; charset=UTF-8")
public Result allList(){
List<ZtUserDTO> ztUserDTOS = userMapper.listAll(null);
//老的禅道 新的禅道
List result=new ArrayList();
for (ZtUserDTO u:ztUserDTOS) {
ZtUser ztUser = new ZtUser();
List<ZtUser> list = this.userService.list(new QueryWrapper<ZtUser>().lambda().eq(ZtUser::getAccount, u.getAccount()));
if(!CollectionUtils.isEmpty(list)){
continue;
}
BeanUtils.copyProperties(u,ztUser);
ztUser.setPassword("e10adc3949ba59abbe56e057f20f883e");
ztUser.setNickname(u.getRealname());
List<BaseStaff> staff = this.userService.oaUserByNikeName(u.getRealname());
if(!CollectionUtils.isEmpty(staff)){
String vxId = staff.get(0).getVxId();
ztUser.setVx(vxId);
Integer departId = staff.get(0).getDepartId();
BaseDepartment depart =this.userService.getDepart(departId);
Integer level = depart.getLevel();
while (level.intValue()>1){
depart=this.userService.getDepart(depart.getParentId());
level =depart.getLevel();
}
ztUser.setDeptName(depart.getName());
}
result.add(ztUser);
}
return Result.success();
}
@ -113,31 +73,11 @@ public class ZtUserController {
LambdaQueryWrapper<ZtUser> eq = new QueryWrapper<ZtUser>()
.lambda().eq(ZtUser::getDeleted, "0");
if(!StringUtils.isEmpty(dto.getName())){
eq.and(e->e.like(ZtUser::getAccount,dto.getName())
eq.like(ZtUser::getAccount,dto.getName())
.or().like(ZtUser::getNickname,dto.getName())
.or().like(ZtUser::getPinyin,dto.getName()))
.or().like(ZtUser::getPinyin,dto.getName())
;
}
if("execution".equals(dto.getType())){
//迭代id
Integer id = dto.getId();
List<ZtTeam> execution = this.teamService.list(new QueryWrapper<ZtTeam>().lambda().eq(ZtTeam::getRoot, id).eq(ZtTeam::getType, "execution"));
if(CollectionUtils.isEmpty(execution)){
return Result.success(new ArrayList<>());
}
eq.in(ZtUser::getAccount,execution.stream().map(o->o.getAccount()).collect(Collectors.toList()));
}else if("project".equals(dto.getType())){
//迭代id
Integer id = dto.getId();
List<ZtTeam> execution = this.teamService.list(new QueryWrapper<ZtTeam>().lambda().eq(ZtTeam::getRoot, id).eq(ZtTeam::getType, "project"));
if(CollectionUtils.isEmpty(execution)){
return Result.success(new ArrayList<>());
}
eq.in(ZtUser::getAccount,execution.stream().map(o->o.getAccount()).collect(Collectors.toList()));
}else{
this.userMapper.selectOne(new QueryWrapper<ZtUser>().lambda().eq(ZtUser::getAccount,RiskUserThreadLocal.get().getName()));
}
return Result.success(userService.list(eq
));
}
@ -179,65 +119,65 @@ public class ZtUserController {
@RequestMapping(value = "/add", method = RequestMethod.POST, produces = "application/json; charset=UTF-8")
public Result<ZtUser> add(@RequestBody ZtUserDTO user){
userService.addUser(user);
return Result.success();
}
@RequestMapping(value = "/updatePassword", method = RequestMethod.POST, produces = "application/json; charset=UTF-8")
public Result<ZtUser> updatePassword(@RequestBody ZtUserDTO user){
ZtUser ztUser = userService.getOne(new QueryWrapper<ZtUser>().lambda().eq(ZtUser::getAccount, RiskUserThreadLocal.get().getName()));
if(!user.getPassword().equals(ztUser.getPassword())){
throw new BusinessException("旧密码验证失败");
ZtUser login = userService.getOne(new QueryWrapper<ZtUser>().lambda().eq(ZtUser::getAccount, user.getAccount()));
if(login!=null){
throw new BusinessException("存在");
}
if(ztUser==null){
throw new BusinessException("未查询到");
ZtUser ztUser = new ZtUser();
BeanUtils.copyProperties(user,ztUser);
List<String> productList = user.getProductList();
if(!CollectionUtils.isEmpty(productList)){
ztUser.setProductIds(StringUtils.join(productList,","));
}
ztUser.setPassword(user.getNewPassword());
ztUser.setPinyin(ChineseUtil.getFirst(ztUser.getNickname()));
this.userService.updateById(ztUser);
this.actionService.addAction(ActionType.USER, ActionStatus.XGMM,ztUser.getId(),null,null,null, RiskUserThreadLocal.get().getName(),null,ztUser.getAccount());
this.userService.save(ztUser);
this.actionService.addAction(ActionType.USER, ActionStatus.XJ,ztUser.getId(),null,null,null, RiskUserThreadLocal.get().getName(),null,ztUser.getAccount());
return Result.success();
}
@RequestMapping(value = "/resetPassword", method = RequestMethod.POST, produces = "application/json; charset=UTF-8")
public Result<ZtUser> resetPassword(@RequestBody ZtUserDTO user){
this.userService.resetPassword(user);
return Result.success();
}
@RequestMapping(value = "/deleteUser", method = RequestMethod.POST, produces = "application/json; charset=UTF-8")
public Result<ZtUser> deleteUser(@RequestBody ZtUserDTO user){
this.userService.deleteUser(user);
return Result.success();
}
@RequestMapping(value = "/modify", method = RequestMethod.POST, produces = "application/json; charset=UTF-8")
public Result<ZtUser> modify(@RequestBody ZtUserDTO user){
userService.modifyUser(user);
return Result.success();
}
@RequestMapping(value = "/updateVx", method = RequestMethod.GET, produces = "application/json; charset=UTF-8")
public Result<ZtUser> updateVx(){
List<ZtUser> list = this.userService.list();
for (ZtUser u:list) {
if(!StringUtils.isEmpty(u.getVx())){
u.setVx(CryptoUtils.aesEncryptForFront(u.getVx(), CryptoUtils.KEY_DES));
}
ZtUser ztUser = userService.getById(user.getId());
if(ztUser==null){
throw new BusinessException("不存在");
}
userService.saveOrUpdateBatch(list);
log.info("",list);
List<ZtUser> list = userService.list(new QueryWrapper<ZtUser>().lambda().eq(ZtUser::getAccount, user.getAccount())
.ne(ZtUser::getId, user.getId())
);
if(!CollectionUtils.isEmpty(list)){
throw new BusinessException("请检查用户");
}
if(!ztUser.getNickname().equals(user.getNickname())){
ztUser.setPinyin(ChineseUtil.getFirst(ztUser.getNickname()));
}
ztUser.setAccount(user.getAccount());
ztUser.setPassword(user.getPassword());
ztUser.setUserType(user.getUserType());
ztUser.setEmail(user.getEmail());
ztUser.setPhone(user.getPhone());
if(!CollectionUtils.isEmpty(user.getProductList())){
ztUser.setProductIds(StringUtils.join(user.getProductList(),","));
}
this.userService.update(new UpdateWrapper<ZtUser>().lambda()
.set(ZtUser::getPassword,user.getPassword())
.set(ZtUser::getUserType,user.getUserType())
.set(ZtUser::getEmail,user.getEmail())
.set(ZtUser::getProductIds,ztUser.getProductIds())
.set(ZtUser::getPhone,ztUser.getPhone())
.eq(ZtUser::getId,ztUser.getId())
);
this.actionService.addAction(ActionType.USER, ActionStatus.BJ,ztUser.getId(),null,null,null,RiskUserThreadLocal.get().getName(),null,user.getAccount());
return Result.success();
}
}

114
src/main/java/com/sa/zentao/dao/BaseDepartment.java
View File

@ -1,114 +0,0 @@
package com.sa.zentao.dao;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data;
import lombok.EqualsAndHashCode;
import java.io.Serializable;
import java.math.BigDecimal;
import java.util.Date;
/**
* <p>
*
* </p>
*
* @author gqb
* @since 2024-04-29
*/
@Data
@EqualsAndHashCode(callSuper = false)
@TableName("base_department")
public class BaseDepartment implements Serializable {
private static final long serialVersionUID = 1L;
/**
* id
*/
@TableId(value = "id", type = IdType.AUTO)
private Integer id;
/**
* 部门名
*/
private String name;
/**
* 负责人名
*/
private String manageName;
/**
* 负责人手机
*/
private String managePhone;
/**
* 负责人邮箱
*/
private String manageMail;
/**
* 父节点
*/
private Integer parentId;
/**
* 级别
*/
private Integer level;
/**
* 公司
*/
private Integer companyId;
private Date createDate;
private Date updateDate;
private Integer createUser;
private Integer updateUser;
/**
* 0正常1.删除
*/
private String deleteFlag;
/**
* 编制用户数量
*/
private BigDecimal bzUserCount;
/**
* 是否需要验证用户 1.需要
*/
private Integer checkUser;
private String dkStart;
private String dkEnd;
/**
* 部门，级别，岗位
*/
private String departmentType;
/**
* 部门id
*/
private Integer departmentId;
private String workingHoursType;
private Integer parentDepartId;
private Integer parentCompanyId;
//排序
private Integer sortIndex;
}

71
src/main/java/com/sa/zentao/dao/BaseMenuDTO.java
View File

@ -1,71 +0,0 @@
package com.sa.zentao.dao;
import lombok.Data;
import java.io.Serializable;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
/**
* @author jiangheng
* @CreateDate in 2021/5/28 16:10
*/
@Data
public class BaseMenuDTO implements Serializable {
private static final long serialVersionUID = 1L;
/**
* 主键
*/
private Integer id;
/**
* 父id
*/
private Integer parentId;
/**
* 名称
*/
private String name;
/**
* 路径
*/
private String action;
/**
* 排序
*/
private Integer sort;
private Integer isSys;
/**
* 样式
*/
private String icon;
/**
* 更新时间
*/
private Date createTime;
/**
* 更新时间
*/
private Date updateTime;
/**
* 级别 1父菜单 2子菜单 3按钮
*/
private Integer level;
private Integer menuType;
private List<BaseMenuDTO> menuList;
public void add(BaseMenuDTO t) {
if (menuList == null) {
menuList = new ArrayList<>();
}
menuList.add(t);
}
}

79
src/main/java/com/sa/zentao/dao/BaseRoleDTO.java
View File

@ -1,79 +0,0 @@
package com.sa.zentao.dao;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import lombok.Data;
import java.io.Serializable;
import java.util.Date;
/**
* <p>
*
* </p>
*
* @author jobob
* @since 2021-05-28
*/
@Data
public class BaseRoleDTO implements Serializable {
private static final long serialVersionUID = 1L;
@TableId(value = "id", type = IdType.AUTO)
private Integer id;
/**
* 名称
*/
private String name;
private Integer roleType;
/**
* 创建时间
*/
private Date createTime;
/**
* 更新时间
*/
private Date updateTime;
/**
* 角色备注
*/
private String remark;
/**
* 1删除 0有效
*/
private Integer deleteFlag;
/**
* 创建时间
*/
private String createUser;
/**
* 更新时间
*/
private String updateUser;
// private List<ListMenuDTO> listMenu;
/**
* 全选菜单id
*/
private String allPickMenuIds;
/**
* 半选菜单id
*/
private String halfPickMenuIds;
private Integer menuType;
}

290
src/main/java/com/sa/zentao/dao/BaseStaff.java
View File

@ -1,290 +0,0 @@
package com.sa.zentao.dao;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.sa.zentao.utils.CryptoUtils;
import lombok.Data;
import lombok.EqualsAndHashCode;
import org.springframework.util.StringUtils;
import java.io.Serializable;
import java.math.BigDecimal;
import java.util.Date;
/**
* <p>
*
* </p>
*
* @author
* @since 2022-11-08
*/
@Data
@EqualsAndHashCode(callSuper = false)
public class BaseStaff implements Serializable {
private static final long serialVersionUID = 1L;
@TableId(value = "id", type = IdType.AUTO)
private Integer id;
private Integer companyId;
//微信id
private String vxId;
/**
* 名称
*/
private String name;
/**
* 员工号
*/
private String staffNo;
/**
* 部门id
*/
private Integer departId;
private String departName;
/**
* 职位
*/
private String position;
/**
* 1.男 2女
*/
private String gender;
/**
* 出生日期
*/
private Date birthday;
/**
* 入职日期
*/
private Date workDate;
/**
* 年龄
*/
private Integer age;
/**
* 上海社保缴纳年数
*/
private BigDecimal shSocSecYears;
/**
* 1.试用期 2见习 3.正式 4.退休期 5.离职员工
*/
private String staffStatus;
/**
* 邮箱
*/
private String mail;
/**
* 手机
*/
private String phone;
/**
* 身份证号
*/
private String idNo;
/**
* 户籍
*/
private String births;
/**
* 户籍地址
*/
private String birthsAddress;
/**
* 居住地址
*/
private String liveAddress;
/**
* 0 未婚 1.已婚
*/
private String marriageType;
/**
* 学历
*/
private String education;
/**
* 毕业学校
*/
private String school;
/**
* 专业
*/
private String major;
/**
* 毕业时间
*/
private String graduationDate;
/**
* 紧急联系人
*/
private String emergencyUser;
/**
* 紧急联系人关系
*/
private String emergencyRelationship;
/**
* 紧急联人电话
*/
private String emergencyPhone;
/**
* 创建日期
*/
private Date createDate;
/**
* 创建人
*/
private Integer createUser;
/**
* 更新日期
*/
private Date updateDate;
/**
* 更新人
*/
private Integer updateUser;
//政治面貌1.党员2.团员3.群众4.其他
private String politicalOutlook;
//级别
private String level;
//职称
private String workName;
// 上海户籍
private String shBirths;
//邮编
private String postalCode;
private String maxEducation;
private String header;
//全日制 1.是 0否
private Integer qrz;
private String gjjAccount;
private String bankNo;
private String zpType;
//所在编制公司
private String bzCompany;
//职业资格
private String zyzg;
//家人手机
private String familyPhone;
//家人关系
private String familyRelationship;
//家人姓名
private String familyName;
//户口类型
private String hkType;
// 首次工作日起
private Date firstWorkDate;
//打卡机id
private String dkId;
private String deleteFlagEnum;
//独身子女 1 是 0 否
private Integer dszvFlag;
//独生子女多少钱
private BigDecimal dszvMoney;
//独生子女多少钱到期时间
private Date dszvExpireTime;
//银行名称
private String bankName;
//财务编号
private String financeNo;
//发薪公司
private Integer fxCompany;
//合同公司
private Integer contactCompany;
//1.是工会会员 0不是
private Integer tradeUnionVip;
//入职推荐人
private String recommend;
//所属中心
private String belongTo;
//业务系统账号
private String accountId;
//其他信息
private String otherData;
//项目群组
private String projectGroup;
//驾驶证
private String driverLicense;
//用工性质
private String workType;
//工作地点
private String workAddress;
//民族
private String nation;
//身份证到期时间
private Date idExpireDate;
//司龄校正值
private BigDecimal workYearAdd;
//预算部门
private Integer budgetDepartId;
//是否计算工龄工资 1.计算 0不计算
private Integer computeWorkYear;
//是否开启信息缺省提醒 0不开 1 开
private Integer reminderEnabledStatus;
//最后提醒时间
private Date lastReminderTime;
public Integer getBzCompanyInter(){
if(StringUtils.isEmpty(bzCompany)){
return null;
}
return Integer.valueOf(bzCompany);
}
public String getVxidAesValue(){
if(vxId==null){
return null;
}
try {
return CryptoUtils.aesDecryptForFront(vxId, CryptoUtils.KEY_DES);
}catch (Exception e){
return null;
}
}
}

184
src/main/java/com/sa/zentao/dao/CarDrivingLicenseDTO.java
View File

@ -1,184 +0,0 @@
package com.sa.zentao.dao;
import lombok.Data;
import lombok.EqualsAndHashCode;
import java.io.Serializable;
import java.util.Date;
/**
* <p>
*
* </p>
*
* @author gqb
* @since 2025-06-16
*/
@Data
@EqualsAndHashCode(callSuper = false)
public class CarDrivingLicenseDTO implements Serializable {
private static final long serialVersionUID = 1L;
private Integer id;
/**
* 号牌种类01 大型汽车 02 小型汽车 03 使馆汽车 04 领馆汽车 05 境外汽车 06 外籍汽车 07 两、三轮摩托车 08 轻便摩托车 09 使馆摩托车 10 领馆摩托车 11 境外摩托车 12 外籍摩托车 13 农用运输车 14 拖拉机 15 挂车 16 教练汽车 17 教练摩托车 18 试验汽车 19 试验摩托车 20 临时入境汽车 21 临时入境摩托车 22 临时行驶车 23 公安警用汽车 24 公安警用摩托
*/
private String hpzl;
/**
* 号牌号码
*/
private String hphm;
/**
* 车辆品牌
*/
private String clpp1;
/**
* 车辆型号
*/
private String clxh;
/**
* 车辆识别代号
*/
private String clsbdh;
/**
* 发动机号
*/
private String fdjh;
/**
* 车辆类型B11 重型普通半挂车 B12 重型厢式半挂车 B13 重型罐式半挂车 B14 重型平板半挂车 B15 重型集装箱半挂车 B16 重型自卸半挂车 B17 重型特殊结构半挂车 B18 重型仓栅式半挂车 B19 重型旅居半挂车 B1A 重型专项作业半挂车 B1B 重型低平板半挂车 B1C 重型车辆运输半挂车 B1D 重型罐式自卸半挂车 B1E 重型平板自卸半挂车 B1F 重型集装箱自卸半挂车 B1G 重型特殊结构自卸半挂车 B1H 重型仓栅式自卸半挂车 B1J 重型专项作业自卸半挂车 B1K 重型低平板自卸半挂车 B1U 重型中置轴旅居挂车 B1V 重型中置轴车辆运输车 B1W 重型中置轴普通挂车 B21 中型普通半挂车 B22 中型厢式半挂车 B23 中型罐式半挂车 B24 中型平板半挂车 B25 中型集装箱半挂车 B26 中型自卸半挂车 B27 中型特殊结构半挂车 B28 中型仓栅式半挂车 B29 中型旅居半挂车 B2A 中型专项作业半挂车 B2B 中型低平板半挂车 B2C 中型车辆运输半挂车 B2D 中型罐式自卸半挂车 B2E 中型平板自卸半挂车 B2F 中型集装箱自卸半挂车 B2G 中型特殊结构自卸半挂车 B2H 中型仓栅式自卸半挂车 B2J 中型专项作业自卸半挂车 B2K 中型低平板自卸半挂车 B2U 中型中置轴旅居挂车 B2V 中型中置轴车辆运输车 B2W 中型中置轴普通挂车 B31 轻型普通半挂车 B32 轻型厢式半挂车 B33 轻型罐式半挂车 B34 轻型平板半挂车 B35 轻型自卸半挂车 B36 轻型仓栅式半挂车 B37 轻型旅居半挂车 B38 轻型专项作业半挂车 B39 轻型低平板半挂车 B3C 轻型车辆运输半挂车 B3D 轻型罐式自卸半挂车 B3E 轻型平板自卸半挂车 B3F 轻型集装箱自卸半挂车 B3G 轻型特殊结构自卸半挂车 B3H 轻型仓栅式自卸半挂车 B3J 轻型专项作业自卸半挂车 B3K 轻型低平板自卸半挂车 B3U
*/
private String cllx;
/**
* 车身颜色
*/
private String csys;
/**
* 使用性质A 非营运 B 公路客运 C 公交客运 D 出租客运 E 旅游客运 F 货运 G 租赁 H 警用 I 消防 J 救护 K 工程救险 L 营转非 M 出租转非 N 教练 O 幼儿校车 P 小学生校车 Q 初中生校车 R 危化品运输 S 中小学生校车 Z 其他
*/
private String syxz;
/**
* 机动车所有人
*/
private String syr;
/**
* 初次登记日期
*/
private String ccdjrq;
/**
* 检验有效期止
*/
private String yxqz;
/**
* 强制报废期止
*/
private String qzbfqz;
/**
* 车辆状态A 正常 B 转出 O 锁定 N 事故逃逸 M 强制注销 L 暂扣 I 事故未处理 J 嫌疑车 C 被盗抢 D 停驶 E 注销 G 违法未处理 H 海关监管 K 查封 P 达到报废标准公告牌证作废 Q 逾期未检验 Z 其他
*/
private String zt;
/**
* 发动机型号
*/
private String fdjxh;
/**
* 汽油 柴油 电驱动（电能驱动汽车） 混合油 天然气 液化石油气 甲醇 乙醇 太阳能 混合动力 无（仅限全挂车等无动力的） 其他 插电式混合动力
*/
private String rlzl;
/**
* 排量
*/
private String pl;
/**
* 功率
*/
private String gl;
/**
* 轴数
*/
private String zs;
/**
* 轴距
*/
private String zj;
/**
* 前轮距
*/
private String qlj;
/**
* 后轮距
*/
private String hlj;
/**
* 总质量
*/
private String zzl;
/**
* 整备质量
*/
private String zbzl;
/**
* 核定载质量
*/
private String hdzzl;
/**
* 核定载客
*/
private String hdzk;
/**
* 出厂日期
*/
private String ccrq;
/**
* 车主是否一致
*/
private String owner;
/**
* 1 查询成功 3.查询失败
*/
private Integer status;
/**
* 查询失败返回结果
*/
private String msg;
/**
* 查询日期
*/
private Date createTime;
/**
* 1 是所有人 2.不是所有人 0默认没有所有人
*/
private Integer syrFlag;
}

85
src/main/java/com/sa/zentao/dao/CarFiveTypeDTO.java
View File

@ -1,85 +0,0 @@
package com.sa.zentao.dao;
import lombok.Data;
import lombok.EqualsAndHashCode;
import java.io.Serializable;
import java.util.Date;
/**
* <p>
*
* </p>
*
* @author gqb
* @since 2025-06-16
*/
@Data
@EqualsAndHashCode(callSuper = false)
public class CarFiveTypeDTO implements Serializable {
private static final long serialVersionUID = 1L;
private Integer id;
/**
* 车架号
*/
private String vin;
/**
* 发动机
*/
private String engine;
/**
* 品牌名称
*/
private String carName;
/**
* 初次登记日期
*/
private Date recordDate;
/**
* 查询时间
*/
private Date createTime;
/**
* 车辆模型
*/
private String vehicleModel;
/**
* 车牌
*/
private String plate;
/**
* 车辆类型
*/
private String type;
/**
* 使用性质 编号 类型 编号 类型 01 大型汽车 13 农用摩托车 02 小型汽车 14 拖拉机 03 使馆汽车 15 挂车 04 领馆汽车 16 教练汽车 05 境外汽车 17 教练摩托车 06 外籍汽车 20 临时入境汽车 07 两、三轮摩托车 21 临时入境摩托车 08 轻便摩托车 22 临时行驶车 09 使馆摩托车 23 警用汽车 10 领馆摩托车 51 新能源大车 11 境外摩托车 52 新能源小车 12 外籍摩托车
*/
private String usage;
/**
* 车辆类型
*/
private String cllb;
/**
* 未查询到反馈的消息
*/
private String msg;
/**
* 搜索到的 1命中 3 未查询到
*/
private Integer status;
private String userName;
}

45
src/main/java/com/sa/zentao/dao/CarOperatingVehicleLevelDTO.java
View File

@ -1,45 +0,0 @@
package com.sa.zentao.dao;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import lombok.Data;
import lombok.EqualsAndHashCode;
import java.io.Serializable;
import java.util.Date;
/**
* <p>
*
* </p>
*
* @author gqb
* @since 2025-06-16
*/
@Data
@EqualsAndHashCode(callSuper = false)
public class CarOperatingVehicleLevelDTO implements Serializable {
private static final long serialVersionUID = 1L;
@TableId(value = "id", type = IdType.AUTO)
private Integer id;
/**
* 疑似营运车辆
*/
private String name;
private String value;
private String description;
/**
* 创建日期
*/
private Date createTime;
private String plateNo;
@TableField("`status`")
private Integer status;
private String msg;
}

22
src/main/java/com/sa/zentao/dao/DkInfo.java
View File

@ -1,22 +0,0 @@
package com.sa.zentao.dao;
import lombok.Data;
import lombok.EqualsAndHashCode;
import java.io.Serializable;
import java.util.Date;
@Data
@EqualsAndHashCode(callSuper = false)
public class DkInfo implements Serializable {
private String account;
private String name;
private String dateStr;
private Date startDate;
private Date endDate;
}

22
src/main/java/com/sa/zentao/dao/ItApproval.java
View File

@ -1,22 +0,0 @@
package com.sa.zentao.dao;
import lombok.Data;
import lombok.EqualsAndHashCode;
import java.io.Serializable;
import java.util.Date;
@Data
@EqualsAndHashCode(callSuper = false)
public class ItApproval implements Serializable {
private String name;
private Integer applyDays;
private Date applyTimeStart;
private Date applyTimeEnd;
}

163
src/main/java/com/sa/zentao/dao/PerformanceDTO.java
View File

@ -1,163 +0,0 @@
package com.sa.zentao.dao;
import com.alibaba.excel.annotation.ExcelIgnore;
import com.alibaba.excel.annotation.ExcelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
import java.io.Serializable;
import java.math.BigDecimal;
import java.util.Date;
@Data
@EqualsAndHashCode(callSuper = false)
public class PerformanceDTO implements Serializable {
@ExcelIgnore
private Date date;
@ExcelIgnore
private Integer userId;
private Integer id ;
@ExcelProperty(value = "姓名",index =0)
private String userName;
//任务总量
@ExcelProperty(value = "账户",index =1)
private String account;
//需求总工时
@ExcelProperty(value = "天数",index =2)
private BigDecimal days;
// 小时
@ExcelIgnore
private BigDecimal approvalDays;
//拆分任务工时
@ExcelIgnore
private BigDecimal splitTimeScore=BigDecimal.ZERO;
//实际产出工时
@ExcelProperty(value = "可用工时",index =3)
private BigDecimal totalTime;
//可用工时 6*工作天数
@ExcelProperty(value = "达标工时 ",index =4)
//达标 考核工时
private BigDecimal examineTime=BigDecimal.ZERO;
@ExcelProperty(value = "产出工时 ",index =5)
private BigDecimal workTime=BigDecimal.ZERO;;
@ExcelProperty(value = "分配工时 ",index =6)
private BigDecimal allocationTime=BigDecimal.ZERO;
@ExcelProperty(value = "工作饱和率 ",index =7)
private BigDecimal saturation;
@ExcelProperty(value = "饱和率得分 ",index =8)
private BigDecimal saturationScore;
@ExcelProperty(value = "延期任务 ",index =9)
private BigDecimal delayTask;
//总任务
@ExcelIgnore
private BigDecimal totalTask=BigDecimal.ZERO;;
@ExcelProperty(value = "完成任务 ",index =10)
private BigDecimal finishTask;
@ExcelProperty(value = "完成准时率 ",index =11)
private BigDecimal finishPunctuality=BigDecimal.ZERO;;
@ExcelProperty(value = "准时率得分 ",index =12)
private BigDecimal punctualityScore=BigDecimal.ZERO;
@ExcelProperty(value = "线上严重bug ",index =13)
private BigDecimal seriousBug;
//缺陷检出率
@ExcelIgnore
private BigDecimal bugFindScore;
//缺陷检出率得分
private BigDecimal bugFindRate;
//产出线上Bug
@ExcelProperty(value = "线上普通bug ",index =14)
private BigDecimal slightBug;
@ExcelIgnore
private BigDecimal bugCount=BigDecimal.ZERO;
//bug密度
@ExcelIgnore
private BigDecimal bugDensity=BigDecimal.ZERO;
//线上Bug得分
@ExcelProperty(value = "线上Bug得分 ",index =15)
private BigDecimal bugScore=BigDecimal.ZERO;
//普通bug
private BigDecimal devSlightBug;
//严重bug
private BigDecimal devSeriousBug;
private BigDecimal devBugScore;
//产出线上Bug
@ExcelProperty(value = "总分 ",index =16)
private BigDecimal score;
//工作态度
@ExcelIgnore
private BigDecimal workAttitude=BigDecimal.ZERO;
//优秀分享 创新贡献
@ExcelIgnore
private BigDecimal excellentShare=BigDecimal.ZERO;
//质量贡献
@ExcelIgnore
private BigDecimal quality=BigDecimal.ZERO;
//代码质量问题个数
private BigDecimal codeQualityProblem=BigDecimal.ZERO;
//代码得分
private BigDecimal codeQualityScore=BigDecimal.ZERO;
//需求发布总量
@ExcelIgnore
private BigDecimal releaseCount;
//即时验收数量
@ExcelIgnore
private BigDecimal releaseOnTimeCount;
//即时验收率
@ExcelIgnore
private BigDecimal releaseOnTimeRate;
//发布验收绩效
@ExcelIgnore
private BigDecimal releaseScore=BigDecimal.ZERO;
//会议绩效
@ExcelIgnore
private BigDecimal meetScore=BigDecimal.ZERO;
//周会议
private BigDecimal meetWeek=BigDecimal.ZERO;
//需求会议
private BigDecimal meetStory=BigDecimal.ZERO;
//文档质量问题个数
private BigDecimal documentQualityProblem=BigDecimal.ZERO;
//文档得分
private BigDecimal documentQualityScore=BigDecimal.ZERO;
//设计得分
private BigDecimal designScore=BigDecimal.ZERO;
//设计问题
private BigDecimal designQualityProblem=BigDecimal.ZERO;
// //项目绩效
// private BigDecimal projectScore=BigDecimal.ZERO;
//项目文档
private BigDecimal projectDocumentScore=BigDecimal.ZERO;
// //会议管理
// private BigDecimal meetDocumentScore=BigDecimal.ZERO;
//ui 工作量 加分项
private BigDecimal uiWorkScore=BigDecimal.ZERO;
//总分
private BigDecimal totalScore=BigDecimal.ZERO;
//版本计划完成率
private BigDecimal versionPlanFinishedRate=BigDecimal.valueOf(20);
//任务管理和分解能力
private BigDecimal taskManageScore=BigDecimal.ZERO;;
//分配工时占比
private BigDecimal allocationTimeManageRate=BigDecimal.ZERO;
//系统稳定得分
private BigDecimal systemStabilityScore=BigDecimal.ZERO;
//专业技能提升
private BigDecimal professionalSkillEnhancementScore=BigDecimal.ZERO;
//问题管理得分
private BigDecimal developFeedbackStory=BigDecimal.valueOf(10);
}

161
src/main/java/com/sa/zentao/dao/ProgramCountDTO.java
View File

@ -1,161 +0,0 @@
package com.sa.zentao.dao;
import com.alibaba.excel.annotation.ExcelIgnore;
import com.alibaba.excel.annotation.ExcelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
import java.io.Serializable;
import java.math.BigDecimal;
@Data
@EqualsAndHashCode(callSuper = false)
public class ProgramCountDTO implements Serializable {
//完成需求总量
private BigDecimal finishedStoryCount;
//上线需求总量
private BigDecimal releaseStoryCount;
//完成验收数量
private BigDecimal ysStoryCount;
//完成需求验收率
private BigDecimal ysStoryRate;
//线上bug比例
private BigDecimal prodBugRate;
//完成任务总量
private BigDecimal taskCount;
//处理问题数量
private BigDecimal handFeedbackCount;
//问题通过率
private BigDecimal passFeedbackCountRate;
//需求总工时
@ExcelProperty(value = "天数",index =2)
private BigDecimal days;
// 小时
@ExcelIgnore
private BigDecimal approvalDays;
//拆分任务工时
@ExcelIgnore
private BigDecimal splitTimeScore=BigDecimal.ZERO;
//实际产出工时
@ExcelProperty(value = "可用工时",index =3)
private BigDecimal totalTime;
//可用工时 6*工作天数
@ExcelProperty(value = "达标工时 ",index =4)
//达标 考核工时
private BigDecimal examineTime;
//工作饱和度
@ExcelProperty(value = "产出工时 ",index =5)
private BigDecimal workTime;
@ExcelProperty(value = "分配工时 ",index =6)
private BigDecimal allocationTime;
@ExcelProperty(value = "工作饱和率 ",index =7)
private BigDecimal saturation;
@ExcelProperty(value = "饱和率得分 ",index =8)
private BigDecimal saturationScore;
@ExcelProperty(value = "延期任务 ",index =9)
private BigDecimal delayTask;
//总任务
@ExcelIgnore
private BigDecimal totalTask;
@ExcelProperty(value = "完成任务 ",index =10)
private BigDecimal finishTask;
@ExcelProperty(value = "完成准时率 ",index =11)
private BigDecimal finishPunctuality;
@ExcelProperty(value = "准时率得分 ",index =12)
private BigDecimal punctualityScore=BigDecimal.ZERO;
@ExcelProperty(value = "线上严重bug ",index =13)
private BigDecimal seriousBug;
//缺陷检出率
@ExcelIgnore
private BigDecimal bugFindScore;
//缺陷检出率得分
private BigDecimal bugFindRate;
//产出线上Bug
@ExcelProperty(value = "线上普通bug ",index =14)
private BigDecimal slightBug;
@ExcelIgnore
private BigDecimal bugCount=BigDecimal.ZERO;
//bug密度
@ExcelIgnore
private BigDecimal bugDensity=BigDecimal.ZERO;
//线上Bug得分
@ExcelProperty(value = "线上Bug得分 ",index =15)
private BigDecimal bugScore=BigDecimal.ZERO;
/**
* 线上bug率
*/
@ExcelIgnore
private BigDecimal prodBugDensity=BigDecimal.ZERO;
//普通bug
private BigDecimal devSlightBug;
//严重bug
private BigDecimal devSeriousBug;
private BigDecimal devBugScore;
//产出线上Bug
@ExcelProperty(value = "总分 ",index =16)
private BigDecimal score;
//工作态度
@ExcelIgnore
private BigDecimal workAttitude=BigDecimal.ZERO;
//优秀分享 创新贡献
@ExcelIgnore
private BigDecimal excellentShare=BigDecimal.ZERO;
//质量贡献
@ExcelIgnore
private BigDecimal quality=BigDecimal.ZERO;
//代码质量问题个数
private BigDecimal codeQualityProblem=BigDecimal.ZERO;
//代码得分
private BigDecimal codeQualityScore=BigDecimal.ZERO;
//需求发布总量
@ExcelIgnore
private BigDecimal releaseCount;
//即时验收数量
@ExcelIgnore
private BigDecimal releaseOnTimeCount;
//即时验收率
@ExcelIgnore
private BigDecimal releaseOnTimeRate;
//发布验收绩效
@ExcelIgnore
private BigDecimal releaseScore=BigDecimal.ZERO;
//会议绩效
@ExcelIgnore
private BigDecimal meetScore=BigDecimal.ZERO;
//周会议
private BigDecimal meetWeek;
//需求会议
private BigDecimal meetStory;
//文档质量问题个数
private BigDecimal documentQualityProblem=BigDecimal.ZERO;
//文档得分
private BigDecimal documentQualityScore=BigDecimal.ZERO;
//设计得分
private BigDecimal designScore=BigDecimal.ZERO;
//设计问题
private BigDecimal designQualityProblem=BigDecimal.ZERO;
// //项目绩效
// private BigDecimal projectScore=BigDecimal.ZERO;
//项目文档
private BigDecimal projectDocumentScore=BigDecimal.ZERO;
// //会议管理
// private BigDecimal meetDocumentScore=BigDecimal.ZERO;
//ui 工作量 加分项
private BigDecimal uiWorkScore=BigDecimal.ZERO;
//总分
private BigDecimal totalScore=BigDecimal.ZERO;
}

17
src/main/java/com/sa/zentao/dao/ProjectWorkDetailsDTO.java
View File

@ -29,21 +29,12 @@ public class ProjectWorkDetailsDTO implements Serializable {
//已验收需求总量
@ExcelProperty(value = "已验收需求总量",index =5)
private BigDecimal ysStoryCount;
private Integer ysTaskCount;
//验收通过率
@ExcelProperty(value = "检出bug量",index =6)
private BigDecimal findBugCount;
//验收不通过数量
@ExcelProperty(value = "检出bug率",index =7)
private BigDecimal findBugRate;
//验收通过率
@ExcelProperty(value = "验收通过率",index =8)
@ExcelProperty(value = "验收通过率",index =6)
private BigDecimal ysYesRate;
//验收不通过数量
@ExcelProperty(value = "验收不通过数量",index =9)
private BigDecimal ysNoCount;
@ExcelProperty(value = "验收不通过数量",index =7)
private BigDecimal ysNoRate;
//验收情况备注
}

13
src/main/java/com/sa/zentao/dao/ProjectWorkTaskDTO.java
View File

@ -32,10 +32,10 @@ public class ProjectWorkTaskDTO implements Serializable {
//已验收需求总量
@ExcelProperty(value = "需求",index =5)
private String storyName;
//任务名称
//验收通过率
@ExcelProperty(value = "任务名称",index =6)
private String taskName;
//任务类型
//验收不通过数量
@ExcelProperty(value = "任务类型",index =7)
private String typeName;
//指派人
@ -49,7 +49,7 @@ public class ProjectWorkTaskDTO implements Serializable {
private float planTime;
@ExcelProperty(value = "剩余工时",index =11)
private Float balanceTime;
private float balanceTime;
//状态
@ExcelProperty(value = "状态",index =12)
private String status;
@ -60,12 +60,7 @@ public class ProjectWorkTaskDTO implements Serializable {
@ExcelProperty(value = "任务结束时间",index =14)
private String endDate;
@ExcelProperty(value = "分配结束时间",index =15)
private String planEndDate;
@ExcelProperty(value = "持续日期",index =16)
@ExcelProperty(value = "持续日期",index =15)
private Integer keepTime;
@ExcelProperty(value = "是否延期",index =17)
private String delayRemark;
}

2
src/main/java/com/sa/zentao/dao/UploadDTO.java
View File

@ -14,8 +14,6 @@ public class UploadDTO implements Serializable {
private Integer id;
private MultipartFile file;
// 根据，隔开的字符串
private String files;
private String url;

23
src/main/java/com/sa/zentao/dao/WorkDetailsDTO.java
View File

@ -1,9 +1,6 @@
package com.sa.zentao.dao;
import com.alibaba.excel.annotation.ExcelIgnore;
import com.alibaba.excel.annotation.ExcelProperty;
import com.sa.zentao.entity.ZtMonthScore;
import com.sa.zentao.enums.UserType;
import lombok.Data;
import lombok.EqualsAndHashCode;
@ -14,19 +11,11 @@ import java.math.BigDecimal;
@EqualsAndHashCode(callSuper = false)
public class WorkDetailsDTO implements Serializable {
@ExcelProperty(value = "员工",index =0)
private String userName;
//任务总量
@ExcelProperty(value = "任务总量",index =1)
private BigDecimal taskCount;
//任务延期
@ExcelIgnore
private BigDecimal taskDelayCount;
//任务准时完成率
@ExcelIgnore
private BigDecimal taskFinishOnTimeRate;
//需求总工时
@ExcelProperty(value = "需求总工时",index =2)
private BigDecimal storyTotalTime;
@ -36,22 +25,10 @@ public class WorkDetailsDTO implements Serializable {
//可用工时 6*工作天数
@ExcelProperty(value = "可用工时 ",index =4)
private BigDecimal haveTime;
@ExcelIgnore
private BigDecimal qjTime;
//工作饱和度
@ExcelProperty(value = "工作饱和度 ",index =5)
private BigDecimal saturation;
//产出线上Bug
@ExcelProperty(value = "产出线上Bug ",index =6)
private BigDecimal bugCount;
@ExcelProperty(value = "任务及时完成率 ",index =7)
private BigDecimal finishPunctuality=BigDecimal.ZERO;;
@ExcelIgnore
private UserType userType;
@ExcelIgnore
private String account;
@ExcelIgnore
private ZtMonthScopeDTO monthScoreDto;
}

35
src/main/java/com/sa/zentao/dao/ZtAllBusinessDTO.java
View File

@ -1,35 +0,0 @@
package com.sa.zentao.dao;
import lombok.Data;
import lombok.EqualsAndHashCode;
import java.io.Serializable;
@Data
@EqualsAndHashCode(callSuper = false)
public class ZtAllBusinessDTO implements Serializable {
private Integer productId;
private Integer projectId;
private Integer feedbackId;
private Integer executionId;
private Integer storyId;
private Integer taskId;
private String storyName;
private String taskName;
private Integer bugId;
// story task bug userStory
private String searchType;
private String searchId;
}

35
src/main/java/com/sa/zentao/dao/ZtBugBoundUserDTO.java
View File

@ -1,35 +0,0 @@
package com.sa.zentao.dao;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import lombok.Data;
import lombok.EqualsAndHashCode;
import java.io.Serializable;
/**
* <p>
*
* </p>
*
* @author gqb
* @since 2025-05-13
*/
@Data
@EqualsAndHashCode(callSuper = false)
public class ZtBugBoundUserDTO implements Serializable {
private static final long serialVersionUID = 1L;
@TableId(value = "id", type = IdType.AUTO)
private Integer id;
private Integer bugId;
/**
* 责任人
*/
private String assignedTo;
private String assignedToName;
}

29
src/main/java/com/sa/zentao/dao/ZtBugDTO.java
View File

@ -12,7 +12,6 @@ import lombok.EqualsAndHashCode;
import java.io.Serializable;
import java.time.LocalDateTime;
import java.util.Date;
import java.util.List;
/**
* <p>
@ -35,8 +34,6 @@ public class ZtBugDTO implements Serializable {
private Integer product;
private String productName;
private Integer injection;
private Integer identify;
@ -125,8 +122,6 @@ public class ZtBugDTO implements Serializable {
@TableField("resolvedBy")
private String resolvedby;
private String resolvedbyName;
private String resolution;
@TableField("resolvedBuild")
@ -137,7 +132,7 @@ public class ZtBugDTO implements Serializable {
@TableField("closedBy")
private String closedby;
private String closedbyName;
@TableField("closedDate")
private Date closeddate;
@ -178,7 +173,7 @@ public class ZtBugDTO implements Serializable {
@TableField("lastEditedBy")
private String lasteditedby;
private String lasteditedbyName;
@TableField("lastEditedDate")
private Date lastediteddate;
@ -197,24 +192,4 @@ public class ZtBugDTO implements Serializable {
private ZtTask ztTask;
private String files;
private List<ZtBugDTO> list;
//releaseBug prod dev
private String bugType;
private String ysUser;
private String ysUserName;
private String ysFlag;
private String ysRemark;
private Integer reviewerResult;
private String desc;
private Integer releaseId;
private String releaseName;
private String feedbackSpec;
//关联责任人list
private List<ZtBugBoundUserDTO> boundList;
}

106
src/main/java/com/sa/zentao/dao/ZtComputerSourceDTO.java
View File

@ -1,106 +0,0 @@
package com.sa.zentao.dao;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import lombok.Data;
import lombok.EqualsAndHashCode;
import java.io.Serializable;
import java.util.Date;
/**
* <p>
*
* </p>
*
* @author gqb
* @since 2025-04-07
*/
@Data
@EqualsAndHashCode(callSuper = false)
public class ZtComputerSourceDTO implements Serializable {
private static final long serialVersionUID = 1L;
@TableId(value = "id", type = IdType.AUTO)
private Integer id;
/**
* 服务器/网络设备/安全设备/语音网关
*/
private String sourceType;
/**
* 内网ip
*/
private String innerIp;
/**
* 品牌
*/
private String bread;
/**
* cpu核心数
*/
private String cpuCore;
/**
* 内存
*/
private String memory;
/**
* 硬盘
*/
private String disk;
/**
* 道路救援/飞侠车服/小仟安行/OA系统/财务系统/其他
*/
private String systemType;
/**
* 用途
*/
private String purpose;
/**
* 服务名称
*/
private String serverName;
/**
* 宝山机房/高科西路机房/其他
*/
private String house;
/**
* 机柜编号
*/
private String idNo;
/**
* 地址
*/
private String address;
private Date buyDate;
/**
* 未启用/启用中/报废
*/
private String status;
private String createUser;
private Date createDate;
private String updateUser;
private Date updateDate;
private String code;
private String ip;
}

72
src/main/java/com/sa/zentao/dao/ZtDevelopFeedbackDTO.java
View File

@ -1,72 +0,0 @@
package com.sa.zentao.dao;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import lombok.Data;
import lombok.EqualsAndHashCode;
import java.io.Serializable;
import java.util.Date;
/**
* <p>
*
* </p>
*
* @author gqb
* @since 2025-02-05
*/
@Data
@EqualsAndHashCode(callSuper = false)
public class ZtDevelopFeedbackDTO implements Serializable {
private static final long serialVersionUID = 1L;
@TableId(value = "id", type = IdType.AUTO)
private Integer id;
/**
* 产品
*/
private Integer productId;
private String productName;
/**
* 等级
*/
private Integer level;
/**
* 提出时间
*/
private Date proposeTime;
/**
* 责任人
*/
private String assignedTo;
private String assignedToName;
/**
* 描述
*/
private String remark;
/**
* 分析描述
*/
private String analysisRemark;
/**
* 处理措施
*/
private String handleRemark;
private String createUser;
private String createUserName;
private Date createDate;
private Date updateDate;
private String updateUser;
private String updateUserName;
}

2
src/main/java/com/sa/zentao/dao/ZtEffortDTO.java
View File

@ -41,7 +41,7 @@ public class ZtEffortDTO implements Serializable {
private Integer execution;
private String account;
private String accountName;
private String work;
private String vision;

2
src/main/java/com/sa/zentao/dao/ZtKanbancolumnDTO.java
View File

@ -62,6 +62,4 @@ public class ZtKanbancolumnDTO implements Serializable {
private String cardType;
private String same;
// cellId
private Integer cellId;
}

82
src/main/java/com/sa/zentao/dao/ZtMeetingDTO.java
View File

@ -1,82 +0,0 @@
package com.sa.zentao.dao;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.sa.zentao.enums.MeetingTypeEnums;
import lombok.Data;
import lombok.EqualsAndHashCode;
import java.io.Serializable;
import java.time.LocalDateTime;
import java.util.Date;
/**
* <p>
*
* </p>
*
* @author gqb
* @since 2025-01-24
*/
@Data
@EqualsAndHashCode(callSuper = false)
public class ZtMeetingDTO implements Serializable {
private static final long serialVersionUID = 1L;
@TableId(value = "id", type = IdType.AUTO)
private Integer id;
private Integer productId;
private String productName;
/**
* 会议名称
*/
private String name;
/**
* 会议类型 周会议/需求会议/临时会议
*/
private MeetingTypeEnums type;
/**
* 时间
*/
private Date meetingDate;
/**
* 用户,隔开
*/
private String users;
private String usersName;
/**
* 会议内容
*/
private String remark;
private String createUser;
private String createUserName;
private Date createDate;
private String updateUser;
private Date updateDate;
private String files;
private String address;
private String title;
private String userStoryName;
private String storyIds;
private String result;
private String meetingAfter;
}

44
src/main/java/com/sa/zentao/dao/ZtMonthScopeDTO.java
View File

@ -1,44 +0,0 @@
package com.sa.zentao.dao;
import lombok.Data;
import lombok.EqualsAndHashCode;
import java.io.Serializable;
import java.time.LocalDateTime;
import java.util.Date;
/**
* <p>
*
* </p>
*
* @author gqb
* @since 2025-04-24
*/
@Data
@EqualsAndHashCode(callSuper = false)
public class ZtMonthScopeDTO implements Serializable {
private static final long serialVersionUID = 1L;
private Integer id;
private String account;
/**
* 2022-07
*/
private String dateStr;
private String scopeJson;
private Date createDate;
private String createUser;
private Date updateDate;
private String updateUser;
}

18
src/main/java/com/sa/zentao/dao/ZtProductDTO.java
View File

@ -7,10 +7,8 @@ import lombok.Data;
import lombok.EqualsAndHashCode;
import java.io.Serializable;
import java.math.BigDecimal;
import java.time.LocalDate;
import java.time.LocalDateTime;
import java.util.Date;
import java.util.List;
/**
@ -95,23 +93,19 @@ public class ZtProductDTO implements Serializable {
@TableField("totalStories")
private Integer totalStories;
//为解决
@TableField("unresolvedBugs")
private Integer unresolvedBugs;
//关闭
@TableField("closedBugs")
private Integer closedBugs;
//确认
@TableField("fixedBugs")
private Integer fixedBugs;
@TableField("totalBugs")
private Integer totalBugs;
private BigDecimal finishBugRatio;
private BigDecimal finishTaskRatio;
private Integer plans;
private Integer releases;
@ -120,13 +114,13 @@ public class ZtProductDTO implements Serializable {
private String createdBy;
@TableField("createdDate")
private Date createdDate;
private LocalDateTime createdDate;
@TableField("createdVersion")
private String createdVersion;
@TableField("closedDate")
private Date closedDate;
private LocalDate closedDate;
private Integer order;
@ -136,8 +130,6 @@ public class ZtProductDTO implements Serializable {
private String poValue;
private Integer yss;
private List<String> approvalList;
private List<String> authList;

9
src/main/java/com/sa/zentao/dao/ZtProjectDTO.java
View File

@ -129,7 +129,7 @@ public class ZtProjectDTO<T> implements Serializable {
@TableField("openedBy")
private String openedBy;
private String openedByName;
@TableField("openedDate")
private Date openedDate;
@ -167,7 +167,7 @@ public class ZtProjectDTO<T> implements Serializable {
@TableField("PM")
private String pm;
private String pmName;
@TableField("QD")
private String qd;
@ -212,12 +212,11 @@ public class ZtProjectDTO<T> implements Serializable {
// private boolean hasChildren=false;
private List<Integer> productIds;
private Integer product;
private Integer productId;
private String productName;
//迭代id
private Integer excludeId;
private String executionName;
private List<String> teamList;

14
src/main/java/com/sa/zentao/dao/ZtReleaseDTO.java
View File

@ -30,10 +30,10 @@ public class ZtReleaseDTO implements Serializable {
@TableId(value = "id", type = IdType.AUTO)
private Integer id;
private Integer project;
private String projectName;
private String project;
private Integer product;
private String productName;
private String branch;
private Integer shadow;
@ -69,14 +69,14 @@ public class ZtReleaseDTO implements Serializable {
@TableField("createdBy")
private String createdby;
private String createdbyName;
@TableField("createdDate")
private Date createddate;
private String deleted;
private String executions;
private Integer execution;
private String executionsName;
private String level;
@ -88,8 +88,6 @@ public class ZtReleaseDTO implements Serializable {
private String assignedToName;
private Date releaseDate;
//真实发布时间
private Date realReleaseDate;
private String noticeTitle;
@ -99,7 +97,5 @@ public class ZtReleaseDTO implements Serializable {
private String releaseFailRemark;
private String releaseUser;
private List<ZtReleaseDetailsDTO> details;
}

59
src/main/java/com/sa/zentao/dao/ZtStoryCaseDTO.java
View File

@ -1,59 +0,0 @@
package com.sa.zentao.dao;
import lombok.Data;
import lombok.EqualsAndHashCode;
import java.io.Serializable;
import java.time.LocalDateTime;
import java.util.Date;
/**
* <p>
*
* </p>
*
* @author gqb
* @since 2025-05-07
*/
@Data
@EqualsAndHashCode(callSuper = false)
public class ZtStoryCaseDTO implements Serializable {
private static final long serialVersionUID = 1L;
private Integer id;
private String remark;
private Integer story;
private Date openedDate;
private String openedUser;
private String openedUserName;
private Date updateDate;
private String updateUser;
private String updateUserName;
private String psUser;
private String psUserName;
private Date psDate;
/**
* wait reviewing refuse 拒绝 finished
*/
private String status;
private Integer product;
private Integer execution;
private Integer project;
}

2
src/main/java/com/sa/zentao/dao/ZtStoryCountDTO.java
View File

@ -62,6 +62,4 @@ public class ZtStoryCountDTO implements Serializable {
private String feedbackClwCount;
//延期的
private String feedbackYqCount;
//关闭的
private String feedbackGbCount;
}

35
src/main/java/com/sa/zentao/dao/ZtStoryDTO.java
View File

@ -3,7 +3,6 @@ package com.sa.zentao.dao;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.sa.zentao.entity.ZtStoryCase;
import com.sa.zentao.entity.ZtStoryreview;
import lombok.Data;
import lombok.EqualsAndHashCode;
@ -34,8 +33,9 @@ public class ZtStoryDTO implements Serializable {
private List<Integer> idList;
private String vision;
private Integer parent;
private String parentName;
private Integer product;
private Integer productId;
@ -49,7 +49,7 @@ public class ZtStoryDTO implements Serializable {
private Integer branch;
private Integer module;
private String moduleName;
private String plan;
private String source;
@ -62,8 +62,6 @@ public class ZtStoryDTO implements Serializable {
private Integer feedback;
private String feedbackSpec;
private String title;
private String keywords;
@ -134,7 +132,7 @@ public class ZtStoryDTO implements Serializable {
@TableField("reviewedBy")
private String reviewedby;
private String reviewedbyName;
private String revieweUser;
private Integer revieweResult;
@ -144,7 +142,7 @@ public class ZtStoryDTO implements Serializable {
@TableField("releasedDate")
private Date releaseddate;
private Date planYsDate;
@TableField("closedBy")
private String closedby;
@ -235,8 +233,6 @@ public class ZtStoryDTO implements Serializable {
private Integer execution;
private List<Integer> executions;
private List<ZtProjectDTO> executionList;
private Boolean psFlag;
private String executionName;
@ -245,33 +241,12 @@ public class ZtStoryDTO implements Serializable {
private Integer userStory;
private ZtStoryUserDTO userStoryInfo;
private String userStoryName;
private String ysRemark;
//验收人
private String ysUser;
//验收人
private String ysUserName;
private Integer taskCount;
private Integer releaseFlag=0;
//发布id
private Integer releaseId;
private String releaseName;
private List<ZtBugDTO> bugList;
//验收日期
private Date ysDate;
//开发完成时间
private Date develDate;
//测试完成时间
private Date testedDate;
private ZtStoryCaseDTO caseInfo;
}

39
src/main/java/com/sa/zentao/dao/ZtStoryFeedbackDTO.java
View File

@ -6,7 +6,6 @@ import lombok.EqualsAndHashCode;
import java.io.Serializable;
import java.time.LocalDateTime;
import java.util.Date;
import java.util.List;
/**
* <p>
@ -24,8 +23,6 @@ public class ZtStoryFeedbackDTO implements Serializable {
private Integer id;
private String vx;
/**
* 名称
*/
@ -41,8 +38,6 @@ public class ZtStoryFeedbackDTO implements Serializable {
*/
private String files;
private String urls;
private String openedBy;
private String openedByName;
@ -80,8 +75,6 @@ public class ZtStoryFeedbackDTO implements Serializable {
private String closeRemark;
private Integer product;
private String productName;
//预计完成时间
private Date planFinishDate;
@ -91,36 +84,4 @@ public class ZtStoryFeedbackDTO implements Serializable {
private Date handDate;
//关闭日期
private Date closeDate;
//来源 zentao weixin
private String openSource;
//业务id
private String businessId;
//1.通过 0不通过
private Integer approval;
private String approvalRemark;
private String weixin;
//无需处理
private String dontHandSelect;
//无需处理
private String dontHandRemark;
private List<ZtTaskDTO> taskList;
private List<ZtBugDTO> bugList;
private List<ZtStoryDTO> storyList;
//1通过 2不通过
private Integer ysFlag;
private String desc;
// 1通过 2不通过
private Integer revieweResult;
private String oaName;
private String finishedRemark;
}

36
src/main/java/com/sa/zentao/dao/ZtStoryUserDTO.java
View File

@ -33,18 +33,14 @@ public class ZtStoryUserDTO implements Serializable {
private Integer parent;
private String parentName;
private Integer product;
private String productName;
private Integer project;
private Integer branch;
private Integer module;
private String moduleName;
private String plan;
private String source;
@ -94,16 +90,12 @@ public class ZtStoryUserDTO implements Serializable {
@TableField("openedBy")
private String openedby;
private String openedbyName;
@TableField("openedDate")
private Date openeddate;
private LocalDateTime openeddate;
@TableField("assignedTo")
private String assignedto;
private String assignedtoName;
@TableField("assignedDate")
private Date assigneddate;
@ -124,7 +116,7 @@ public class ZtStoryUserDTO implements Serializable {
@TableField("reviewedBy")
private String reviewedby;
private String reviewedbyName;
@TableField("reviewedDate")
private Date revieweddate;
@ -133,7 +125,7 @@ public class ZtStoryUserDTO implements Serializable {
@TableField("closedBy")
private String closedby;
private String closedbyName;
@TableField("closedDate")
private Date closeddate;
@ -200,10 +192,6 @@ public class ZtStoryUserDTO implements Serializable {
* 1通过 2不通过
*/
private Integer ysFlag;
/**
* 验收人
*/
private String ysUser;
private String spec;
@ -218,23 +206,7 @@ public class ZtStoryUserDTO implements Serializable {
private List<ZtStoryreviewDTO> views;
private List<ZtStoryDTO> sList;
private List<ZtStoryUserTaskDTO> taskList;
private String revieweUser;
private String files;
private String verify;
private Date psDate;
private String ysRemark;
//交付
private String deliverRemark;
// 1 需要 2不需要
private Integer needDesign;
//1.需要 2.不需要
private Integer needImprove;
}

123
src/main/java/com/sa/zentao/dao/ZtStoryUserTaskDTO.java
View File

@ -1,123 +0,0 @@
package com.sa.zentao.dao;
import com.baomidou.mybatisplus.annotation.TableField;
import lombok.Data;
import lombok.EqualsAndHashCode;
import java.io.Serializable;
import java.sql.Blob;
import java.time.LocalDateTime;
import java.util.Date;
import java.util.List;
/**
* <p>
*
* </p>
*
* @author gqb
* @since 2025-03-25
*/
@Data
@EqualsAndHashCode(callSuper = false)
public class ZtStoryUserTaskDTO implements Serializable {
private static final long serialVersionUID = 1L;
private ZtStoryUserTaskDTO info;
private Integer id;
private Integer userStoryId;
private String userStoryName;
private ZtStoryUserDTO storyUserInfo;
/**
* 明确 设计 设计 design 明确improve
*/
private String type;
/**
* 预计工时
*/
private Float estimate;
private Float consumed;
/**
* 剩余
*/
private Float left;
/**
* 指派给
*/
private String assignedTo;
private String assignedToName;
/**
* 1 需要 2不需要
*/
private Integer needMeeting;
/**
* 1需要 2不需要
*/
private Integer needDesign;
private Integer product;
private String productName;
/**
* 任务名称
*/
private String name;
private String remark;
@TableField("estStarted")
private Date eststarted;
private Date deadline;
@TableField("realStarted")
private Date realstarted;
@TableField("finishedDate")
private Date finisheddate;
@TableField("finishedBy")
private String finishedby;
private String finishedbyName;
@TableField("canceledBy")
private String canceledby;
private String canceledbyName;
@TableField("canceledDate")
private Date canceleddate;
@TableField("closedBy")
private String closedby;
private String closedbyName;
@TableField("closedDate")
private Date closeddate;
private String closedRemark;
@TableField("openedBy")
private String openedby;
private String openedbyName;
@TableField("openedDate")
private Date openeddate;
private Integer pri;
private String lastEditedBy;
private String lastEditedByName;
private Date lastEditedDate;
private String files;
private String status;
private String desc;
}

27
src/main/java/com/sa/zentao/dao/ZtTaskDTO.java
View File

@ -7,7 +7,6 @@ import lombok.Data;
import lombok.EqualsAndHashCode;
import java.io.Serializable;
import java.math.BigDecimal;
import java.time.LocalDate;
import java.time.LocalDateTime;
import java.util.Date;
@ -47,7 +46,7 @@ public class ZtTaskDTO implements Serializable {
private Integer design;
private Integer story;
private String storyName;
@TableField("storyVersion")
private Integer storyversion;
@ -93,7 +92,7 @@ public class ZtTaskDTO implements Serializable {
@TableField("openedBy")
private String openedby;
private String openedbyName;
@TableField("openedDate")
private Date openeddate;
@ -120,13 +119,13 @@ public class ZtTaskDTO implements Serializable {
@TableField("canceledBy")
private String canceledby;
private String canceledbyName;
@TableField("canceledDate")
private Date canceleddate;
@TableField("closedBy")
private String closedby;
private String closedbyName;
@TableField("closedDate")
private Date closeddate;
@ -188,24 +187,6 @@ public class ZtTaskDTO implements Serializable {
//0 否 1 是
private Integer finishedFlag=0;
//0 否 1 是
private Integer draftFlag;
private String implementName;
private Integer implementId;
private Integer product;
private String productName;
private Date applyDate;
private BigDecimal useTime;
private List<ZtBugDTO> bugList;
private String feedbackSpec;
//问题反馈处理结果
private String feedbackRemark;
private Integer delayFlag=0;
}

14
src/main/java/com/sa/zentao/dao/ZtUserDTO.java
View File

@ -34,15 +34,11 @@ public class ZtUserDTO implements Serializable {
private Integer dept;
private String deptName;
private String account;
@TableField("`password`")
private String password;
private String newPassword;
private String role;
private String realname;
@ -130,20 +126,10 @@ public class ZtUserDTO implements Serializable {
private String userTypeValue;
private String roleTypeValue;
private List<String> productList;
private List<Integer> roleList;
private String productIds;
private String productNames;
private String color;
private String vx;
private Date startDate;
private Date endDate;
}

2
src/main/java/com/sa/zentao/dao/ZtYwTaskDTO.java
View File

@ -95,6 +95,4 @@ public class ZtYwTaskDTO implements Serializable {
private String copyToUser;
private String copyMail;
private Integer level;
}

70
src/main/java/com/sa/zentao/entity/BaseMenu.java
View File

@ -1,70 +0,0 @@
package com.sa.zentao.entity;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import lombok.Data;
import java.io.Serializable;
import java.util.Date;
/**
* <p>
*
* </p>
*
* @author jobob
* @since 2021-05-28
*/
@Data
public class BaseMenu implements Serializable {
private static final long serialVersionUID = 1L;
/**
* 主键
*/
@TableId(value = "id", type = IdType.AUTO)
private Integer id;
/**
* 父id
*/
private Integer parentId;
/**
* 名称
*/
private String name;
/**
* 路径
*/
private String action;
/**
* 排序
*/
private Integer sort;
private Integer isSys;
/**
* 样式
*/
private String icon;
/**
* 更新时间
*/
private Date createTime;
/**
* 更新时间
*/
private Date updateTime;
/**
* 级别 1父菜单 2子菜单 3按钮
*/
private Integer level;
// 1菜单 2.按钮
private Integer menuType;
}

64
src/main/java/com/sa/zentao/entity/BaseRole.java
View File

@ -1,64 +0,0 @@
package com.sa.zentao.entity;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import lombok.Data;
import java.io.Serializable;
import java.util.Date;
/**
* <p>
*
* </p>
*
* @author jobob
* @since 2021-05-28
*/
@Data
public class BaseRole implements Serializable {
private static final long serialVersionUID = 1L;
@TableId(value = "id", type = IdType.AUTO)
private Integer id;
/**
* 名称
*/
private String name;
private Integer roleType;
/**
* 创建时间
*/
private Date createTime;
/**
* 更新时间
*/
private Date updateTime;
/**
* 角色备注
*/
private String remark;
/**
* 1删除 0有效
*/
private Integer deleteFlag;
/**
* 创建者
*/
private String createUser;
/**
* 修改者
*/
private String updateUser;
}

57
src/main/java/com/sa/zentao/entity/BaseRoleAuthority.java
View File

@ -1,57 +0,0 @@
package com.sa.zentao.entity;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.sa.zentao.enums.PickEnum;
import lombok.Builder;
import lombok.Data;
import java.io.Serializable;
import java.util.Date;
/**
* <p>
*
* </p>
*
* @author jobob
* @since 2021-05-31
*/
@Data
public class BaseRoleAuthority implements Serializable {
private static final long serialVersionUID = 1L;
/**
* id
*/
@TableId(value = "id", type = IdType.AUTO)
private Long id;
/**
* 角色id
*/
private Integer roleId;
/**
* 菜单id
*/
private Integer menuId;
/**
* 1、全选 2、半选
*/
private PickEnum type;
/**
* 创建时间
*/
private Date createTime;
/**
* 更新时间
*/
private Date updateTime;
}

66
src/main/java/com/sa/zentao/entity/BaseSalaryToVxError.java
View File

@ -1,66 +0,0 @@
package com.sa.zentao.entity;
import com.alibaba.excel.annotation.format.DateTimeFormat;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import lombok.Data;
import lombok.EqualsAndHashCode;
import java.io.Serializable;
import java.util.Date;
/**
* <p>
*
* </p>
*
* @author gqb
* @since 2023-03-03
*/
@Data
@EqualsAndHashCode(callSuper = false)
public class BaseSalaryToVxError implements Serializable {
private static final long serialVersionUID = 1L;
/**
* 主键
*/
@TableId(value = "id", type = IdType.AUTO)
private Integer id;
/**
* 员工id
*/
private String staffNo;
/**
* 员工name
*/
private String staffName;
/**
* 错误时间
*/
@DateTimeFormat("yyyy-MM-dd HH:mm:ss")
private Date quitDate;
/**
* 错误时间
*/
@DateTimeFormat("yyyy-MM-dd")
private Date inquireDate;
/**
* 异常code
*/
private String errorCode;
/**
* 异常原因
*/
private String errorMsg;
/**
* 重试次数
*/
private Integer againCount;
/**
* 0正常 1.删除
*/
private Integer deleteFlag;
}

41
src/main/java/com/sa/zentao/entity/BaseUserRole.java
View File

@ -1,41 +0,0 @@
package com.sa.zentao.entity;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import java.time.LocalDateTime;
import java.io.Serializable;
import java.util.Date;
import lombok.Data;
import lombok.EqualsAndHashCode;
/**
* <p>
*
* </p>
*
* @author gqb
* @since 2025-04-16
*/
@Data
@EqualsAndHashCode(callSuper = false)
public class BaseUserRole implements Serializable {
private static final long serialVersionUID = 1L;
@TableId(value = "id", type = IdType.AUTO)
private Integer id;
private Integer roleId;
/**
* 门店用户
*/
private String userId;
private Date createTime;
private Date updateTime;
}

189
src/main/java/com/sa/zentao/entity/CarDrivingLicense.java
View File

@ -1,189 +0,0 @@
package com.sa.zentao.entity;
import java.time.LocalDateTime;
import java.io.Serializable;
import java.util.Date;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import lombok.Data;
import lombok.EqualsAndHashCode;
/**
* <p>
*
* </p>
*
* @author gqb
* @since 2025-06-16
*/
@Data
@EqualsAndHashCode(callSuper = false)
public class CarDrivingLicense implements Serializable {
private static final long serialVersionUID = 1L;
@TableId(value = "id", type = IdType.AUTO)
private Integer id;
/**
* 号牌种类01 大型汽车 02 小型汽车 03 使馆汽车 04 领馆汽车 05 境外汽车 06 外籍汽车 07 两、三轮摩托车 08 轻便摩托车 09 使馆摩托车 10 领馆摩托车 11 境外摩托车 12 外籍摩托车 13 农用运输车 14 拖拉机 15 挂车 16 教练汽车 17 教练摩托车 18 试验汽车 19 试验摩托车 20 临时入境汽车 21 临时入境摩托车 22 临时行驶车 23 公安警用汽车 24 公安警用摩托
*/
private String hpzl;
/**
* 号牌号码
*/
private String hphm;
/**
* 车辆品牌
*/
private String clpp1;
/**
* 车辆型号
*/
private String clxh;
/**
* 车辆识别代号
*/
private String clsbdh;
/**
* 发动机号
*/
private String fdjh;
/**
* 车辆类型B11 重型普通半挂车 B12 重型厢式半挂车 B13 重型罐式半挂车 B14 重型平板半挂车 B15 重型集装箱半挂车 B16 重型自卸半挂车 B17 重型特殊结构半挂车 B18 重型仓栅式半挂车 B19 重型旅居半挂车 B1A 重型专项作业半挂车 B1B 重型低平板半挂车 B1C 重型车辆运输半挂车 B1D 重型罐式自卸半挂车 B1E 重型平板自卸半挂车 B1F 重型集装箱自卸半挂车 B1G 重型特殊结构自卸半挂车 B1H 重型仓栅式自卸半挂车 B1J 重型专项作业自卸半挂车 B1K 重型低平板自卸半挂车 B1U 重型中置轴旅居挂车 B1V 重型中置轴车辆运输车 B1W 重型中置轴普通挂车 B21 中型普通半挂车 B22 中型厢式半挂车 B23 中型罐式半挂车 B24 中型平板半挂车 B25 中型集装箱半挂车 B26 中型自卸半挂车 B27 中型特殊结构半挂车 B28 中型仓栅式半挂车 B29 中型旅居半挂车 B2A 中型专项作业半挂车 B2B 中型低平板半挂车 B2C 中型车辆运输半挂车 B2D 中型罐式自卸半挂车 B2E 中型平板自卸半挂车 B2F 中型集装箱自卸半挂车 B2G 中型特殊结构自卸半挂车 B2H 中型仓栅式自卸半挂车 B2J 中型专项作业自卸半挂车 B2K 中型低平板自卸半挂车 B2U 中型中置轴旅居挂车 B2V 中型中置轴车辆运输车 B2W 中型中置轴普通挂车 B31 轻型普通半挂车 B32 轻型厢式半挂车 B33 轻型罐式半挂车 B34 轻型平板半挂车 B35 轻型自卸半挂车 B36 轻型仓栅式半挂车 B37 轻型旅居半挂车 B38 轻型专项作业半挂车 B39 轻型低平板半挂车 B3C 轻型车辆运输半挂车 B3D 轻型罐式自卸半挂车 B3E 轻型平板自卸半挂车 B3F 轻型集装箱自卸半挂车 B3G 轻型特殊结构自卸半挂车 B3H 轻型仓栅式自卸半挂车 B3J 轻型专项作业自卸半挂车 B3K 轻型低平板自卸半挂车 B3U
*/
private String cllx;
/**
* 车身颜色
*/
private String csys;
/**
* 使用性质A 非营运 B 公路客运 C 公交客运 D 出租客运 E 旅游客运 F 货运 G 租赁 H 警用 I 消防 J 救护 K 工程救险 L 营转非 M 出租转非 N 教练 O 幼儿校车 P 小学生校车 Q 初中生校车 R 危化品运输 S 中小学生校车 Z 其他
*/
private String syxz;
/**
* 机动车所有人
*/
private String syr;
/**
* 1 是所有人 2.不是所有人 0默认没有所有人
*/
private Integer syrFlag;
/**
* 初次登记日期
*/
private String ccdjrq;
/**
* 检验有效期止
*/
private String yxqz;
/**
* 强制报废期止
*/
private String qzbfqz;
/**
* 车辆状态A 正常 B 转出 O 锁定 N 事故逃逸 M 强制注销 L 暂扣 I 事故未处理 J 嫌疑车 C 被盗抢 D 停驶 E 注销 G 违法未处理 H 海关监管 K 查封 P 达到报废标准公告牌证作废 Q 逾期未检验 Z 其他
*/
private String zt;
/**
* 发动机型号
*/
private String fdjxh;
/**
* 汽油 柴油 电驱动（电能驱动汽车） 混合油 天然气 液化石油气 甲醇 乙醇 太阳能 混合动力 无（仅限全挂车等无动力的） 其他 插电式混合动力
*/
private String rlzl;
/**
* 排量
*/
private String pl;
/**
* 功率
*/
private String gl;
/**
* 轴数
*/
private String zs;
/**
* 轴距
*/
private String zj;
/**
* 前轮距
*/
private String qlj;
/**
* 后轮距
*/
private String hlj;
/**
* 总质量
*/
private String zzl;
/**
* 整备质量
*/
private String zbzl;
/**
* 核定载质量
*/
private String hdzzl;
/**
* 核定载客
*/
private String hdzk;
/**
* 出厂日期
*/
private String ccrq;
/**
* 车主是否一致
*/
private String owner;
/**
* 1 查询成功 3.查询失败
*/
@TableField("`status`")
private Integer status;
/**
* 查询失败返回结果
*/
private String msg;
/**
* 查询日期
*/
private Date createTime;
}

93
src/main/java/com/sa/zentao/entity/CarFiveType.java
View File

@ -1,93 +0,0 @@
package com.sa.zentao.entity;
import java.time.LocalDateTime;
import java.io.Serializable;
import java.util.Date;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import lombok.Data;
import lombok.EqualsAndHashCode;
/**
* <p>
*
* </p>
*
* @author gqb
* @since 2025-06-16
*/
@Data
@EqualsAndHashCode(callSuper = false)
public class CarFiveType implements Serializable {
private static final long serialVersionUID = 1L;
@TableId(value = "id", type = IdType.AUTO)
private Integer id;
/**
* 车架号
*/
private String vin;
/**
* 发动机
*/
private String engine;
/**
* 品牌名称
*/
private String carName;
/**
* 初次登记日期
*/
private Date recordDate;
/**
* 查询时间
*/
private Date createTime;
/**
* 车辆模型
*/
private String vehicleModel;
/**
* 车牌
*/
private String plate;
/**
* 车辆类型
*/
@TableField("`type`")
private String type;
/**
* 使用性质 编号 类型 编号 类型 01 大型汽车 13 农用摩托车 02 小型汽车 14 拖拉机 03 使馆汽车 15 挂车 04 领馆汽车 16 教练汽车 05 境外汽车 17 教练摩托车 06 外籍汽车 20 临时入境汽车 07 两、三轮摩托车 21 临时入境摩托车 08 轻便摩托车 22 临时行驶车 09 使馆摩托车 23 警用汽车 10 领馆摩托车 51 新能源大车 11 境外摩托车 52 新能源小车 12 外籍摩托车
*/
@TableField("`usage`")
private String usage;
/**
* 车辆类型
*/
private String cllb;
/**
* 未查询到反馈的消息
*/
private String msg;
/**
* 搜索到的 1命中 3 未查询到
*/
@TableField("`status`")
private Integer status;
private String model;
private String userName;
}

47
src/main/java/com/sa/zentao/entity/CarOperatingVehicleLevel.java
View File

@ -1,47 +0,0 @@
package com.sa.zentao.entity;
import java.time.LocalDateTime;
import java.io.Serializable;
import java.util.Date;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import lombok.Data;
import lombok.EqualsAndHashCode;
/**
* <p>
*
* </p>
*
* @author gqb
* @since 2025-06-16
*/
@Data
@EqualsAndHashCode(callSuper = false)
public class CarOperatingVehicleLevel implements Serializable {
private static final long serialVersionUID = 1L;
@TableId(value = "id", type = IdType.AUTO)
private Integer id;
/**
* 疑似营运车辆
*/
private String name;
private String value;
/**
* 创建日期
*/
private Date createTime;
private String plateNo;
@TableField("`status`")
private Integer status;
private String msg;
}

4
src/main/java/com/sa/zentao/entity/ZtActionrecent.java
View File

@ -5,8 +5,6 @@ import com.baomidou.mybatisplus.annotation.TableId;
import java.time.LocalDateTime;
import com.baomidou.mybatisplus.annotation.TableField;
import java.io.Serializable;
import java.util.Date;
import lombok.Data;
import lombok.EqualsAndHashCode;
@ -43,7 +41,7 @@ public class ZtActionrecent implements Serializable {
private String action;
private Date date;
private LocalDateTime date;
private String comment;

35
src/main/java/com/sa/zentao/entity/ZtBug.java
View File

@ -2,7 +2,9 @@ package com.sa.zentao.entity;
import com.baomidou.mybatisplus.annotation.FieldStrategy;
import com.baomidou.mybatisplus.annotation.IdType;
import java.time.LocalDate;
import com.baomidou.mybatisplus.annotation.TableId;
import java.time.LocalDateTime;
import com.baomidou.mybatisplus.annotation.TableField;
import java.io.Serializable;
import java.util.Date;
@ -76,11 +78,17 @@ public class ZtBug implements Serializable {
private String steps;
/**
* active 2.confire=1 3.解决进行中 不变 4 resolved 完成 5.测试中不变 6.测试完毕不变 verified验收
* 'active','resolved','closed'? cancel
* active 激活
*/
// unconfirmed
// confirmed
// fixing
// fixed
// testing
// tested
// closed
// ZtBug 已完成
//1.active 2.confire=1 3.解决进行中 不变 4 resolved 完成 5.测试中不变 6.测试完毕不变
// 'active','resolved','closed'?
// active 激活
@TableField("`status`")
private String status;
@ -139,11 +147,6 @@ public class ZtBug implements Serializable {
@TableField("closedDate")
private Date closeddate;
@TableField(exist = false)
private String cancelBy;
@TableField(exist = false)
private Date cancelDate;
@TableField("duplicateBug")
private Integer duplicatebug;
@ -190,16 +193,4 @@ public class ZtBug implements Serializable {
private String fileUrl;
// dev prod releaseBug
private String bugType;
private String ysUser;
//1 通过 2不通过
private Integer ysFlag;
private String ysRemark;
private Integer releaseFlag;
//关联用户
@TableField(exist = false)
private String bindUser;
}

35
src/main/java/com/sa/zentao/entity/ZtBugBindUser.java
View File

@ -1,35 +0,0 @@
package com.sa.zentao.entity;
import java.io.Serializable;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import lombok.Data;
import lombok.EqualsAndHashCode;
/**
* <p>
*
* </p>
*
* @author gqb
* @since 2025-05-13
*/
@Data
@EqualsAndHashCode(callSuper = false)
public class ZtBugBindUser implements Serializable {
private static final long serialVersionUID = 1L;
@TableId(value = "id", type = IdType.AUTO)
private Integer id;
private Integer bugId;
/**
* 责任人
*/
private String assignedTo;
}

107
src/main/java/com/sa/zentao/entity/ZtComputerSource.java
View File

@ -1,107 +0,0 @@
package com.sa.zentao.entity;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import java.time.LocalDateTime;
import java.io.Serializable;
import java.util.Date;
import lombok.Data;
import lombok.EqualsAndHashCode;
/**
* <p>
*
* </p>
*
* @author gqb
* @since 2025-04-07
*/
@Data
@EqualsAndHashCode(callSuper = false)
public class ZtComputerSource implements Serializable {
private static final long serialVersionUID = 1L;
@TableId(value = "id", type = IdType.AUTO)
private Integer id;
/**
* 服务器/网络设备/安全设备/语音网关
*/
private String sourceType;
/**
* 内网ip
*/
private String innerIp;
/**
* 品牌
*/
private String bread;
/**
* cpu核心数
*/
private String cpuCore;
/**
* 内存
*/
private String memory;
/**
* 硬盘
*/
private String disk;
/**
* 道路救援/飞侠车服/小仟安行/OA系统/财务系统/其他
*/
private String systemType;
/**
* 用途
*/
private String purpose;
/**
* 服务名称
*/
private String serverName;
/**
* 宝山机房/高科西路机房/其他
*/
private String house;
/**
* 机柜编号
*/
private String idNo;
/**
* 地址
*/
private String address;
private Date buyDate;
/**
* 未启用/启用中/报废
*/
private String status;
private String createUser;
private Date createDate;
private String updateUser;
private Date updateDate;
private String code;
private String ip;
}

74
src/main/java/com/sa/zentao/entity/ZtDevelopFeedback.java
View File

@ -1,74 +0,0 @@
package com.sa.zentao.entity;
import java.time.LocalDateTime;
import java.sql.Blob;
import java.io.Serializable;
import java.util.Date;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import lombok.Data;
import lombok.EqualsAndHashCode;
/**
* <p>
*
* </p>
*
* @author gqb
* @since 2025-02-05
*/
@Data
@EqualsAndHashCode(callSuper = false)
public class ZtDevelopFeedback implements Serializable {
private static final long serialVersionUID = 1L;
@TableId(value = "id", type = IdType.AUTO)
private Integer id;
/**
* 产品
*/
private Integer productId;
/**
* 等级
*/
private Integer level;
/**
* 提出时间
*/
private Date proposeTime;
/**
* 责任人
*/
private String assignedTo;
/**
* 描述
*/
private String remark;
/**
* 分析描述
*/
private String analysisRemark;
/**
* 处理措施
*/
private String handleRemark;
private String createUser;
private Date createDate;
private Date updateDate;
private String updateUser;
}

1
src/main/java/com/sa/zentao/entity/ZtEffort.java
View File

@ -27,7 +27,6 @@ public class ZtEffort implements Serializable {
@TableId(value = "id", type = IdType.AUTO)
private Integer id;
//task userStoryTask
@TableField("objectType")
private String objecttype;

76
src/main/java/com/sa/zentao/entity/ZtMeeting.java
View File

@ -1,76 +0,0 @@
package com.sa.zentao.entity;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import java.sql.Blob;
import java.io.Serializable;
import java.util.Date;
import com.sa.zentao.enums.MeetingTypeEnums;
import lombok.Data;
import lombok.EqualsAndHashCode;
/**
* <p>
*
* </p>
*
* @author gqb
* @since 2025-01-24
*/
@Data
@EqualsAndHashCode(callSuper = false)
public class ZtMeeting implements Serializable {
private static final long serialVersionUID = 1L;
@TableId(value = "id", type = IdType.AUTO)
private Integer id;
private Integer productId;
/**
* 会议名称
*/
private String name;
/**
* 会议类型 周会议/需求会议/临时会议
*/
private MeetingTypeEnums type;
/**
* 时间
*/
private Date meetingDate;
/**
* 用户,隔开
*/
private String users;
/**
* 会议内容
*/
private String remark;
private String createUser;
private Date createDate;
private String updateUser;
private Date updateDate;
private String address;
private String title;
// private Integer userStory;
private String storyIds;
private String result;
private String meetingAfter;
}

47
src/main/java/com/sa/zentao/entity/ZtMonthScore.java
View File

@ -1,47 +0,0 @@
package com.sa.zentao.entity;
import java.time.LocalDateTime;
import java.io.Serializable;
import java.util.Date;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import lombok.Data;
import lombok.EqualsAndHashCode;
/**
* <p>
*
* </p>
*
* @author gqb
* @since 2025-04-24
*/
@Data
@EqualsAndHashCode(callSuper = false)
public class ZtMonthScore implements Serializable {
private static final long serialVersionUID = 1L;
@TableId(value = "id", type = IdType.AUTO)
private Integer id;
private String account;
/**
* 2022-07
*/
private String dateStr;
private String scopeJson;
private Date createDate;
private String createUser;
private Date updateDate;
private String updateUser;
}

3
src/main/java/com/sa/zentao/entity/ZtProduct.java
View File

@ -129,7 +129,7 @@ public class ZtProduct implements Serializable {
private String createdVersion;
@TableField("closedDate")
private Date closedDate;
private LocalDate closedDate;
@TableField("`order`")
private Integer order;
@ -138,6 +138,5 @@ public class ZtProduct implements Serializable {
private String deleted;
private Integer yss;
}

3
src/main/java/com/sa/zentao/entity/ZtProject.java
View File

@ -29,9 +29,6 @@ public class ZtProject implements Serializable {
private Integer project;
@TableField(exist = false)
private String projectName;
private Integer charter;
private String model;

6
src/main/java/com/sa/zentao/entity/ZtProjectstory.java
View File

@ -24,6 +24,7 @@ public class ZtProjectstory implements Serializable {
private Integer product;
private Integer execution;
private Integer branch;
@ -33,9 +34,6 @@ public class ZtProjectstory implements Serializable {
@TableField("`order`")
private Integer order;
//execution project
@TableField("`type`")
private String type;
// private Integer execution;
}

15
src/main/java/com/sa/zentao/entity/ZtRelease.java
View File

@ -1,6 +1,5 @@
package com.sa.zentao.entity;
import com.baomidou.mybatisplus.annotation.FieldStrategy;
import com.baomidou.mybatisplus.annotation.IdType;
import java.time.LocalDate;
import com.baomidou.mybatisplus.annotation.TableId;
@ -29,7 +28,7 @@ public class ZtRelease implements Serializable {
@TableId(value = "id", type = IdType.AUTO)
private Integer id;
private Integer project;
private String project;
private Integer product;
@ -57,12 +56,10 @@ public class ZtRelease implements Serializable {
private String mailto;
private String notify;
//active 激活
//reviewing待评审
//reviewingError 评审失败
//waitRelease 待发布
//released 发不成功
//close 关闭
//close 发布失败
@TableField("`status`")
private String status;
@ -80,9 +77,7 @@ public class ZtRelease implements Serializable {
private String executions;
@TableField("`level`")
private String level;
//真实发布时间
// @TableField(exist = false)
private Date realReleaseDate;
private String danger;
private String assignedTo;
@ -93,10 +88,8 @@ public class ZtRelease implements Serializable {
private String noticeContent;
@TableField(updateStrategy = FieldStrategy.IGNORED)
private String failRemark;
private String releaseFailRemark;
private String releaseUser;
}

4
src/main/java/com/sa/zentao/entity/ZtReleaseDetails.java
View File

@ -27,9 +27,9 @@ public class ZtReleaseDetails implements Serializable {
private Integer releaseId;
private Integer objectId;
//story bug
private String objectType;
// closed 关闭 wait
// released已发布 closed 关闭
private String status;

18
src/main/java/com/sa/zentao/entity/ZtStory.java
View File

@ -1,6 +1,5 @@
package com.sa.zentao.entity;
import com.baomidou.mybatisplus.annotation.FieldStrategy;
import com.baomidou.mybatisplus.annotation.IdType;
import java.time.LocalDate;
import com.baomidou.mybatisplus.annotation.TableId;
@ -62,7 +61,7 @@ public class ZtStory implements Serializable {
private Integer pri;
private Float estimate;
//reviewing 评审中 active 激活 draft 草稿 //finished 完成 验收完成
//reviewing 评审中 active 激活 draft 草稿
private String status;
@TableField("subStatus")
@ -184,9 +183,9 @@ public class ZtStory implements Serializable {
private Date planStartDate;
//计划结束时间
private Date planEndDate;
//开始日期 开发开始
//开始日期
private Date startDate;
//结束日期 测试结束
//结束日期
private Date endDate;
private Integer project;
@ -194,21 +193,10 @@ public class ZtStory implements Serializable {
private Integer ysFlag;
private String ysRemark;
//开发完毕日期
private Date developedDate;
@TableField(updateStrategy = FieldStrategy.IGNORED)
private Integer userStory;
private String ysUser;
private Integer taskCount;
//验收时间
private Date ysDate;
// //开发完成时间
// private Date develDate;
// //测试完成时间
// private Date testedDate;
}

55
src/main/java/com/sa/zentao/entity/ZtStoryCase.java
View File

@ -1,55 +0,0 @@
package com.sa.zentao.entity;
import java.time.LocalDateTime;
import java.io.Serializable;
import java.util.Date;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import lombok.Data;
import lombok.EqualsAndHashCode;
/**
* <p>
*
* </p>
*
* @author gqb
* @since 2025-05-07
*/
@Data
@EqualsAndHashCode(callSuper = false)
public class ZtStoryCase implements Serializable {
private static final long serialVersionUID = 1L;
@TableId(value = "id", type = IdType.AUTO)
private Integer id;
private String remark;
private Integer story;
private Date openedDate;
private String openedUser;
private Date updateDate;
private String updateUser;
private String psUser;
private Date psDate;
/**
* wait reviewing refuse 拒绝 finished
*/
private String status;
private Integer product;
private Integer execution;
private Integer project;
}

32
src/main/java/com/sa/zentao/entity/ZtStoryFeedback.java
View File

@ -3,14 +3,9 @@ package com.sa.zentao.entity;
import java.time.LocalDateTime;
import java.io.Serializable;
import java.util.Date;
import java.util.List;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.sa.zentao.dao.ZtBugDTO;
import com.sa.zentao.dao.ZtStoryDTO;
import com.sa.zentao.dao.ZtTaskDTO;
import lombok.Data;
import lombok.EqualsAndHashCode;
@ -69,11 +64,10 @@ public class ZtStoryFeedback implements Serializable {
private String assignedTo;
private String spec;
// wait doing finished closed
// wait doing finished submitVerified 提交验收 closed reviewing verified 验收 dontHand 无需处理 （查询用noVerified 验收不通过）
private String status;
//处理完成描述
private String finishedRemark;
private String fileUrl;
@ -86,30 +80,10 @@ public class ZtStoryFeedback implements Serializable {
//预计完成时间
private Date planFinishDate;
//处理完成时间
private Date finishDate;
//验收时间
private Date ysDate;
//响应时间 处理时间
private Date handDate;
//关闭日期
private Date closeDate;
private String closedBy;
// 来源 zentao weixin
private String openSource;
private String approvalRemark;
private String businessId;
private String weixin;
//1通过 2不通过
private Integer ysFlag;
private String dontHandSelect;
private String dontHandRemark;
}

30
src/main/java/com/sa/zentao/entity/ZtStoryUser.java
View File

@ -8,7 +8,6 @@ import com.baomidou.mybatisplus.annotation.TableField;
import java.io.Serializable;
import java.util.Date;
import com.sa.zentao.enums.UserStoryEnums;
import lombok.Data;
import lombok.EqualsAndHashCode;
@ -65,21 +64,6 @@ public class ZtStoryUser implements Serializable {
private Float estimate;
// active finished closed //reviewing 评审中 active 激活 draft 草稿
/// DPS("reviewing", "待评审",0),
// CG("draft", "草稿",1),
// JH("active", "激活",2),
// UNCFM("unconfirmed", "产品确认中",3),
// DGT("waitcommunicate", "待沟通",4),
//
// DSJ("waitdesign","需求待设计",5),
// XXSJZ("designdoing","详细设计中",6),
// CPYSJ("designdone","产品已设计",7),
// //待确认
// DQR("storyunconfirmed","需求待确认",8),
// CFM("confirmed","需求已确认",9),
// KFZ("developing","研发中",10),
// YWC("finished","已完成",11),
// CLOSED("closed","已关闭",12),
private String status;
// reviewing
@TableField("subStatus")
@ -208,20 +192,8 @@ public class ZtStoryUser implements Serializable {
* 1通过 2不通过
*/
private Integer ysFlag;
/**
* 验收人
*/
private String ysUser;
private String ysRemark;
private String spec;
private String fileUrl;
private String verify;
private Date psDate;
private String deliverRemark;
private String oldStatus;
}

Some files were not shown because too many files have changed in this diff Show More