【admin】新增# 1.删除部分无用代码 2.修改小程序返回角色 3.新增检修工单部分功能
parent
603ec88e37
commit
c780e29995
|
|
@ -1,110 +0,0 @@
|
|||
package com.hcy.admin.controller.commonFault;
|
||||
|
||||
import com.hcy.admin.config.aop.Log;
|
||||
import com.hcy.admin.service.commonFault.ICommonFaultService;
|
||||
import com.hcy.admin.validate.commonFault.CommonFaultParam;
|
||||
import com.hcy.admin.validate.common.PageParam;
|
||||
import com.hcy.admin.vo.commonFault.CommonFaultListVo;
|
||||
import com.hcy.admin.vo.commonFault.CommonFaultDetailVo;
|
||||
import com.hcy.common.core.AjaxResult;
|
||||
import com.hcy.common.core.PageResult;
|
||||
import com.hcy.common.validator.annotation.IDMust;
|
||||
import org.springframework.validation.annotation.Validated;
|
||||
import org.springframework.web.bind.annotation.*;
|
||||
|
||||
import javax.annotation.Resource;
|
||||
import java.util.Map;
|
||||
|
||||
/**
|
||||
* 常见故障管理管理
|
||||
*/
|
||||
@RestController
|
||||
@RequestMapping("api/commonFault")
|
||||
public class CommonFaultController {
|
||||
|
||||
@Resource
|
||||
ICommonFaultService iCommonFaultService;
|
||||
|
||||
/**
|
||||
* 常见故障管理列表
|
||||
*
|
||||
* @author hcy
|
||||
* @param pageParam 分页参数
|
||||
* @param params 搜索参数
|
||||
* @return Object
|
||||
*/
|
||||
@GetMapping("/list")
|
||||
public Object list(@Validated PageParam pageParam,
|
||||
@RequestParam Map<String, String> params) {
|
||||
PageResult<CommonFaultListVo> list = iCommonFaultService.list(pageParam, params);
|
||||
return AjaxResult.success(list);
|
||||
}
|
||||
/**
|
||||
* 常见故障管理详情
|
||||
*
|
||||
* @author hcy
|
||||
* @param id 主键ID
|
||||
* @return Object
|
||||
*/
|
||||
@GetMapping("/detail")
|
||||
public Object detail(@Validated @IDMust() @RequestParam("id") Integer id) {
|
||||
CommonFaultDetailVo detail = iCommonFaultService.detail(id);
|
||||
return AjaxResult.success(detail);
|
||||
}
|
||||
|
||||
/**
|
||||
* 常见故障管理新增
|
||||
*
|
||||
* @author hcy
|
||||
* @param commonFaultParam 参数
|
||||
* @return Object
|
||||
*/
|
||||
@Log(title = "常见故障管理新增")
|
||||
@PostMapping("/add")
|
||||
public Object add(@Validated(value = CommonFaultParam.create.class) @RequestBody CommonFaultParam commonFaultParam) {
|
||||
iCommonFaultService.add(commonFaultParam);
|
||||
return AjaxResult.success();
|
||||
}
|
||||
|
||||
/**
|
||||
* 常见故障管理编辑
|
||||
*
|
||||
* @author hcy
|
||||
* @param commonFaultParam 参数
|
||||
* @return Object
|
||||
*/
|
||||
@Log(title = "常见故障管理编辑")
|
||||
@PostMapping("/edit")
|
||||
public Object edit(@Validated(value = CommonFaultParam.update.class) @RequestBody CommonFaultParam commonFaultParam) {
|
||||
iCommonFaultService.edit(commonFaultParam);
|
||||
return AjaxResult.success();
|
||||
}
|
||||
|
||||
/**
|
||||
* 常见故障管理删除
|
||||
*
|
||||
* @author hcy
|
||||
* @param commonFaultParam 参数
|
||||
* @return Object
|
||||
*/
|
||||
@Log(title = "常见故障管理删除")
|
||||
@PostMapping("/del")
|
||||
public Object del(@Validated(value = CommonFaultParam.delete.class) @RequestBody CommonFaultParam commonFaultParam) {
|
||||
iCommonFaultService.del(Math.toIntExact(commonFaultParam.getId()));
|
||||
return AjaxResult.success();
|
||||
}
|
||||
|
||||
/**
|
||||
* 常见故障管理改变状态
|
||||
*
|
||||
* @author hcy
|
||||
* @param commonFaultParam 参数
|
||||
* @return Object
|
||||
*/
|
||||
@Log(title = "常见故障管理改变状态")
|
||||
@PostMapping("/stateEdit")
|
||||
public Object stateEdit(@RequestBody CommonFaultParam commonFaultParam) {
|
||||
iCommonFaultService.stateEdit(commonFaultParam);
|
||||
return AjaxResult.success();
|
||||
}
|
||||
}
|
||||
|
|
@ -1,110 +0,0 @@
|
|||
package com.hcy.admin.controller.commonMaintenance;
|
||||
|
||||
import com.hcy.admin.config.aop.Log;
|
||||
import com.hcy.admin.service.commonMaintenance.ICommonMaintenanceService;
|
||||
import com.hcy.admin.validate.CommonMaintenance.CommonMaintenanceParam;
|
||||
import com.hcy.admin.validate.common.PageParam;
|
||||
import com.hcy.admin.vo.CommonMaintenance.CommonMaintenanceListVo;
|
||||
import com.hcy.admin.vo.CommonMaintenance.CommonMaintenanceDetailVo;
|
||||
import com.hcy.common.core.AjaxResult;
|
||||
import com.hcy.common.core.PageResult;
|
||||
import com.hcy.common.validator.annotation.IDMust;
|
||||
import org.springframework.validation.annotation.Validated;
|
||||
import org.springframework.web.bind.annotation.*;
|
||||
|
||||
import javax.annotation.Resource;
|
||||
import java.util.Map;
|
||||
|
||||
/**
|
||||
* 常见维修结论描述管理
|
||||
*/
|
||||
@RestController
|
||||
@RequestMapping("api/CommonMaintenance")
|
||||
public class CommonMaintenanceController {
|
||||
|
||||
@Resource
|
||||
ICommonMaintenanceService iCommonMaintenanceService;
|
||||
|
||||
/**
|
||||
* 常见维修结论描述列表
|
||||
*
|
||||
* @author hcy
|
||||
* @param pageParam 分页参数
|
||||
* @param params 搜索参数
|
||||
* @return Object
|
||||
*/
|
||||
@GetMapping("/list")
|
||||
public Object list(@Validated PageParam pageParam,
|
||||
@RequestParam Map<String, String> params) {
|
||||
PageResult<CommonMaintenanceListVo> list = iCommonMaintenanceService.list(pageParam, params);
|
||||
return AjaxResult.success(list);
|
||||
}
|
||||
/**
|
||||
* 常见维修结论描述详情
|
||||
*
|
||||
* @author hcy
|
||||
* @param id 主键ID
|
||||
* @return Object
|
||||
*/
|
||||
@GetMapping("/detail")
|
||||
public Object detail(@Validated @IDMust() @RequestParam("id") Integer id) {
|
||||
CommonMaintenanceDetailVo detail = iCommonMaintenanceService.detail(id);
|
||||
return AjaxResult.success(detail);
|
||||
}
|
||||
|
||||
/**
|
||||
* 常见维修结论描述新增
|
||||
*
|
||||
* @author hcy
|
||||
* @param commonMaintenanceParam 参数
|
||||
* @return Object
|
||||
*/
|
||||
@Log(title = "常见维修结论描述新增")
|
||||
@PostMapping("/add")
|
||||
public Object add(@Validated(value = CommonMaintenanceParam.create.class) @RequestBody CommonMaintenanceParam commonMaintenanceParam) {
|
||||
iCommonMaintenanceService.add(commonMaintenanceParam);
|
||||
return AjaxResult.success();
|
||||
}
|
||||
|
||||
/**
|
||||
* 常见维修结论描述编辑
|
||||
*
|
||||
* @author hcy
|
||||
* @param commonMaintenanceParam 参数
|
||||
* @return Object
|
||||
*/
|
||||
@Log(title = "常见维修结论描述编辑")
|
||||
@PostMapping("/edit")
|
||||
public Object edit(@Validated(value = CommonMaintenanceParam.update.class) @RequestBody CommonMaintenanceParam commonMaintenanceParam) {
|
||||
iCommonMaintenanceService.edit(commonMaintenanceParam);
|
||||
return AjaxResult.success();
|
||||
}
|
||||
|
||||
/**
|
||||
* 常见维修结论描述删除
|
||||
*
|
||||
* @author hcy
|
||||
* @param commonMaintenanceParam 参数
|
||||
* @return Object
|
||||
*/
|
||||
@Log(title = "常见维修结论描述删除")
|
||||
@PostMapping("/del")
|
||||
public Object del(@Validated(value = CommonMaintenanceParam.delete.class) @RequestBody CommonMaintenanceParam commonMaintenanceParam) {
|
||||
iCommonMaintenanceService.del(Math.toIntExact(commonMaintenanceParam.getId()));
|
||||
return AjaxResult.success();
|
||||
}
|
||||
|
||||
/**
|
||||
* 常见故障管理改变状态
|
||||
*
|
||||
* @author hcy
|
||||
* @param commonMaintenanceParam 参数
|
||||
* @return Object
|
||||
*/
|
||||
@Log(title = "常见故障管理改变状态")
|
||||
@PostMapping("/stateEdit")
|
||||
public Object stateEdit(@RequestBody CommonMaintenanceParam commonMaintenanceParam) {
|
||||
iCommonMaintenanceService.stateEdit(commonMaintenanceParam);
|
||||
return AjaxResult.success();
|
||||
}
|
||||
}
|
||||
|
|
@ -1,110 +0,0 @@
|
|||
package com.hcy.admin.controller.commonOverhaul;
|
||||
|
||||
import com.hcy.admin.config.aop.Log;
|
||||
import com.hcy.admin.service.commonOverhaul.ICommonOverhaulService;
|
||||
import com.hcy.admin.validate.CommonOverhaul.CommonOverhaulParam;
|
||||
import com.hcy.admin.validate.common.PageParam;
|
||||
import com.hcy.admin.vo.CommonOverhaul.CommonOverhaulListVo;
|
||||
import com.hcy.admin.vo.CommonOverhaul.CommonOverhaulDetailVo;
|
||||
import com.hcy.common.core.AjaxResult;
|
||||
import com.hcy.common.core.PageResult;
|
||||
import com.hcy.common.validator.annotation.IDMust;
|
||||
import org.springframework.validation.annotation.Validated;
|
||||
import org.springframework.web.bind.annotation.*;
|
||||
|
||||
import javax.annotation.Resource;
|
||||
import java.util.Map;
|
||||
|
||||
/**
|
||||
* 常见检修结论描述管理
|
||||
*/
|
||||
@RestController
|
||||
@RequestMapping("api/CommonOverhaul")
|
||||
public class CommonOverhaulController {
|
||||
|
||||
@Resource
|
||||
ICommonOverhaulService iCommonOverhaulService;
|
||||
|
||||
/**
|
||||
* 常见检修结论描述列表
|
||||
*
|
||||
* @author hcy
|
||||
* @param pageParam 分页参数
|
||||
* @param params 搜索参数
|
||||
* @return Object
|
||||
*/
|
||||
@GetMapping("/list")
|
||||
public Object list(@Validated PageParam pageParam,
|
||||
@RequestParam Map<String, String> params) {
|
||||
PageResult<CommonOverhaulListVo> list = iCommonOverhaulService.list(pageParam, params);
|
||||
return AjaxResult.success(list);
|
||||
}
|
||||
/**
|
||||
* 常见检修结论描述详情
|
||||
*
|
||||
* @author hcy
|
||||
* @param id 主键ID
|
||||
* @return Object
|
||||
*/
|
||||
@GetMapping("/detail")
|
||||
public Object detail(@Validated @IDMust() @RequestParam("id") Integer id) {
|
||||
CommonOverhaulDetailVo detail = iCommonOverhaulService.detail(id);
|
||||
return AjaxResult.success(detail);
|
||||
}
|
||||
|
||||
/**
|
||||
* 常见检修结论描述新增
|
||||
*
|
||||
* @author hcy
|
||||
* @param commonOverhaulParam 参数
|
||||
* @return Object
|
||||
*/
|
||||
@Log(title = "常见检修结论描述新增")
|
||||
@PostMapping("/add")
|
||||
public Object add(@Validated(value = CommonOverhaulParam.create.class) @RequestBody CommonOverhaulParam commonOverhaulParam) {
|
||||
iCommonOverhaulService.add(commonOverhaulParam);
|
||||
return AjaxResult.success();
|
||||
}
|
||||
|
||||
/**
|
||||
* 常见检修结论描述编辑
|
||||
*
|
||||
* @author hcy
|
||||
* @param commonOverhaulParam 参数
|
||||
* @return Object
|
||||
*/
|
||||
@Log(title = "常见检修结论描述编辑")
|
||||
@PostMapping("/edit")
|
||||
public Object edit(@Validated(value = CommonOverhaulParam.update.class) @RequestBody CommonOverhaulParam commonOverhaulParam) {
|
||||
iCommonOverhaulService.edit(commonOverhaulParam);
|
||||
return AjaxResult.success();
|
||||
}
|
||||
|
||||
/**
|
||||
* 常见检修结论描述删除
|
||||
*
|
||||
* @author hcy
|
||||
* @param commonOverhaulParam 参数
|
||||
* @return Object
|
||||
*/
|
||||
@Log(title = "常见检修结论描述删除")
|
||||
@PostMapping("/del")
|
||||
public Object del(@Validated(value = CommonOverhaulParam.delete.class) @RequestBody CommonOverhaulParam commonOverhaulParam) {
|
||||
iCommonOverhaulService.del(Math.toIntExact(commonOverhaulParam.getId()));
|
||||
return AjaxResult.success();
|
||||
}
|
||||
|
||||
/**
|
||||
* 常见故障管理改变状态
|
||||
*
|
||||
* @author hcy
|
||||
* @param commonOverhaulParam 参数
|
||||
* @return Object
|
||||
*/
|
||||
@Log(title = "常见故障管理改变状态")
|
||||
@PostMapping("/stateEdit")
|
||||
public Object stateEdit(@RequestBody CommonOverhaulParam commonOverhaulParam) {
|
||||
iCommonOverhaulService.stateEdit(commonOverhaulParam);
|
||||
return AjaxResult.success();
|
||||
}
|
||||
}
|
||||
|
|
@ -29,13 +29,12 @@ public class MaintenanceOrderController {
|
|||
* 检修订单列表
|
||||
*
|
||||
* @param pageParam 分页参数
|
||||
* @param params 搜索参数
|
||||
* @param maintenanceOrderParam 搜索参数
|
||||
* @return Object
|
||||
*/
|
||||
@GetMapping("/list")
|
||||
public Object list(@Validated PageParam pageParam,
|
||||
@RequestParam Map<String, String> params) {
|
||||
PageResult<MaintenanceOrderListVo> list = iMaintenanceOrderService.list(pageParam, params);
|
||||
public Object list(@Validated PageParam pageParam, MaintenanceOrderParam maintenanceOrderParam) {
|
||||
PageResult<MaintenanceOrderListVo> list = iMaintenanceOrderService.list(pageParam, maintenanceOrderParam);
|
||||
return AjaxResult.success(list);
|
||||
}
|
||||
/**
|
||||
|
|
|
|||
|
|
@ -1,110 +0,0 @@
|
|||
package com.hcy.admin.controller.scrapType;
|
||||
|
||||
import com.hcy.admin.config.aop.Log;
|
||||
import com.hcy.admin.service.scrapType.IScrapTypeService;
|
||||
import com.hcy.admin.validate.ScrapType.ScrapTypeParam;
|
||||
import com.hcy.admin.validate.common.PageParam;
|
||||
import com.hcy.admin.vo.ScrapType.ScrapTypeListVo;
|
||||
import com.hcy.admin.vo.ScrapType.ScrapTypeDetailVo;
|
||||
import com.hcy.common.core.AjaxResult;
|
||||
import com.hcy.common.core.PageResult;
|
||||
import com.hcy.common.validator.annotation.IDMust;
|
||||
import org.springframework.validation.annotation.Validated;
|
||||
import org.springframework.web.bind.annotation.*;
|
||||
|
||||
import javax.annotation.Resource;
|
||||
import java.util.Map;
|
||||
|
||||
/**
|
||||
* 报废类型管理管理
|
||||
*/
|
||||
@RestController
|
||||
@RequestMapping("api/ScrapType")
|
||||
public class ScrapTypeController {
|
||||
|
||||
@Resource
|
||||
IScrapTypeService iScrapTypeService;
|
||||
|
||||
/**
|
||||
* 报废类型管理列表
|
||||
*
|
||||
* @author hcy
|
||||
* @param pageParam 分页参数
|
||||
* @param params 搜索参数
|
||||
* @return Object
|
||||
*/
|
||||
@GetMapping("/list")
|
||||
public Object list(@Validated PageParam pageParam,
|
||||
@RequestParam Map<String, String> params) {
|
||||
PageResult<ScrapTypeListVo> list = iScrapTypeService.list(pageParam, params);
|
||||
return AjaxResult.success(list);
|
||||
}
|
||||
/**
|
||||
* 报废类型管理详情
|
||||
*
|
||||
* @author hcy
|
||||
* @param id 主键ID
|
||||
* @return Object
|
||||
*/
|
||||
@GetMapping("/detail")
|
||||
public Object detail(@Validated @IDMust() @RequestParam("id") Integer id) {
|
||||
ScrapTypeDetailVo detail = iScrapTypeService.detail(id);
|
||||
return AjaxResult.success(detail);
|
||||
}
|
||||
|
||||
/**
|
||||
* 报废类型管理新增
|
||||
*
|
||||
* @author hcy
|
||||
* @param scrapTypeParam 参数
|
||||
* @return Object
|
||||
*/
|
||||
@Log(title = "报废类型管理新增")
|
||||
@PostMapping("/add")
|
||||
public Object add(@Validated(value = ScrapTypeParam.create.class) @RequestBody ScrapTypeParam scrapTypeParam) {
|
||||
iScrapTypeService.add(scrapTypeParam);
|
||||
return AjaxResult.success();
|
||||
}
|
||||
|
||||
/**
|
||||
* 报废类型管理编辑
|
||||
*
|
||||
* @author hcy
|
||||
* @param scrapTypeParam 参数
|
||||
* @return Object
|
||||
*/
|
||||
@Log(title = "报废类型管理编辑")
|
||||
@PostMapping("/edit")
|
||||
public Object edit(@Validated(value = ScrapTypeParam.update.class) @RequestBody ScrapTypeParam scrapTypeParam) {
|
||||
iScrapTypeService.edit(scrapTypeParam);
|
||||
return AjaxResult.success();
|
||||
}
|
||||
|
||||
/**
|
||||
* 报废类型管理删除
|
||||
*
|
||||
* @author hcy
|
||||
* @param scrapTypeParam 参数
|
||||
* @return Object
|
||||
*/
|
||||
@Log(title = "报废类型管理删除")
|
||||
@PostMapping("/del")
|
||||
public Object del(@Validated(value = ScrapTypeParam.delete.class) @RequestBody ScrapTypeParam scrapTypeParam) {
|
||||
iScrapTypeService.del(Math.toIntExact(scrapTypeParam.getId()));
|
||||
return AjaxResult.success();
|
||||
}
|
||||
|
||||
/**
|
||||
* 常见故障管理改变状态
|
||||
*
|
||||
* @author hcy
|
||||
* @param scrapTypeParam 参数
|
||||
* @return Object
|
||||
*/
|
||||
@Log(title = "常见故障管理改变状态")
|
||||
@PostMapping("/stateEdit")
|
||||
public Object stateEdit(@RequestBody ScrapTypeParam scrapTypeParam) {
|
||||
iScrapTypeService.stateEdit(scrapTypeParam);
|
||||
return AjaxResult.success();
|
||||
}
|
||||
}
|
||||
|
|
@ -1,65 +0,0 @@
|
|||
package com.hcy.admin.service.commonFault;
|
||||
|
||||
import com.hcy.admin.validate.common.PageParam;
|
||||
import com.hcy.admin.validate.commonFault.CommonFaultParam;
|
||||
import com.hcy.admin.vo.commonFault.CommonFaultListVo;
|
||||
import com.hcy.admin.vo.commonFault.CommonFaultDetailVo;
|
||||
import com.hcy.common.core.PageResult;
|
||||
import org.springframework.web.bind.annotation.RequestBody;
|
||||
|
||||
import java.util.Map;
|
||||
|
||||
/**
|
||||
* 常见故障管理服务接口类
|
||||
*/
|
||||
public interface ICommonFaultService {
|
||||
|
||||
/**
|
||||
* 常见故障管理列表
|
||||
*
|
||||
* @author hcy
|
||||
* @param pageParam 分页参数
|
||||
* @param params 搜索参数
|
||||
* @return PageResult<CommonFaultVo>
|
||||
*/
|
||||
PageResult<CommonFaultListVo> list(PageParam pageParam, Map<String, String> params);
|
||||
|
||||
/**
|
||||
* 常见故障管理详情
|
||||
*
|
||||
* @author hcy
|
||||
* @param id 主键ID
|
||||
* @return CommonFault
|
||||
*/
|
||||
CommonFaultDetailVo detail(Integer id);
|
||||
|
||||
/**
|
||||
* 常见故障管理新增
|
||||
*
|
||||
* @author hcy
|
||||
* @param commonFaultParam 参数
|
||||
*/
|
||||
void add(CommonFaultParam commonFaultParam);
|
||||
|
||||
/**
|
||||
* 常见故障管理编辑
|
||||
*
|
||||
* @author hcy
|
||||
* @param commonFaultParam 参数
|
||||
*/
|
||||
void edit(CommonFaultParam commonFaultParam);
|
||||
|
||||
/**
|
||||
* 常见故障管理删除
|
||||
*
|
||||
* @author hcy
|
||||
* @param id 主键ID
|
||||
*/
|
||||
void del(Integer id);
|
||||
|
||||
/**
|
||||
* 常见故障管理改变状态
|
||||
* @param commonFaultParam
|
||||
*/
|
||||
void stateEdit(CommonFaultParam commonFaultParam);
|
||||
}
|
||||
|
|
@ -1,182 +0,0 @@
|
|||
package com.hcy.admin.service.commonFault.impl;
|
||||
|
||||
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
|
||||
import com.baomidou.mybatisplus.core.metadata.IPage;
|
||||
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
||||
import com.github.yulichang.query.MPJQueryWrapper;
|
||||
import com.hcy.admin.service.commonFault.ICommonFaultService;
|
||||
import com.hcy.admin.validate.common.PageParam;
|
||||
import com.hcy.admin.validate.commonFault.CommonFaultParam;
|
||||
import com.hcy.admin.vo.commonFault.CommonFaultListVo;
|
||||
import com.hcy.admin.vo.commonFault.CommonFaultDetailVo;
|
||||
import com.hcy.common.core.PageResult;
|
||||
import com.hcy.common.entity.commonFault.CommonFault;
|
||||
import com.hcy.common.enums.commonFault.CommonFaultEnum;
|
||||
import com.hcy.common.mapper.commonFault.CommonFaultMapper;
|
||||
import com.hcy.common.utils.ArrayUtil;
|
||||
import com.hcy.common.utils.TimeUtil;
|
||||
import com.hcy.common.utils.UrlUtil;
|
||||
import com.hcy.common.config.GlobalConfig;
|
||||
import org.springframework.beans.BeanUtils;
|
||||
import org.springframework.stereotype.Service;
|
||||
import org.springframework.util.Assert;
|
||||
|
||||
import javax.annotation.Resource;
|
||||
import java.util.*;
|
||||
|
||||
/**
|
||||
* 常见故障管理实现类
|
||||
*/
|
||||
@Service
|
||||
public class CommonFaultServiceImpl implements ICommonFaultService {
|
||||
|
||||
@Resource
|
||||
CommonFaultMapper commonFaultMapper;
|
||||
|
||||
/**
|
||||
* 常见故障管理列表
|
||||
*
|
||||
* @author hcy
|
||||
* @param pageParam 分页参数
|
||||
* @param params 搜索参数
|
||||
* @return PageResult<CommonFaultListVo>
|
||||
*/
|
||||
@Override
|
||||
public PageResult<CommonFaultListVo> list(PageParam pageParam, Map<String, String> params) {
|
||||
Integer page = pageParam.getPageNo();
|
||||
Integer limit = pageParam.getPageSize();
|
||||
|
||||
QueryWrapper<CommonFault> queryWrapper = new QueryWrapper<>();
|
||||
queryWrapper.eq("is_delete", 0);
|
||||
queryWrapper.orderByDesc(Arrays.asList("sort", "id"));
|
||||
|
||||
commonFaultMapper.setSearch(queryWrapper, params, new String[]{
|
||||
"like:name:str",
|
||||
"=:accountStatus@account_status:int",
|
||||
});
|
||||
|
||||
IPage<CommonFault> iPage = commonFaultMapper.selectPage(new Page<>(page, limit), queryWrapper);
|
||||
|
||||
List<CommonFaultListVo> list = new LinkedList<>();
|
||||
for(CommonFault item : iPage.getRecords()) {
|
||||
CommonFaultListVo vo = new CommonFaultListVo();
|
||||
BeanUtils.copyProperties(item, vo);
|
||||
vo.setCreateTime(TimeUtil.timestampToDate(item.getCreateTime()));
|
||||
vo.setUpdateTime(TimeUtil.timestampToDate(item.getUpdateTime()));
|
||||
list.add(vo);
|
||||
}
|
||||
|
||||
return PageResult.iPageHandle(iPage.getTotal(), iPage.getCurrent(), iPage.getSize(), list);
|
||||
}
|
||||
|
||||
/**
|
||||
* 常见故障管理详情
|
||||
*
|
||||
* @author hcy
|
||||
* @param id 主键参数
|
||||
* @return CommonFault
|
||||
*/
|
||||
@Override
|
||||
public CommonFaultDetailVo detail(Integer id) {
|
||||
CommonFault model = commonFaultMapper.selectOne(
|
||||
new QueryWrapper<CommonFault>()
|
||||
.eq("id", id)
|
||||
.eq("is_delete", 0)
|
||||
.last("limit 1"));
|
||||
|
||||
Assert.notNull(model, "数据不存在");
|
||||
|
||||
CommonFaultDetailVo vo = new CommonFaultDetailVo();
|
||||
vo.setCreateTime(TimeUtil.timestampToDate(model.getCreateTime()));
|
||||
vo.setUpdateTime(TimeUtil.timestampToDate(model.getUpdateTime()));
|
||||
BeanUtils.copyProperties(model, vo);
|
||||
return vo;
|
||||
}
|
||||
|
||||
/**
|
||||
* 常见故障管理新增
|
||||
*
|
||||
* @author hcy
|
||||
* @param commonFaultParam 参数
|
||||
*/
|
||||
@Override
|
||||
public void add(CommonFaultParam commonFaultParam) {
|
||||
CommonFault model = new CommonFault();
|
||||
model.setName(commonFaultParam.getName());
|
||||
model.setSort(commonFaultParam.getSort());
|
||||
model.setDescription(commonFaultParam.getDescription());
|
||||
model.setAccountStatus(commonFaultParam.getAccountStatus());
|
||||
model.setCreateTime(System.currentTimeMillis() / 1000);
|
||||
commonFaultMapper.insert(model);
|
||||
}
|
||||
|
||||
/**
|
||||
* 常见故障管理编辑
|
||||
*
|
||||
* @author hcy
|
||||
* @param commonFaultParam 参数
|
||||
*/
|
||||
@Override
|
||||
public void edit(CommonFaultParam commonFaultParam) {
|
||||
CommonFault model = commonFaultMapper.selectOne(
|
||||
new QueryWrapper<CommonFault>()
|
||||
.eq("id", commonFaultParam.getId())
|
||||
.eq("is_delete", 0)
|
||||
.last("limit 1"));
|
||||
|
||||
Assert.notNull(model, "数据不存在!");
|
||||
|
||||
model.setId(commonFaultParam.getId());
|
||||
model.setName(commonFaultParam.getName());
|
||||
model.setSort(commonFaultParam.getSort());
|
||||
model.setDescription(commonFaultParam.getDescription());
|
||||
model.setAccountStatus(commonFaultParam.getAccountStatus());
|
||||
model.setUpdateTime(System.currentTimeMillis() / 1000);
|
||||
commonFaultMapper.updateById(model);
|
||||
}
|
||||
|
||||
/**
|
||||
* 常见故障管理删除
|
||||
*
|
||||
* @author hcy
|
||||
* @param id 主键ID
|
||||
*/
|
||||
@Override
|
||||
public void del(Integer id) {
|
||||
CommonFault model = commonFaultMapper.selectOne(
|
||||
new QueryWrapper<CommonFault>()
|
||||
.eq("id", id)
|
||||
.eq("is_delete", 0)
|
||||
.last("limit 1"));
|
||||
|
||||
Assert.notNull(model, "数据不存在!");
|
||||
|
||||
model.setIsDelete(1);
|
||||
model.setDeleteTime(System.currentTimeMillis() / 1000);
|
||||
commonFaultMapper.updateById(model);
|
||||
}
|
||||
|
||||
/**
|
||||
* 常见故障管理改变状态
|
||||
*
|
||||
* @param commonFaultParam
|
||||
*/
|
||||
@Override
|
||||
public void stateEdit(CommonFaultParam commonFaultParam) {
|
||||
CommonFault model = commonFaultMapper.selectOne(
|
||||
new QueryWrapper<CommonFault>()
|
||||
.eq("id", commonFaultParam.getId())
|
||||
.eq("is_delete", 0)
|
||||
.last("limit 1"));
|
||||
|
||||
Assert.notNull(model, "数据不存在!");
|
||||
if(model.getAccountStatus() == CommonFaultEnum.STARTUSING.getStatus()){
|
||||
model.setAccountStatus(CommonFaultEnum.BLOCKUP.getStatus());
|
||||
}else{
|
||||
model.setAccountStatus(CommonFaultEnum.STARTUSING.getStatus());
|
||||
}
|
||||
model.setUpdateTime(System.currentTimeMillis() / 1000);
|
||||
commonFaultMapper.updateById(model);
|
||||
}
|
||||
|
||||
}
|
||||
|
|
@ -1,64 +0,0 @@
|
|||
package com.hcy.admin.service.commonMaintenance;
|
||||
|
||||
import com.hcy.admin.validate.common.PageParam;
|
||||
import com.hcy.admin.validate.CommonMaintenance.CommonMaintenanceParam;
|
||||
import com.hcy.admin.vo.CommonMaintenance.CommonMaintenanceListVo;
|
||||
import com.hcy.admin.vo.CommonMaintenance.CommonMaintenanceDetailVo;
|
||||
import com.hcy.common.core.PageResult;
|
||||
|
||||
import java.util.Map;
|
||||
|
||||
/**
|
||||
* 常见维修结论描述服务接口类
|
||||
*/
|
||||
public interface ICommonMaintenanceService {
|
||||
|
||||
/**
|
||||
* 常见维修结论描述列表
|
||||
*
|
||||
* @author hcy
|
||||
* @param pageParam 分页参数
|
||||
* @param params 搜索参数
|
||||
* @return PageResult<CommonMaintenanceVo>
|
||||
*/
|
||||
PageResult<CommonMaintenanceListVo> list(PageParam pageParam, Map<String, String> params);
|
||||
|
||||
/**
|
||||
* 常见维修结论描述详情
|
||||
*
|
||||
* @author hcy
|
||||
* @param id 主键ID
|
||||
* @return CommonMaintenance
|
||||
*/
|
||||
CommonMaintenanceDetailVo detail(Integer id);
|
||||
|
||||
/**
|
||||
* 常见维修结论描述新增
|
||||
*
|
||||
* @author hcy
|
||||
* @param commonMaintenanceParam 参数
|
||||
*/
|
||||
void add(CommonMaintenanceParam commonMaintenanceParam);
|
||||
|
||||
/**
|
||||
* 常见维修结论描述编辑
|
||||
*
|
||||
* @author hcy
|
||||
* @param commonMaintenanceParam 参数
|
||||
*/
|
||||
void edit(CommonMaintenanceParam commonMaintenanceParam);
|
||||
|
||||
/**
|
||||
* 常见维修结论描述删除
|
||||
*
|
||||
* @author hcy
|
||||
* @param id 主键ID
|
||||
*/
|
||||
void del(Integer id);
|
||||
|
||||
/**
|
||||
* 常见故障管理改变状态
|
||||
* @param commonMaintenanceParam
|
||||
*/
|
||||
void stateEdit(CommonMaintenanceParam commonMaintenanceParam);
|
||||
}
|
||||
|
|
@ -1,176 +0,0 @@
|
|||
package com.hcy.admin.service.commonMaintenance.impl;
|
||||
|
||||
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
|
||||
import com.baomidou.mybatisplus.core.metadata.IPage;
|
||||
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
||||
import com.hcy.admin.service.commonMaintenance.ICommonMaintenanceService;
|
||||
import com.hcy.admin.validate.common.PageParam;
|
||||
import com.hcy.admin.validate.CommonMaintenance.CommonMaintenanceParam;
|
||||
import com.hcy.admin.vo.CommonMaintenance.CommonMaintenanceListVo;
|
||||
import com.hcy.admin.vo.CommonMaintenance.CommonMaintenanceDetailVo;
|
||||
import com.hcy.common.core.PageResult;
|
||||
import com.hcy.common.entity.CommonMaintenance.CommonMaintenance;
|
||||
import com.hcy.common.enums.commonFault.CommonFaultEnum;
|
||||
import com.hcy.common.mapper.CommonMaintenance.CommonMaintenanceMapper;
|
||||
import com.hcy.common.utils.TimeUtil;
|
||||
import org.springframework.beans.BeanUtils;
|
||||
import org.springframework.stereotype.Service;
|
||||
import org.springframework.util.Assert;
|
||||
|
||||
import javax.annotation.Resource;
|
||||
import java.util.*;
|
||||
|
||||
/**
|
||||
* 常见维修结论描述实现类
|
||||
*/
|
||||
@Service
|
||||
public class CommonMaintenanceServiceImpl implements ICommonMaintenanceService {
|
||||
|
||||
@Resource
|
||||
CommonMaintenanceMapper commonMaintenanceMapper;
|
||||
|
||||
/**
|
||||
* 常见维修结论描述列表
|
||||
*
|
||||
* @author hcy
|
||||
* @param pageParam 分页参数
|
||||
* @param params 搜索参数
|
||||
* @return PageResult<CommonMaintenanceListVo>
|
||||
*/
|
||||
@Override
|
||||
public PageResult<CommonMaintenanceListVo> list(PageParam pageParam, Map<String, String> params) {
|
||||
Integer page = pageParam.getPageNo();
|
||||
Integer limit = pageParam.getPageSize();
|
||||
|
||||
QueryWrapper<CommonMaintenance> queryWrapper = new QueryWrapper<>();
|
||||
queryWrapper.eq("is_delete", 0);
|
||||
queryWrapper.orderByDesc(Arrays.asList("sort", "id"));
|
||||
|
||||
commonMaintenanceMapper.setSearch(queryWrapper, params, new String[]{
|
||||
"like:name:str",
|
||||
"=:accountStatus@account_status:int",
|
||||
});
|
||||
|
||||
IPage<CommonMaintenance> iPage = commonMaintenanceMapper.selectPage(new Page<>(page, limit), queryWrapper);
|
||||
|
||||
List<CommonMaintenanceListVo> list = new LinkedList<>();
|
||||
for(CommonMaintenance item : iPage.getRecords()) {
|
||||
CommonMaintenanceListVo vo = new CommonMaintenanceListVo();
|
||||
BeanUtils.copyProperties(item, vo);
|
||||
vo.setCreateTime(TimeUtil.timestampToDate(item.getCreateTime()));
|
||||
vo.setUpdateTime(TimeUtil.timestampToDate(item.getUpdateTime()));
|
||||
list.add(vo);
|
||||
}
|
||||
|
||||
return PageResult.iPageHandle(iPage.getTotal(), iPage.getCurrent(), iPage.getSize(), list);
|
||||
}
|
||||
|
||||
/**
|
||||
* 常见维修结论描述详情
|
||||
*
|
||||
* @author hcy
|
||||
* @param id 主键参数
|
||||
* @return CommonMaintenance
|
||||
*/
|
||||
@Override
|
||||
public CommonMaintenanceDetailVo detail(Integer id) {
|
||||
CommonMaintenance model = commonMaintenanceMapper.selectOne(
|
||||
new QueryWrapper<CommonMaintenance>()
|
||||
.eq("id", id)
|
||||
.eq("is_delete", 0)
|
||||
.last("limit 1"));
|
||||
|
||||
Assert.notNull(model, "数据不存在");
|
||||
|
||||
CommonMaintenanceDetailVo vo = new CommonMaintenanceDetailVo();
|
||||
vo.setCreateTime(TimeUtil.timestampToDate(model.getCreateTime()));
|
||||
vo.setUpdateTime(TimeUtil.timestampToDate(model.getUpdateTime()));
|
||||
BeanUtils.copyProperties(model, vo);
|
||||
return vo;
|
||||
}
|
||||
|
||||
/**
|
||||
* 常见维修结论描述新增
|
||||
*
|
||||
* @author hcy
|
||||
* @param commonMaintenanceParam 参数
|
||||
*/
|
||||
@Override
|
||||
public void add(CommonMaintenanceParam commonMaintenanceParam) {
|
||||
CommonMaintenance model = new CommonMaintenance();
|
||||
model.setName(commonMaintenanceParam.getName());
|
||||
model.setSort(commonMaintenanceParam.getSort());
|
||||
model.setDescription(commonMaintenanceParam.getDescription());
|
||||
model.setAccountStatus(commonMaintenanceParam.getAccountStatus());
|
||||
model.setCreateTime(System.currentTimeMillis() / 1000);
|
||||
commonMaintenanceMapper.insert(model);
|
||||
}
|
||||
|
||||
/**
|
||||
* 常见维修结论描述编辑
|
||||
*
|
||||
* @author hcy
|
||||
* @param commonMaintenanceParam 参数
|
||||
*/
|
||||
@Override
|
||||
public void edit(CommonMaintenanceParam commonMaintenanceParam) {
|
||||
CommonMaintenance model = commonMaintenanceMapper.selectOne(
|
||||
new QueryWrapper<CommonMaintenance>()
|
||||
.eq("id", commonMaintenanceParam.getId())
|
||||
.eq("is_delete", 0)
|
||||
.last("limit 1"));
|
||||
|
||||
Assert.notNull(model, "数据不存在!");
|
||||
|
||||
model.setId(commonMaintenanceParam.getId());
|
||||
model.setName(commonMaintenanceParam.getName());
|
||||
model.setSort(commonMaintenanceParam.getSort());
|
||||
model.setDescription(commonMaintenanceParam.getDescription());
|
||||
model.setAccountStatus(commonMaintenanceParam.getAccountStatus());
|
||||
commonMaintenanceMapper.updateById(model);
|
||||
}
|
||||
|
||||
/**
|
||||
* 常见维修结论描述删除
|
||||
*
|
||||
* @author hcy
|
||||
* @param id 主键ID
|
||||
*/
|
||||
@Override
|
||||
public void del(Integer id) {
|
||||
CommonMaintenance model = commonMaintenanceMapper.selectOne(
|
||||
new QueryWrapper<CommonMaintenance>()
|
||||
.eq("id", id)
|
||||
.eq("is_delete", 0)
|
||||
.last("limit 1"));
|
||||
|
||||
Assert.notNull(model, "数据不存在!");
|
||||
|
||||
model.setIsDelete(1);
|
||||
model.setDeleteTime(System.currentTimeMillis() / 1000);
|
||||
commonMaintenanceMapper.updateById(model);
|
||||
}
|
||||
|
||||
/**
|
||||
* 常见故障管理改变状态
|
||||
*
|
||||
* @param commonMaintenanceParam
|
||||
*/
|
||||
@Override
|
||||
public void stateEdit(CommonMaintenanceParam commonMaintenanceParam) {
|
||||
CommonMaintenance model = commonMaintenanceMapper.selectOne(
|
||||
new QueryWrapper<CommonMaintenance>()
|
||||
.eq("id", commonMaintenanceParam.getId())
|
||||
.eq("is_delete", 0)
|
||||
.last("limit 1"));
|
||||
|
||||
Assert.notNull(model, "数据不存在!");
|
||||
if(model.getAccountStatus() == CommonFaultEnum.STARTUSING.getStatus()){
|
||||
model.setAccountStatus(CommonFaultEnum.BLOCKUP.getStatus());
|
||||
}else{
|
||||
model.setAccountStatus(CommonFaultEnum.STARTUSING.getStatus());
|
||||
}
|
||||
model.setUpdateTime(System.currentTimeMillis() / 1000);
|
||||
commonMaintenanceMapper.updateById(model);
|
||||
}
|
||||
}
|
||||
|
|
@ -1,64 +0,0 @@
|
|||
package com.hcy.admin.service.commonOverhaul;
|
||||
|
||||
import com.hcy.admin.validate.common.PageParam;
|
||||
import com.hcy.admin.validate.CommonOverhaul.CommonOverhaulParam;
|
||||
import com.hcy.admin.vo.CommonOverhaul.CommonOverhaulListVo;
|
||||
import com.hcy.admin.vo.CommonOverhaul.CommonOverhaulDetailVo;
|
||||
import com.hcy.common.core.PageResult;
|
||||
|
||||
import java.util.Map;
|
||||
|
||||
/**
|
||||
* 常见检修结论描述服务接口类
|
||||
*/
|
||||
public interface ICommonOverhaulService {
|
||||
|
||||
/**
|
||||
* 常见检修结论描述列表
|
||||
*
|
||||
* @author hcy
|
||||
* @param pageParam 分页参数
|
||||
* @param params 搜索参数
|
||||
* @return PageResult<CommonOverhaulVo>
|
||||
*/
|
||||
PageResult<CommonOverhaulListVo> list(PageParam pageParam, Map<String, String> params);
|
||||
|
||||
/**
|
||||
* 常见检修结论描述详情
|
||||
*
|
||||
* @author hcy
|
||||
* @param id 主键ID
|
||||
* @return CommonOverhaul
|
||||
*/
|
||||
CommonOverhaulDetailVo detail(Integer id);
|
||||
|
||||
/**
|
||||
* 常见检修结论描述新增
|
||||
*
|
||||
* @author hcy
|
||||
* @param commonOverhaulParam 参数
|
||||
*/
|
||||
void add(CommonOverhaulParam commonOverhaulParam);
|
||||
|
||||
/**
|
||||
* 常见检修结论描述编辑
|
||||
*
|
||||
* @author hcy
|
||||
* @param commonOverhaulParam 参数
|
||||
*/
|
||||
void edit(CommonOverhaulParam commonOverhaulParam);
|
||||
|
||||
/**
|
||||
* 常见检修结论描述删除
|
||||
*
|
||||
* @author hcy
|
||||
* @param id 主键ID
|
||||
*/
|
||||
void del(Integer id);
|
||||
|
||||
/**
|
||||
* 常见故障管理改变状态
|
||||
* @param commonOverhaulParam
|
||||
*/
|
||||
void stateEdit(CommonOverhaulParam commonOverhaulParam);
|
||||
}
|
||||
|
|
@ -1,177 +0,0 @@
|
|||
package com.hcy.admin.service.commonOverhaul.impl;
|
||||
|
||||
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
|
||||
import com.baomidou.mybatisplus.core.metadata.IPage;
|
||||
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
||||
import com.hcy.admin.service.commonOverhaul.ICommonOverhaulService;
|
||||
import com.hcy.admin.validate.common.PageParam;
|
||||
import com.hcy.admin.validate.CommonOverhaul.CommonOverhaulParam;
|
||||
import com.hcy.admin.vo.CommonOverhaul.CommonOverhaulListVo;
|
||||
import com.hcy.admin.vo.CommonOverhaul.CommonOverhaulDetailVo;
|
||||
import com.hcy.common.core.PageResult;
|
||||
import com.hcy.common.entity.CommonOverhaul.CommonOverhaul;
|
||||
import com.hcy.common.enums.commonFault.CommonFaultEnum;
|
||||
import com.hcy.common.mapper.CommonOverhaul.CommonOverhaulMapper;
|
||||
import com.hcy.common.utils.TimeUtil;
|
||||
import org.springframework.beans.BeanUtils;
|
||||
import org.springframework.stereotype.Service;
|
||||
import org.springframework.util.Assert;
|
||||
|
||||
import javax.annotation.Resource;
|
||||
import java.util.*;
|
||||
|
||||
/**
|
||||
* 常见检修结论描述实现类
|
||||
*/
|
||||
@Service
|
||||
public class CommonOverhaulServiceImpl implements ICommonOverhaulService {
|
||||
|
||||
@Resource
|
||||
CommonOverhaulMapper commonOverhaulMapper;
|
||||
|
||||
/**
|
||||
* 常见检修结论描述列表
|
||||
*
|
||||
* @author hcy
|
||||
* @param pageParam 分页参数
|
||||
* @param params 搜索参数
|
||||
* @return PageResult<CommonOverhaulListVo>
|
||||
*/
|
||||
@Override
|
||||
public PageResult<CommonOverhaulListVo> list(PageParam pageParam, Map<String, String> params) {
|
||||
Integer page = pageParam.getPageNo();
|
||||
Integer limit = pageParam.getPageSize();
|
||||
|
||||
QueryWrapper<CommonOverhaul> queryWrapper = new QueryWrapper<>();
|
||||
queryWrapper.eq("is_delete", 0);
|
||||
queryWrapper.orderByDesc(Arrays.asList("sort", "id"));
|
||||
|
||||
commonOverhaulMapper.setSearch(queryWrapper, params, new String[]{
|
||||
"like:name:str",
|
||||
"=:accountStatus@account_status:int",
|
||||
});
|
||||
|
||||
IPage<CommonOverhaul> iPage = commonOverhaulMapper.selectPage(new Page<>(page, limit), queryWrapper);
|
||||
|
||||
List<CommonOverhaulListVo> list = new LinkedList<>();
|
||||
for(CommonOverhaul item : iPage.getRecords()) {
|
||||
CommonOverhaulListVo vo = new CommonOverhaulListVo();
|
||||
BeanUtils.copyProperties(item, vo);
|
||||
vo.setCreateTime(TimeUtil.timestampToDate(item.getCreateTime()));
|
||||
vo.setUpdateTime(TimeUtil.timestampToDate(item.getUpdateTime()));
|
||||
list.add(vo);
|
||||
}
|
||||
|
||||
return PageResult.iPageHandle(iPage.getTotal(), iPage.getCurrent(), iPage.getSize(), list);
|
||||
}
|
||||
|
||||
/**
|
||||
* 常见检修结论描述详情
|
||||
*
|
||||
* @author hcy
|
||||
* @param id 主键参数
|
||||
* @return CommonOverhaul
|
||||
*/
|
||||
@Override
|
||||
public CommonOverhaulDetailVo detail(Integer id) {
|
||||
CommonOverhaul model = commonOverhaulMapper.selectOne(
|
||||
new QueryWrapper<CommonOverhaul>()
|
||||
.eq("id", id)
|
||||
.eq("is_delete", 0)
|
||||
.last("limit 1"));
|
||||
|
||||
Assert.notNull(model, "数据不存在");
|
||||
|
||||
CommonOverhaulDetailVo vo = new CommonOverhaulDetailVo();
|
||||
BeanUtils.copyProperties(model, vo);
|
||||
vo.setCreateTime(TimeUtil.timestampToDate(model.getCreateTime()));
|
||||
vo.setUpdateTime(TimeUtil.timestampToDate(model.getUpdateTime()));
|
||||
return vo;
|
||||
}
|
||||
|
||||
/**
|
||||
* 常见检修结论描述新增
|
||||
*
|
||||
* @author hcy
|
||||
* @param commonOverhaulParam 参数
|
||||
*/
|
||||
@Override
|
||||
public void add(CommonOverhaulParam commonOverhaulParam) {
|
||||
CommonOverhaul model = new CommonOverhaul();
|
||||
model.setName(commonOverhaulParam.getName());
|
||||
model.setSort(commonOverhaulParam.getSort());
|
||||
model.setDescription(commonOverhaulParam.getDescription());
|
||||
model.setAccountStatus(commonOverhaulParam.getAccountStatus());
|
||||
model.setCreateTime(System.currentTimeMillis() / 1000);
|
||||
commonOverhaulMapper.insert(model);
|
||||
}
|
||||
|
||||
/**
|
||||
* 常见检修结论描述编辑
|
||||
*
|
||||
* @author hcy
|
||||
* @param commonOverhaulParam 参数
|
||||
*/
|
||||
@Override
|
||||
public void edit(CommonOverhaulParam commonOverhaulParam) {
|
||||
CommonOverhaul model = commonOverhaulMapper.selectOne(
|
||||
new QueryWrapper<CommonOverhaul>()
|
||||
.eq("id", commonOverhaulParam.getId())
|
||||
.eq("is_delete", 0)
|
||||
.last("limit 1"));
|
||||
|
||||
Assert.notNull(model, "数据不存在!");
|
||||
|
||||
model.setId(commonOverhaulParam.getId());
|
||||
model.setName(commonOverhaulParam.getName());
|
||||
model.setSort(commonOverhaulParam.getSort());
|
||||
model.setDescription(commonOverhaulParam.getDescription());
|
||||
model.setAccountStatus(commonOverhaulParam.getAccountStatus());
|
||||
model.setUpdateTime(TimeUtil.dateToTimestamp(commonOverhaulParam.getUpdateTime()));
|
||||
commonOverhaulMapper.updateById(model);
|
||||
}
|
||||
|
||||
/**
|
||||
* 常见检修结论描述删除
|
||||
*
|
||||
* @author hcy
|
||||
* @param id 主键ID
|
||||
*/
|
||||
@Override
|
||||
public void del(Integer id) {
|
||||
CommonOverhaul model = commonOverhaulMapper.selectOne(
|
||||
new QueryWrapper<CommonOverhaul>()
|
||||
.eq("id", id)
|
||||
.eq("is_delete", 0)
|
||||
.last("limit 1"));
|
||||
|
||||
Assert.notNull(model, "数据不存在!");
|
||||
|
||||
model.setIsDelete(1);
|
||||
model.setDeleteTime(System.currentTimeMillis() / 1000);
|
||||
commonOverhaulMapper.updateById(model);
|
||||
}
|
||||
|
||||
/**
|
||||
* 常见故障管理改变状态
|
||||
*
|
||||
* @param commonOverhaulParam
|
||||
*/
|
||||
@Override
|
||||
public void stateEdit(CommonOverhaulParam commonOverhaulParam) {
|
||||
CommonOverhaul model = commonOverhaulMapper.selectOne(
|
||||
new QueryWrapper<CommonOverhaul>()
|
||||
.eq("id", commonOverhaulParam.getId())
|
||||
.eq("is_delete", 0)
|
||||
.last("limit 1"));
|
||||
|
||||
Assert.notNull(model, "数据不存在!");
|
||||
if(model.getAccountStatus() == CommonFaultEnum.STARTUSING.getStatus()){
|
||||
model.setAccountStatus(CommonFaultEnum.BLOCKUP.getStatus());
|
||||
}else{
|
||||
model.setAccountStatus(CommonFaultEnum.STARTUSING.getStatus());
|
||||
}
|
||||
model.setUpdateTime(System.currentTimeMillis() / 1000);
|
||||
commonOverhaulMapper.updateById(model);
|
||||
}
|
||||
}
|
||||
|
|
@ -17,10 +17,10 @@ public interface IMaintenanceOrderService {
|
|||
* 检修订单列表
|
||||
*
|
||||
* @param pageParam 分页参数
|
||||
* @param params 搜索参数
|
||||
* @param maintenanceOrderParam 搜索参数
|
||||
* @return PageResult<MaintenanceOrderVo>
|
||||
*/
|
||||
PageResult<MaintenanceOrderListVo> list(PageParam pageParam, Map<String, String> params);
|
||||
PageResult<MaintenanceOrderListVo> list(PageParam pageParam, MaintenanceOrderParam maintenanceOrderParam);
|
||||
|
||||
/**
|
||||
* 检修订单详情
|
||||
|
|
|
|||
|
|
@ -1,22 +1,30 @@
|
|||
package com.hcy.admin.service.order.impl;
|
||||
|
||||
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
|
||||
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
|
||||
import com.baomidou.mybatisplus.core.metadata.IPage;
|
||||
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
||||
import com.hcy.admin.AdminThreadLocal;
|
||||
import com.hcy.admin.service.order.IMaintenanceOrderService;
|
||||
import com.hcy.admin.service.region.IDevRegionService;
|
||||
import com.hcy.admin.validate.common.PageParam;
|
||||
import com.hcy.admin.validate.order.MaintenanceOrderParam;
|
||||
import com.hcy.admin.vo.order.MaintenanceOrderListVo;
|
||||
import com.hcy.admin.vo.order.MaintenanceOrderDetailVo;
|
||||
import com.hcy.common.constant.GlobalConstant;
|
||||
import com.hcy.common.core.PageResult;
|
||||
import com.hcy.common.dto.order.MaintenanceOrderDto;
|
||||
import com.hcy.common.entity.order.MaintenanceOrder;
|
||||
import com.hcy.common.enums.order.MaintenanceOrderStatusEnum;
|
||||
import com.hcy.common.enums.order.OrderStateEnum;
|
||||
import com.hcy.common.exception.OperateException;
|
||||
import com.hcy.common.mapper.order.MaintenanceOrderMapper;
|
||||
import com.hcy.common.utils.TimeUtil;
|
||||
import org.springframework.beans.BeanUtils;
|
||||
import org.springframework.stereotype.Service;
|
||||
import org.springframework.util.Assert;
|
||||
|
||||
import javax.annotation.Resource;
|
||||
import java.text.SimpleDateFormat;
|
||||
import java.util.*;
|
||||
|
||||
/**
|
||||
|
|
@ -28,59 +36,37 @@ public class MaintenanceOrderServiceImpl implements IMaintenanceOrderService {
|
|||
@Resource
|
||||
MaintenanceOrderMapper maintenanceOrderMapper;
|
||||
|
||||
@Resource
|
||||
IDevRegionService regionService;
|
||||
|
||||
/**
|
||||
* 检修订单列表
|
||||
*
|
||||
* @param pageParam 分页参数
|
||||
* @param params 搜索参数
|
||||
* @param maintenanceOrderParam 搜索参数
|
||||
* @return PageResult<MaintenanceOrderListVo>
|
||||
*/
|
||||
@Override
|
||||
public PageResult<MaintenanceOrderListVo> list(PageParam pageParam, Map<String, String> params) {
|
||||
Integer page = pageParam.getPageNo();
|
||||
public PageResult<MaintenanceOrderListVo> list(PageParam pageParam, MaintenanceOrderParam maintenanceOrderParam) {
|
||||
Integer page = pageParam.getPageNo();
|
||||
Integer limit = pageParam.getPageSize();
|
||||
|
||||
QueryWrapper<MaintenanceOrder> queryWrapper = new QueryWrapper<>();
|
||||
queryWrapper.eq("is_delete", 0);
|
||||
queryWrapper.orderByDesc("id");
|
||||
|
||||
maintenanceOrderMapper.setSearch(queryWrapper, params, new String[]{
|
||||
"=:orderNo@order_no:str",
|
||||
"=:orderSource@order_source:long",
|
||||
"=:orderStatus@order_status:long",
|
||||
"=:clientId@client_id:long",
|
||||
"=:deviceId@device_id:long",
|
||||
"=:faultId@fault_id:long",
|
||||
"=:faultDescription@fault_description:str",
|
||||
"=:faultImg@fault_img:str",
|
||||
"=:receiverType@receiver_type:long",
|
||||
"=:provinceId@province_id:long",
|
||||
"=:cityId@city_id:long",
|
||||
"=:districtId@district_id:long",
|
||||
"=:orderDistance@order_distance:str",
|
||||
"=:totalAmount@total_amount:str",
|
||||
"=:actualAmount@actual_amount:str",
|
||||
"=:receiverId@receiver_id:long",
|
||||
"=:repairId@repair_id:long",
|
||||
"=:receiverTime@receiver_time:str",
|
||||
"=:cancelOrderTime@cancel_order_time:str",
|
||||
"=:cancelCause@cancel_cause:str",
|
||||
"=:refuseMaintenanceCause@refuse_maintenance_cause:str",
|
||||
"=:remark:str",
|
||||
"=:creatorId@creator_id:long",
|
||||
"=:orderAccomplishTime@order_accomplish_time:str",
|
||||
"=:familiarFaultId@familiar_fault_id:long",
|
||||
"=:familiarFaultDescription@familiar_fault_description:str",
|
||||
});
|
||||
|
||||
IPage<MaintenanceOrder> iPage = maintenanceOrderMapper.selectPage(new Page<>(page, limit), queryWrapper);
|
||||
MaintenanceOrderDto maintenanceOrderDto = new MaintenanceOrderDto();
|
||||
BeanUtils.copyProperties(maintenanceOrderParam,maintenanceOrderDto);
|
||||
IPage<MaintenanceOrderDto> iPage = maintenanceOrderMapper.list(new Page<>(page, limit), maintenanceOrderDto);
|
||||
|
||||
List<MaintenanceOrderListVo> list = new LinkedList<>();
|
||||
for(MaintenanceOrder item : iPage.getRecords()) {
|
||||
Map<Long, String> regionMap = regionService.getRegionMap();
|
||||
for (MaintenanceOrderDto item : iPage.getRecords()) {
|
||||
|
||||
MaintenanceOrderListVo vo = new MaintenanceOrderListVo();
|
||||
BeanUtils.copyProperties(item, vo);
|
||||
vo.setCreateTime(item.getCreateTime());
|
||||
vo.setUpdateTime(item.getCreateTime());
|
||||
|
||||
vo.setDetailedAddress(regionMap.get(item.getEquipmentProvinceId()) +
|
||||
regionMap.get(item.getEquipmentCityId()) +
|
||||
regionMap.get(item.getEquipmentDistrictId()) +
|
||||
item.getDetailedAddress());
|
||||
|
||||
list.add(vo);
|
||||
}
|
||||
|
||||
|
|
@ -97,9 +83,9 @@ public class MaintenanceOrderServiceImpl implements IMaintenanceOrderService {
|
|||
public MaintenanceOrderDetailVo detail(Integer id) {
|
||||
MaintenanceOrder model = maintenanceOrderMapper.selectOne(
|
||||
new QueryWrapper<MaintenanceOrder>()
|
||||
.eq("id", id)
|
||||
.eq("is_delete", 0)
|
||||
.last("limit 1"));
|
||||
.eq("id", id)
|
||||
.eq("is_delete", 0)
|
||||
.last("limit 1"));
|
||||
|
||||
Assert.notNull(model, "数据不存在");
|
||||
|
||||
|
|
@ -116,77 +102,75 @@ public class MaintenanceOrderServiceImpl implements IMaintenanceOrderService {
|
|||
@Override
|
||||
public void add(MaintenanceOrderParam maintenanceOrderParam) {
|
||||
MaintenanceOrder model = new MaintenanceOrder();
|
||||
model.setOrderNo(maintenanceOrderParam.getOrderNo());
|
||||
model.setOrderSource(maintenanceOrderParam.getOrderSource());
|
||||
model.setOrderStatus(maintenanceOrderParam.getOrderStatus());
|
||||
model.setClientId(maintenanceOrderParam.getClientId());
|
||||
model.setDeviceId(maintenanceOrderParam.getDeviceId());
|
||||
model.setFaultId(maintenanceOrderParam.getFaultId());
|
||||
model.setFaultDescription(maintenanceOrderParam.getFaultDescription());
|
||||
model.setFaultImg(maintenanceOrderParam.getFaultImg());
|
||||
model.setReceiverType(maintenanceOrderParam.getReceiverType());
|
||||
model.setProvinceId(maintenanceOrderParam.getProvinceId());
|
||||
model.setCityId(maintenanceOrderParam.getCityId());
|
||||
model.setDistrictId(maintenanceOrderParam.getDistrictId());
|
||||
model.setOrderDistance(maintenanceOrderParam.getOrderDistance());
|
||||
model.setTotalAmount(maintenanceOrderParam.getTotalAmount());
|
||||
model.setActualAmount(maintenanceOrderParam.getActualAmount());
|
||||
model.setReceiverId(maintenanceOrderParam.getReceiverId());
|
||||
model.setRepairId(maintenanceOrderParam.getRepairId());
|
||||
model.setReceiverTime(maintenanceOrderParam.getReceiverTime());
|
||||
model.setCancelOrderTime(maintenanceOrderParam.getCancelOrderTime());
|
||||
model.setCancelCause(maintenanceOrderParam.getCancelCause());
|
||||
model.setRefuseMaintenanceCause(maintenanceOrderParam.getRefuseMaintenanceCause());
|
||||
model.setRemark(maintenanceOrderParam.getRemark());
|
||||
model.setCreatorId(maintenanceOrderParam.getCreatorId());
|
||||
model.setOrderAccomplishTime(maintenanceOrderParam.getOrderAccomplishTime());
|
||||
model.setFamiliarFaultId(maintenanceOrderParam.getFamiliarFaultId());
|
||||
model.setFamiliarFaultDescription(maintenanceOrderParam.getFamiliarFaultDescription());
|
||||
BeanUtils.copyProperties(maintenanceOrderParam, model);
|
||||
|
||||
//订单去向
|
||||
Integer orderDestination = maintenanceOrderParam.getOrderDestination();
|
||||
if (orderDestination == OrderStateEnum.WORK_ORDER_TANK.getStatus()) {
|
||||
model.setOrderStatus(OrderStateEnum.WAITING_LIST.getStatus());
|
||||
} else {
|
||||
model.setOrderStatus(OrderStateEnum.REPAIRER.getStatus());
|
||||
}
|
||||
|
||||
model.setOrderNo(getOrderNo());
|
||||
model.setCreatorId(AdminThreadLocal.getAdminId().longValue());
|
||||
|
||||
maintenanceOrderMapper.insert(model);
|
||||
}
|
||||
|
||||
private String getOrderNo() {
|
||||
//获取当前日期并将其进行格式化
|
||||
SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyyMMdd");
|
||||
String formatDate = simpleDateFormat.format(new Date());
|
||||
|
||||
StringBuilder currentOrderNo = new StringBuilder(formatDate + "000001");
|
||||
MaintenanceOrder maintenanceOrder = maintenanceOrderMapper.selectOne(new LambdaQueryWrapper<MaintenanceOrder>()
|
||||
.eq(MaintenanceOrder::getIsDelete, GlobalConstant.NOT_DELETE)
|
||||
.like(MaintenanceOrder::getOrderNo, formatDate));
|
||||
//当天日期加第一条流水号，如果数据库不存在，则代表今天第一条数据
|
||||
if (maintenanceOrder == null) {
|
||||
return currentOrderNo.toString();
|
||||
} else {
|
||||
MaintenanceOrder lastmMaintenanceOrder = maintenanceOrderMapper.selectOne(new LambdaQueryWrapper<MaintenanceOrder>()
|
||||
.eq(MaintenanceOrder::getIsDelete, GlobalConstant.NOT_DELETE)
|
||||
.like(MaintenanceOrder::getOrderNo, formatDate)
|
||||
.orderByDesc(MaintenanceOrder::getOrderNo));
|
||||
int lastOrderNo = Integer.parseInt(lastmMaintenanceOrder.getOrderNo().substring(8));
|
||||
int newOrderNoLength = String.valueOf(lastOrderNo + 1).length();
|
||||
|
||||
//如果流水号长度小于6位，则在前面补0
|
||||
if (newOrderNoLength < 6) {
|
||||
for (int i = 0; i < 6 - newOrderNoLength; i++) {
|
||||
currentOrderNo.append("0");
|
||||
}
|
||||
}
|
||||
|
||||
return formatDate + currentOrderNo;
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* 检修订单编辑
|
||||
*
|
||||
* @param maintenanceOrderParam 参数
|
||||
* @param param 参数
|
||||
*/
|
||||
@Override
|
||||
public void edit(MaintenanceOrderParam maintenanceOrderParam) {
|
||||
public void edit(MaintenanceOrderParam param) {
|
||||
MaintenanceOrder model = maintenanceOrderMapper.selectOne(
|
||||
new QueryWrapper<MaintenanceOrder>()
|
||||
.eq("id", maintenanceOrderParam.getId())
|
||||
.eq("is_delete", 0)
|
||||
.last("limit 1"));
|
||||
.eq("id", param.getId())
|
||||
.eq("is_delete", 0)
|
||||
.last("limit 1"));
|
||||
|
||||
Assert.notNull(model, "数据不存在!");
|
||||
|
||||
model.setId(maintenanceOrderParam.getId());
|
||||
model.setOrderNo(maintenanceOrderParam.getOrderNo());
|
||||
model.setOrderSource(maintenanceOrderParam.getOrderSource());
|
||||
model.setOrderStatus(maintenanceOrderParam.getOrderStatus());
|
||||
model.setClientId(maintenanceOrderParam.getClientId());
|
||||
model.setDeviceId(maintenanceOrderParam.getDeviceId());
|
||||
model.setFaultId(maintenanceOrderParam.getFaultId());
|
||||
model.setFaultDescription(maintenanceOrderParam.getFaultDescription());
|
||||
model.setFaultImg(maintenanceOrderParam.getFaultImg());
|
||||
model.setReceiverType(maintenanceOrderParam.getReceiverType());
|
||||
model.setProvinceId(maintenanceOrderParam.getProvinceId());
|
||||
model.setCityId(maintenanceOrderParam.getCityId());
|
||||
model.setDistrictId(maintenanceOrderParam.getDistrictId());
|
||||
model.setOrderDistance(maintenanceOrderParam.getOrderDistance());
|
||||
model.setTotalAmount(maintenanceOrderParam.getTotalAmount());
|
||||
model.setActualAmount(maintenanceOrderParam.getActualAmount());
|
||||
model.setReceiverId(maintenanceOrderParam.getReceiverId());
|
||||
model.setRepairId(maintenanceOrderParam.getRepairId());
|
||||
model.setReceiverTime(maintenanceOrderParam.getReceiverTime());
|
||||
model.setCancelOrderTime(maintenanceOrderParam.getCancelOrderTime());
|
||||
model.setCancelCause(maintenanceOrderParam.getCancelCause());
|
||||
model.setRefuseMaintenanceCause(maintenanceOrderParam.getRefuseMaintenanceCause());
|
||||
model.setRemark(maintenanceOrderParam.getRemark());
|
||||
model.setCreatorId(maintenanceOrderParam.getCreatorId());
|
||||
model.setOrderAccomplishTime(maintenanceOrderParam.getOrderAccomplishTime());
|
||||
model.setFamiliarFaultId(maintenanceOrderParam.getFamiliarFaultId());
|
||||
model.setFamiliarFaultDescription(maintenanceOrderParam.getFamiliarFaultDescription());
|
||||
if(param.getOrderStatus() == MaintenanceOrderStatusEnum.WAITING_LIST.getStatus() ||
|
||||
param.getOrderStatus() == MaintenanceOrderStatusEnum.PENDING_ORDER.getStatus()){
|
||||
|
||||
}else{
|
||||
throw new OperateException("工单已被接单，无法编辑");
|
||||
}
|
||||
|
||||
maintenanceOrderMapper.updateById(model);
|
||||
}
|
||||
|
||||
|
|
@ -199,9 +183,9 @@ public class MaintenanceOrderServiceImpl implements IMaintenanceOrderService {
|
|||
public void del(Long id) {
|
||||
MaintenanceOrder model = maintenanceOrderMapper.selectOne(
|
||||
new QueryWrapper<MaintenanceOrder>()
|
||||
.eq("id", id)
|
||||
.eq("is_delete", 0)
|
||||
.last("limit 1"));
|
||||
.eq("id", id)
|
||||
.eq("is_delete", 0)
|
||||
.last("limit 1"));
|
||||
|
||||
Assert.notNull(model, "数据不存在!");
|
||||
|
||||
|
|
|
|||
|
|
@ -1,9 +1,7 @@
|
|||
package com.hcy.admin.service.order.impl;
|
||||
|
||||
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
|
||||
import com.baomidou.mybatisplus.core.metadata.IPage;
|
||||
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
||||
import com.github.yulichang.query.MPJQueryWrapper;
|
||||
import com.hcy.admin.AdminThreadLocal;
|
||||
import com.hcy.admin.service.order.IRoutingInspectionOrderService;
|
||||
import com.hcy.admin.validate.common.PageParam;
|
||||
|
|
@ -11,31 +9,22 @@ import com.hcy.admin.validate.order.RoutingInspectionOrderParam;
|
|||
import com.hcy.admin.vo.order.RoutingInspectionOrderListVo;
|
||||
import com.hcy.admin.vo.order.RoutingInspectionOrderDetailVo;
|
||||
import com.hcy.common.core.PageResult;
|
||||
import com.hcy.common.dto.OrderDto;
|
||||
import com.hcy.common.dto.RoutingInspectionOrderDto;
|
||||
import com.hcy.common.dto.result.OrderPageResultDto;
|
||||
import com.hcy.common.entity.client.Client;
|
||||
import com.hcy.common.entity.client.Equipment;
|
||||
import com.hcy.common.entity.order.Order;
|
||||
import com.hcy.common.entity.order.RoutingInspectionOrder;
|
||||
import com.hcy.common.entity.system.SystemAuthAdmin;
|
||||
import com.hcy.common.entity.warehouse.Warehouse;
|
||||
import com.hcy.common.enums.order.OrderStateEnum;
|
||||
import com.hcy.common.mapper.client.ClientMapper;
|
||||
import com.hcy.common.mapper.client.EquipmentMapper;
|
||||
import com.hcy.common.mapper.order.RoutingInspectionOrderMapper;
|
||||
import com.hcy.common.mapper.system.SystemAuthAdminMapper;
|
||||
import com.hcy.common.utils.ArrayUtil;
|
||||
import com.hcy.common.utils.TimeUtil;
|
||||
import com.hcy.common.utils.UrlUtil;
|
||||
import com.hcy.common.config.GlobalConfig;
|
||||
import org.apache.commons.lang3.StringUtils;
|
||||
import org.springframework.beans.BeanUtils;
|
||||
import org.springframework.stereotype.Service;
|
||||
import org.springframework.util.Assert;
|
||||
|
||||
import javax.annotation.Resource;
|
||||
import javax.xml.crypto.Data;
|
||||
import java.util.*;
|
||||
|
||||
/**
|
||||
|
|
@ -153,13 +142,13 @@ public class RoutingInspectionOrderServiceImpl implements IRoutingInspectionOrde
|
|||
RoutingInspectionOrder model = new RoutingInspectionOrder();
|
||||
//model.setOrderNo(routingInspectionOrderParam.getOrderNo()); // 订单编号
|
||||
//定时任务创建的巡检单是系统创建，客服的是客服创建
|
||||
model.setOrderSource(OrderStateEnum.CUSTOMERSERVICECREATION.getStatus()); // 订单来源 1-系统创建；4-客服创建
|
||||
model.setOrderSource(OrderStateEnum.CUSTOMER_SERVICE_CREATION.getStatus()); // 订单来源 1-系统创建；4-客服创建
|
||||
model.setRepairWorkOrderFlow(routingInspectionOrderParam.getRepairWorkOrderFlow());
|
||||
// 工单去向(0=工单池，1=检修员) 工单去向是工单池的话，工单状态是待抢单
|
||||
if(routingInspectionOrderParam.getRepairWorkOrderFlow() == OrderStateEnum.WORKORDERTANK.getStatus()){
|
||||
model.setInspectionOrderStatus(OrderStateEnum.WAITINGLIST.getStatus()); // 订单状态 0-待抢单；
|
||||
if(routingInspectionOrderParam.getRepairWorkOrderFlow() == OrderStateEnum.WORK_ORDER_TANK.getStatus()){
|
||||
model.setInspectionOrderStatus(OrderStateEnum.WAITING_LIST.getStatus()); // 订单状态 0-待抢单；
|
||||
}else{
|
||||
model.setInspectionOrderStatus(OrderStateEnum.PENDINGORDER.getStatus());// 订单状态 1-待接单；
|
||||
model.setInspectionOrderStatus(OrderStateEnum.PENDING_ORDER.getStatus());// 订单状态 1-待接单；
|
||||
}
|
||||
|
||||
model.setClientId(routingInspectionOrderParam.getClientId()); //客户id
|
||||
|
|
|
|||
|
|
@ -1,64 +0,0 @@
|
|||
package com.hcy.admin.service.scrapType;
|
||||
|
||||
import com.hcy.admin.validate.common.PageParam;
|
||||
import com.hcy.admin.validate.ScrapType.ScrapTypeParam;
|
||||
import com.hcy.admin.vo.ScrapType.ScrapTypeListVo;
|
||||
import com.hcy.admin.vo.ScrapType.ScrapTypeDetailVo;
|
||||
import com.hcy.common.core.PageResult;
|
||||
|
||||
import java.util.Map;
|
||||
|
||||
/**
|
||||
* 报废类型管理服务接口类
|
||||
*/
|
||||
public interface IScrapTypeService {
|
||||
|
||||
/**
|
||||
* 报废类型管理列表
|
||||
*
|
||||
* @author hcy
|
||||
* @param pageParam 分页参数
|
||||
* @param params 搜索参数
|
||||
* @return PageResult<ScrapTypeVo>
|
||||
*/
|
||||
PageResult<ScrapTypeListVo> list(PageParam pageParam, Map<String, String> params);
|
||||
|
||||
/**
|
||||
* 报废类型管理详情
|
||||
*
|
||||
* @author hcy
|
||||
* @param id 主键ID
|
||||
* @return ScrapType
|
||||
*/
|
||||
ScrapTypeDetailVo detail(Integer id);
|
||||
|
||||
/**
|
||||
* 报废类型管理新增
|
||||
*
|
||||
* @author hcy
|
||||
* @param scrapTypeParam 参数
|
||||
*/
|
||||
void add(ScrapTypeParam scrapTypeParam);
|
||||
|
||||
/**
|
||||
* 报废类型管理编辑
|
||||
*
|
||||
* @author hcy
|
||||
* @param scrapTypeParam 参数
|
||||
*/
|
||||
void edit(ScrapTypeParam scrapTypeParam);
|
||||
|
||||
/**
|
||||
* 报废类型管理删除
|
||||
*
|
||||
* @author hcy
|
||||
* @param id 主键ID
|
||||
*/
|
||||
void del(Integer id);
|
||||
|
||||
/**
|
||||
* 常见故障管理改变状态
|
||||
* @param scrapTypeParam
|
||||
*/
|
||||
void stateEdit(ScrapTypeParam scrapTypeParam);
|
||||
}
|
||||
|
|
@ -1,178 +0,0 @@
|
|||
package com.hcy.admin.service.scrapType.impl;
|
||||
|
||||
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
|
||||
import com.baomidou.mybatisplus.core.metadata.IPage;
|
||||
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
||||
import com.hcy.admin.service.scrapType.IScrapTypeService;
|
||||
import com.hcy.admin.validate.common.PageParam;
|
||||
import com.hcy.admin.validate.ScrapType.ScrapTypeParam;
|
||||
import com.hcy.admin.vo.ScrapType.ScrapTypeListVo;
|
||||
import com.hcy.admin.vo.ScrapType.ScrapTypeDetailVo;
|
||||
import com.hcy.common.core.PageResult;
|
||||
import com.hcy.common.entity.ScrapType.ScrapType;
|
||||
import com.hcy.common.enums.commonFault.CommonFaultEnum;
|
||||
import com.hcy.common.mapper.ScrapType.ScrapTypeMapper;
|
||||
import com.hcy.common.utils.TimeUtil;
|
||||
import org.springframework.beans.BeanUtils;
|
||||
import org.springframework.stereotype.Service;
|
||||
import org.springframework.util.Assert;
|
||||
|
||||
import javax.annotation.Resource;
|
||||
import java.util.*;
|
||||
|
||||
/**
|
||||
* 报废类型管理实现类
|
||||
*/
|
||||
@Service
|
||||
public class ScrapTypeServiceImpl implements IScrapTypeService {
|
||||
|
||||
@Resource
|
||||
ScrapTypeMapper scrapTypeMapper;
|
||||
|
||||
/**
|
||||
* 报废类型管理列表
|
||||
*
|
||||
* @author hcy
|
||||
* @param pageParam 分页参数
|
||||
* @param params 搜索参数
|
||||
* @return PageResult<ScrapTypeListVo>
|
||||
*/
|
||||
@Override
|
||||
public PageResult<ScrapTypeListVo> list(PageParam pageParam, Map<String, String> params) {
|
||||
Integer page = pageParam.getPageNo();
|
||||
Integer limit = pageParam.getPageSize();
|
||||
|
||||
QueryWrapper<ScrapType> queryWrapper = new QueryWrapper<>();
|
||||
queryWrapper.eq("is_delete", 0);
|
||||
queryWrapper.orderByDesc(Arrays.asList("sort", "id"));
|
||||
|
||||
scrapTypeMapper.setSearch(queryWrapper, params, new String[]{
|
||||
"like:name:str",
|
||||
"=:accountStatus@account_status:int",
|
||||
});
|
||||
|
||||
IPage<ScrapType> iPage = scrapTypeMapper.selectPage(new Page<>(page, limit), queryWrapper);
|
||||
|
||||
List<ScrapTypeListVo> list = new LinkedList<>();
|
||||
for(ScrapType item : iPage.getRecords()) {
|
||||
ScrapTypeListVo vo = new ScrapTypeListVo();
|
||||
BeanUtils.copyProperties(item, vo);
|
||||
vo.setCreateTime(TimeUtil.timestampToDate(item.getCreateTime()));
|
||||
vo.setUpdateTime(TimeUtil.timestampToDate(item.getUpdateTime()));
|
||||
list.add(vo);
|
||||
}
|
||||
|
||||
return PageResult.iPageHandle(iPage.getTotal(), iPage.getCurrent(), iPage.getSize(), list);
|
||||
}
|
||||
|
||||
/**
|
||||
* 报废类型管理详情
|
||||
*
|
||||
* @author hcy
|
||||
* @param id 主键参数
|
||||
* @return ScrapType
|
||||
*/
|
||||
@Override
|
||||
public ScrapTypeDetailVo detail(Integer id) {
|
||||
ScrapType model = scrapTypeMapper.selectOne(
|
||||
new QueryWrapper<ScrapType>()
|
||||
.eq("id", id)
|
||||
.eq("is_delete", 0)
|
||||
.last("limit 1"));
|
||||
|
||||
Assert.notNull(model, "数据不存在");
|
||||
|
||||
ScrapTypeDetailVo vo = new ScrapTypeDetailVo();
|
||||
vo.setCreateTime(TimeUtil.timestampToDate(model.getCreateTime()));
|
||||
vo.setUpdateTime(TimeUtil.timestampToDate(model.getUpdateTime()));
|
||||
BeanUtils.copyProperties(model, vo);
|
||||
return vo;
|
||||
}
|
||||
|
||||
/**
|
||||
* 报废类型管理新增
|
||||
*
|
||||
* @author hcy
|
||||
* @param scrapTypeParam 参数
|
||||
*/
|
||||
@Override
|
||||
public void add(ScrapTypeParam scrapTypeParam) {
|
||||
ScrapType model = new ScrapType();
|
||||
model.setName(scrapTypeParam.getName());
|
||||
model.setSort(scrapTypeParam.getSort());
|
||||
model.setDescription(scrapTypeParam.getDescription());
|
||||
model.setAccountStatus(scrapTypeParam.getAccountStatus());
|
||||
model.setCreateTime(System.currentTimeMillis() / 1000);
|
||||
scrapTypeMapper.insert(model);
|
||||
}
|
||||
|
||||
/**
|
||||
* 报废类型管理编辑
|
||||
*
|
||||
* @author hcy
|
||||
* @param scrapTypeParam 参数
|
||||
*/
|
||||
@Override
|
||||
public void edit(ScrapTypeParam scrapTypeParam) {
|
||||
ScrapType model = scrapTypeMapper.selectOne(
|
||||
new QueryWrapper<ScrapType>()
|
||||
.eq("id", scrapTypeParam.getId())
|
||||
.eq("is_delete", 0)
|
||||
.last("limit 1"));
|
||||
|
||||
Assert.notNull(model, "数据不存在!");
|
||||
|
||||
model.setId(scrapTypeParam.getId());
|
||||
model.setName(scrapTypeParam.getName());
|
||||
model.setSort(scrapTypeParam.getSort());
|
||||
model.setDescription(scrapTypeParam.getDescription());
|
||||
model.setAccountStatus(scrapTypeParam.getAccountStatus());
|
||||
model.setUpdateTime(System.currentTimeMillis() / 1000);
|
||||
scrapTypeMapper.updateById(model);
|
||||
}
|
||||
|
||||
/**
|
||||
* 报废类型管理删除
|
||||
*
|
||||
* @author hcy
|
||||
* @param id 主键ID
|
||||
*/
|
||||
@Override
|
||||
public void del(Integer id) {
|
||||
ScrapType model = scrapTypeMapper.selectOne(
|
||||
new QueryWrapper<ScrapType>()
|
||||
.eq("id", id)
|
||||
.eq("is_delete", 0)
|
||||
.last("limit 1"));
|
||||
|
||||
Assert.notNull(model, "数据不存在!");
|
||||
|
||||
model.setIsDelete(1);
|
||||
model.setDeleteTime(System.currentTimeMillis() / 1000);
|
||||
scrapTypeMapper.updateById(model);
|
||||
}
|
||||
|
||||
/**
|
||||
* 常见故障管理改变状态
|
||||
*
|
||||
* @param scrapTypeParam
|
||||
*/
|
||||
@Override
|
||||
public void stateEdit(ScrapTypeParam scrapTypeParam) {
|
||||
ScrapType model = scrapTypeMapper.selectOne(
|
||||
new QueryWrapper<ScrapType>()
|
||||
.eq("id", scrapTypeParam.getId())
|
||||
.eq("is_delete", 0)
|
||||
.last("limit 1"));
|
||||
|
||||
Assert.notNull(model, "数据不存在!");
|
||||
if(model.getAccountStatus() == CommonFaultEnum.STARTUSING.getStatus()){
|
||||
model.setAccountStatus(CommonFaultEnum.BLOCKUP.getStatus());
|
||||
}else{
|
||||
model.setAccountStatus(CommonFaultEnum.STARTUSING.getStatus());
|
||||
}
|
||||
model.setUpdateTime(System.currentTimeMillis() / 1000);
|
||||
scrapTypeMapper.updateById(model);
|
||||
}
|
||||
|
||||
}
|
||||
|
|
@ -70,4 +70,6 @@ public interface ISystemAuthRoleService {
|
|||
* @return boolean true：可以 false：不可以
|
||||
*/
|
||||
boolean isMnpLogin(String role);
|
||||
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -62,6 +62,9 @@ public class SystemAuthAdminServiceImpl implements ISystemAuthAdminService {
|
|||
@Resource
|
||||
ISystemAuthRoleService iSystemAuthRoleService;
|
||||
|
||||
@Resource
|
||||
SystemAuthRoleMapper systemAuthRoleMapper;
|
||||
|
||||
@Resource
|
||||
ISystemAuthPermService iSystemAuthPermService;
|
||||
|
||||
|
|
@ -117,6 +120,17 @@ public class SystemAuthAdminServiceImpl implements ISystemAuthAdminService {
|
|||
SystemAuthAdminVo item = new SystemAuthAdminVo();
|
||||
BeanUtils.copyProperties(dto, item);
|
||||
|
||||
//设置角色名称
|
||||
List<SystemAuthRole> systemAuthRoleListByIds = systemAuthRoleMapper.findSystemAuthRoleListByIds(dto.getRole());
|
||||
StringBuilder roleName = new StringBuilder();
|
||||
for (SystemAuthRole systemAuthRole : systemAuthRoleListByIds) {
|
||||
if(StringUtil.isNotEmpty(roleName.toString())){
|
||||
roleName.append(",");
|
||||
}
|
||||
roleName.append(systemAuthRole.getName());
|
||||
}
|
||||
item.setRole(roleName.toString());
|
||||
|
||||
if (item.getId() == 1) {
|
||||
item.setRole("系统管理员");
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,46 +0,0 @@
|
|||
package com.hcy.admin.validate.CommonMaintenance;
|
||||
|
||||
|
||||
import lombok.EqualsAndHashCode;
|
||||
import lombok.experimental.Accessors;
|
||||
import org.hibernate.validator.constraints.Length;
|
||||
|
||||
import lombok.Data;
|
||||
import javax.validation.constraints.*;
|
||||
import java.io.Serializable;
|
||||
|
||||
/**
|
||||
* 常见维修结论描述参数
|
||||
*/
|
||||
@Data
|
||||
@EqualsAndHashCode(callSuper = false)
|
||||
@Accessors(chain = true)
|
||||
public class CommonMaintenanceParam implements Serializable {
|
||||
|
||||
private static final long serialVersionUID = 1L;
|
||||
|
||||
public interface create{}
|
||||
public interface update{}
|
||||
public interface delete{}
|
||||
|
||||
private Long id;
|
||||
|
||||
@NotNull(message = "name参数缺失", groups = {create.class, update.class})
|
||||
@Length(max = 32, message = "name参数不能超出32个字符", groups = {create.class, update.class})
|
||||
private String name;
|
||||
|
||||
@NotNull(message = "sort参数缺失", groups = {create.class, update.class})
|
||||
@DecimalMin(value = "0", message = "sort参数值不能少于0", groups = {create.class, update.class})
|
||||
private Long sort;
|
||||
|
||||
@NotNull(message = "description参数缺失", groups = {create.class, update.class})
|
||||
@Length(max = 255, message = "description参数不能超出255个字符", groups = {create.class, update.class})
|
||||
private String description;
|
||||
|
||||
@NotNull(message = "accountStatus参数缺失", groups = {create.class, update.class})
|
||||
@DecimalMin(value = "0", message = "accountStatus参数值不能少于0", groups = {create.class, update.class})
|
||||
private Integer accountStatus;
|
||||
|
||||
private String createTime;
|
||||
|
||||
}
|
||||
|
|
@ -1,47 +0,0 @@
|
|||
package com.hcy.admin.validate.CommonOverhaul;
|
||||
|
||||
import lombok.EqualsAndHashCode;
|
||||
import lombok.experimental.Accessors;
|
||||
import org.hibernate.validator.constraints.Length;
|
||||
|
||||
import lombok.Data;
|
||||
import javax.validation.constraints.*;
|
||||
import java.io.Serializable;
|
||||
|
||||
/**
|
||||
* 常见检修结论描述参数
|
||||
*/
|
||||
@Data
|
||||
@EqualsAndHashCode(callSuper = false)
|
||||
@Accessors(chain = true)
|
||||
public class CommonOverhaulParam implements Serializable {
|
||||
|
||||
private static final long serialVersionUID = 1L;
|
||||
|
||||
public interface create{}
|
||||
public interface update{}
|
||||
public interface delete{}
|
||||
|
||||
private Long id;
|
||||
|
||||
@NotNull(message = "name参数缺失", groups = {create.class, update.class})
|
||||
@Length(max = 32, message = "name参数不能超出32个字符", groups = {create.class, update.class})
|
||||
private String name;
|
||||
|
||||
@NotNull(message = "sort参数缺失", groups = {create.class, update.class})
|
||||
@DecimalMin(value = "0", message = "sort参数值不能少于0", groups = {create.class, update.class})
|
||||
private Long sort;
|
||||
|
||||
@NotNull(message = "description参数缺失", groups = {create.class, update.class})
|
||||
@Length(max = 255, message = "description参数不能超出255个字符", groups = {create.class, update.class})
|
||||
private String description;
|
||||
|
||||
@NotNull(message = "accountStatus参数缺失", groups = {create.class, update.class})
|
||||
@DecimalMin(value = "0", message = "accountStatus参数值不能少于0", groups = {create.class, update.class})
|
||||
private Integer accountStatus;
|
||||
|
||||
private String createTime;
|
||||
|
||||
private String updateTime;
|
||||
|
||||
}
|
||||
|
|
@ -1,46 +0,0 @@
|
|||
package com.hcy.admin.validate.ScrapType;
|
||||
|
||||
|
||||
import lombok.EqualsAndHashCode;
|
||||
import lombok.experimental.Accessors;
|
||||
import org.hibernate.validator.constraints.Length;
|
||||
|
||||
import lombok.Data;
|
||||
import javax.validation.constraints.*;
|
||||
import java.io.Serializable;
|
||||
|
||||
/**
|
||||
* 报废类型管理参数
|
||||
*/
|
||||
@Data
|
||||
@EqualsAndHashCode(callSuper = false)
|
||||
@Accessors(chain = true)
|
||||
public class ScrapTypeParam implements Serializable {
|
||||
|
||||
private static final long serialVersionUID = 1L;
|
||||
|
||||
public interface create{}
|
||||
public interface update{}
|
||||
public interface delete{}
|
||||
|
||||
private Long id;
|
||||
|
||||
@NotNull(message = "name参数缺失", groups = {create.class, update.class})
|
||||
@Length(max = 32, message = "name参数不能超出32个字符", groups = {create.class, update.class})
|
||||
private String name;
|
||||
|
||||
@NotNull(message = "sort参数缺失", groups = {create.class, update.class})
|
||||
@DecimalMin(value = "0", message = "sort参数值不能少于0", groups = {create.class, update.class})
|
||||
private Long sort;
|
||||
|
||||
@NotNull(message = "description参数缺失", groups = {create.class, update.class})
|
||||
@Length(max = 255, message = "description参数不能超出255个字符", groups = {create.class, update.class})
|
||||
private String description;
|
||||
|
||||
@NotNull(message = "accountStatus参数缺失", groups = {create.class, update.class})
|
||||
@DecimalMin(value = "0", message = "accountStatus参数值不能少于0", groups = {create.class, update.class})
|
||||
private Integer accountStatus;
|
||||
|
||||
private String createTime;
|
||||
|
||||
}
|
||||
|
|
@ -1,44 +0,0 @@
|
|||
package com.hcy.admin.validate.commonFault;
|
||||
|
||||
|
||||
import lombok.EqualsAndHashCode;
|
||||
import lombok.experimental.Accessors;
|
||||
import org.hibernate.validator.constraints.Length;
|
||||
|
||||
import lombok.Data;
|
||||
import javax.validation.constraints.*;
|
||||
import java.io.Serializable;
|
||||
|
||||
/**
|
||||
* 常见故障管理参数
|
||||
*/
|
||||
@Data
|
||||
@EqualsAndHashCode(callSuper = false)
|
||||
@Accessors(chain = true)
|
||||
public class CommonFaultParam implements Serializable {
|
||||
|
||||
private static final long serialVersionUID = 1L;
|
||||
|
||||
public interface create{}
|
||||
public interface update{}
|
||||
public interface delete{}
|
||||
|
||||
private Long id;
|
||||
|
||||
@NotNull(message = "name参数缺失", groups = {create.class, update.class})
|
||||
@Length(max = 32, message = "name参数不能超出32个字符", groups = {create.class, update.class})
|
||||
private String name;
|
||||
|
||||
@NotNull(message = "sort参数缺失", groups = {create.class, update.class})
|
||||
@DecimalMin(value = "0", message = "sort参数值不能少于0", groups = {create.class, update.class})
|
||||
private Long sort;
|
||||
|
||||
@NotNull(message = "description参数缺失", groups = {create.class, update.class})
|
||||
@Length(max = 255, message = "description参数不能超出255个字符", groups = {create.class, update.class})
|
||||
private String description;
|
||||
|
||||
@NotNull(message = "accountStatus参数缺失", groups = {create.class, update.class})
|
||||
@DecimalMin(value = "0", message = "accountStatus参数值不能少于0", groups = {create.class, update.class})
|
||||
private Integer accountStatus;
|
||||
|
||||
}
|
||||
|
|
@ -26,102 +26,80 @@ public class MaintenanceOrderParam implements Serializable {
|
|||
|
||||
private Long id;
|
||||
|
||||
@NotNull(message = "orderNo参数缺失", groups = {create.class, update.class})
|
||||
@Length(max = 50, message = "orderNo参数不能超出50个字符", groups = {create.class, update.class})
|
||||
private String orderNo;
|
||||
|
||||
@NotNull(message = "orderSource参数缺失", groups = {create.class, update.class})
|
||||
@DecimalMin(value = "0", message = "orderSource参数值不能少于0", groups = {create.class, update.class})
|
||||
private Long orderSource;
|
||||
private Integer orderSource;
|
||||
|
||||
@NotNull(message = "orderStatus参数缺失", groups = {create.class, update.class})
|
||||
@DecimalMin(value = "0", message = "orderStatus参数值不能少于0", groups = {create.class, update.class})
|
||||
private Long orderStatus;
|
||||
private Integer orderStatus;
|
||||
|
||||
@NotNull(message = "clientId参数缺失", groups = {create.class, update.class})
|
||||
@DecimalMin(value = "0", message = "clientId参数值不能少于0", groups = {create.class, update.class})
|
||||
private Long clientId;
|
||||
|
||||
@NotNull(message = "deviceId参数缺失", groups = {create.class, update.class})
|
||||
@DecimalMin(value = "0", message = "deviceId参数值不能少于0", groups = {create.class, update.class})
|
||||
private Long deviceId;
|
||||
@NotNull(message = "equipmentId参数缺失", groups = {create.class, update.class})
|
||||
@DecimalMin(value = "0", message = "equipmentId参数值不能少于0", groups = {create.class, update.class})
|
||||
private Long equipmentId;
|
||||
|
||||
@NotNull(message = "faultId参数缺失", groups = {create.class, update.class})
|
||||
@DecimalMin(value = "0", message = "faultId参数值不能少于0", groups = {create.class, update.class})
|
||||
private Long faultId;
|
||||
|
||||
@NotNull(message = "faultDescription参数缺失", groups = {create.class, update.class})
|
||||
@Length(max = 250, message = "faultDescription参数不能超出250个字符", groups = {create.class, update.class})
|
||||
private String faultDescription;
|
||||
|
||||
@NotNull(message = "faultImg参数缺失", groups = {create.class, update.class})
|
||||
@Length(max = 255, message = "faultImg参数不能超出255个字符", groups = {create.class, update.class})
|
||||
private String faultImg;
|
||||
|
||||
@NotNull(message = "receiverType参数缺失", groups = {create.class, update.class})
|
||||
@DecimalMin(value = "0", message = "receiverType参数值不能少于0", groups = {create.class, update.class})
|
||||
private Long receiverType;
|
||||
|
||||
@NotNull(message = "provinceId参数缺失", groups = {create.class, update.class})
|
||||
@DecimalMin(value = "0", message = "provinceId参数值不能少于0", groups = {create.class, update.class})
|
||||
private Long provinceId;
|
||||
|
||||
@NotNull(message = "cityId参数缺失", groups = {create.class, update.class})
|
||||
@DecimalMin(value = "0", message = "cityId参数值不能少于0", groups = {create.class, update.class})
|
||||
private Long cityId;
|
||||
|
||||
@NotNull(message = "districtId参数缺失", groups = {create.class, update.class})
|
||||
@DecimalMin(value = "0", message = "districtId参数值不能少于0", groups = {create.class, update.class})
|
||||
private Long districtId;
|
||||
|
||||
@NotNull(message = "orderDistance参数缺失", groups = {create.class, update.class})
|
||||
private BigDecimal orderDistance;
|
||||
|
||||
@NotNull(message = "totalAmount参数缺失", groups = {create.class, update.class})
|
||||
private BigDecimal totalAmount;
|
||||
|
||||
@NotNull(message = "actualAmount参数缺失", groups = {create.class, update.class})
|
||||
private BigDecimal actualAmount;
|
||||
|
||||
@NotNull(message = "receiverId参数缺失", groups = {create.class, update.class})
|
||||
@DecimalMin(value = "0", message = "receiverId参数值不能少于0", groups = {create.class, update.class})
|
||||
private Long receiverId;
|
||||
|
||||
@NotNull(message = "repairId参数缺失", groups = {create.class, update.class})
|
||||
@DecimalMin(value = "0", message = "repairId参数值不能少于0", groups = {create.class, update.class})
|
||||
private Long repairId;
|
||||
|
||||
@NotNull(message = "receiverTime参数缺失", groups = {create.class, update.class})
|
||||
private Date receiverTime;
|
||||
|
||||
@NotNull(message = "cancelOrderTime参数缺失", groups = {create.class, update.class})
|
||||
private Date cancelOrderTime;
|
||||
|
||||
@NotNull(message = "cancelCause参数缺失", groups = {create.class, update.class})
|
||||
@Length(max = 250, message = "cancelCause参数不能超出250个字符", groups = {create.class, update.class})
|
||||
private String cancelCause;
|
||||
|
||||
@NotNull(message = "refuseMaintenanceCause参数缺失", groups = {create.class, update.class})
|
||||
@Length(max = 250, message = "refuseMaintenanceCause参数不能超出250个字符", groups = {create.class, update.class})
|
||||
private String refuseMaintenanceCause;
|
||||
|
||||
@NotNull(message = "remark参数缺失", groups = {create.class, update.class})
|
||||
@Length(max = 250, message = "remark参数不能超出250个字符", groups = {create.class, update.class})
|
||||
private String remark;
|
||||
|
||||
@NotNull(message = "creatorId参数缺失", groups = {create.class, update.class})
|
||||
@DecimalMin(value = "0", message = "creatorId参数值不能少于0", groups = {create.class, update.class})
|
||||
private Long creatorId;
|
||||
|
||||
@NotNull(message = "orderAccomplishTime参数缺失", groups = {create.class, update.class})
|
||||
private Date orderAccomplishTime;
|
||||
|
||||
@NotNull(message = "familiarFaultId参数缺失", groups = {create.class, update.class})
|
||||
@DecimalMin(value = "0", message = "familiarFaultId参数值不能少于0", groups = {create.class, update.class})
|
||||
private Long familiarFaultId;
|
||||
|
||||
@NotNull(message = "familiarFaultDescription参数缺失", groups = {create.class, update.class})
|
||||
@Length(max = 250, message = "familiarFaultDescription参数不能超出250个字符", groups = {create.class, update.class})
|
||||
private String familiarFaultDescription;
|
||||
|
||||
/**
|
||||
* 订单去向 0-工单池 1-检修员
|
||||
*/
|
||||
@NotNull(message = "orderDestination参数缺失", groups = {create.class, update.class})
|
||||
private Integer orderDestination;
|
||||
|
||||
private String faultName; //故障名称
|
||||
private String equipmentNo; //设备编号
|
||||
private String equipmentName; //设备名称
|
||||
private String detailedAddress; //设备详情地址
|
||||
private String clientName; // 客户姓名
|
||||
private String creatorName; // 创建人姓名
|
||||
private String receiverName; // 接单人姓名
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,23 +0,0 @@
|
|||
package com.hcy.admin.vo.CommonMaintenance;
|
||||
|
||||
import lombok.Data;
|
||||
|
||||
import java.io.Serializable;
|
||||
|
||||
/**
|
||||
* CommonMaintenanceVo
|
||||
*/
|
||||
@Data
|
||||
public class CommonMaintenanceDetailVo implements Serializable {
|
||||
|
||||
private static final long serialVersionUID = 1L;
|
||||
|
||||
private Long id; // 主键id
|
||||
private String name; // 名称
|
||||
private Long sort; // 显示排序
|
||||
private String description; // 描述
|
||||
private Integer accountStatus; // 状态（0=启用，1=停用）
|
||||
private String createTime; // 创建时间
|
||||
private String updateTime; // 更新时间
|
||||
|
||||
}
|
||||
|
|
@ -1,23 +0,0 @@
|
|||
package com.hcy.admin.vo.CommonMaintenance;
|
||||
|
||||
import lombok.Data;
|
||||
|
||||
import java.io.Serializable;
|
||||
|
||||
/**
|
||||
* CommonMaintenanceVo
|
||||
*/
|
||||
@Data
|
||||
public class CommonMaintenanceListVo implements Serializable {
|
||||
|
||||
private static final long serialVersionUID = 1L;
|
||||
|
||||
private Long id; // 主键id
|
||||
private String name; // 名称
|
||||
private Long sort; // 显示排序
|
||||
private String description; // 描述
|
||||
private Integer accountStatus; // 状态（0=启用，1=停用）
|
||||
private String createTime; // 创建时间
|
||||
private String updateTime; // 更新时间
|
||||
|
||||
}
|
||||
|
|
@ -1,23 +0,0 @@
|
|||
package com.hcy.admin.vo.CommonOverhaul;
|
||||
|
||||
import lombok.Data;
|
||||
|
||||
import java.io.Serializable;
|
||||
|
||||
/**
|
||||
* CommonOverhaulVo
|
||||
*/
|
||||
@Data
|
||||
public class CommonOverhaulDetailVo implements Serializable {
|
||||
|
||||
private static final long serialVersionUID = 1L;
|
||||
|
||||
private Long id; // 主键id
|
||||
private String name; // 名称
|
||||
private Long sort; // 显示排序
|
||||
private String description; // 描述
|
||||
private Integer accountStatus; // 状态（0=启用，1=停用）
|
||||
private String createTime; // 创建时间
|
||||
private String updateTime; // 更新时间
|
||||
|
||||
}
|
||||
|
|
@ -1,23 +0,0 @@
|
|||
package com.hcy.admin.vo.CommonOverhaul;
|
||||
|
||||
import lombok.Data;
|
||||
|
||||
import java.io.Serializable;
|
||||
|
||||
/**
|
||||
* CommonOverhaulVo
|
||||
*/
|
||||
@Data
|
||||
public class CommonOverhaulListVo implements Serializable {
|
||||
|
||||
private static final long serialVersionUID = 1L;
|
||||
|
||||
private Long id; // 主键id
|
||||
private String name; // 名称
|
||||
private Long sort; // 显示排序
|
||||
private String description; // 描述
|
||||
private Integer accountStatus; // 状态（0=启用，1=停用）
|
||||
private String createTime; // 创建时间
|
||||
private String updateTime; // 更新时间
|
||||
|
||||
}
|
||||
|
|
@ -1,22 +0,0 @@
|
|||
package com.hcy.admin.vo.ScrapType;
|
||||
|
||||
import lombok.Data;
|
||||
|
||||
import java.io.Serializable;
|
||||
|
||||
/**
|
||||
* ScrapTypeVo
|
||||
*/
|
||||
@Data
|
||||
public class ScrapTypeDetailVo implements Serializable {
|
||||
|
||||
private static final long serialVersionUID = 1L;
|
||||
|
||||
private Long id; // 主键id
|
||||
private String name; // 名称
|
||||
private Long sort; // 显示排序
|
||||
private String description; // 描述
|
||||
private Integer accountStatus; // 状态（0=启用，1=停用）
|
||||
private String createTime; // 创建时间
|
||||
private String updateTime; // 更新时间
|
||||
}
|
||||
|
|
@ -1,22 +0,0 @@
|
|||
package com.hcy.admin.vo.ScrapType;
|
||||
|
||||
import lombok.Data;
|
||||
|
||||
import java.io.Serializable;
|
||||
|
||||
/**
|
||||
* ScrapTypeVo
|
||||
*/
|
||||
@Data
|
||||
public class ScrapTypeListVo implements Serializable {
|
||||
|
||||
private static final long serialVersionUID = 1L;
|
||||
|
||||
private Long id; // 主键id
|
||||
private String name; // 名称
|
||||
private Long sort; // 显示排序
|
||||
private String description; // 描述
|
||||
private Integer accountStatus; // 状态（0=启用，1=停用）
|
||||
private String createTime; // 创建时间
|
||||
private String updateTime; // 更新时间
|
||||
}
|
||||
|
|
@ -1,22 +0,0 @@
|
|||
package com.hcy.admin.vo.commonFault;
|
||||
|
||||
import lombok.Data;
|
||||
|
||||
import java.io.Serializable;
|
||||
|
||||
/**
|
||||
* CommonFaultVo
|
||||
*/
|
||||
@Data
|
||||
public class CommonFaultDetailVo implements Serializable {
|
||||
|
||||
private static final long serialVersionUID = 1L;
|
||||
|
||||
private Long id; // 主键id
|
||||
private String name; // 名称
|
||||
private Long sort; // 显示排序
|
||||
private String description; // 描述
|
||||
private Integer accountStatus; // 状态（0=启用，1=停用）
|
||||
private String createTime; // 创建时间
|
||||
private String updateTime; // 更新时间
|
||||
}
|
||||
|
|
@ -1,24 +0,0 @@
|
|||
package com.hcy.admin.vo.commonFault;
|
||||
|
||||
import lombok.Data;
|
||||
|
||||
import java.io.Serializable;
|
||||
|
||||
/**
|
||||
* CommonFaultVo
|
||||
*/
|
||||
@Data
|
||||
public class CommonFaultListVo implements Serializable {
|
||||
|
||||
private static final long serialVersionUID = 1L;
|
||||
|
||||
private Long id; // 主键id
|
||||
private String name; // 名称
|
||||
private Long sort; // 显示排序
|
||||
private String description; // 描述
|
||||
private Integer accountStatus; // 状态（0=启用，1=停用）
|
||||
private String createTime; // 创建时间
|
||||
private String updateTime; // 更新时间
|
||||
|
||||
|
||||
}
|
||||
|
|
@ -42,4 +42,5 @@ public class MaintenanceOrderDetailVo implements Serializable {
|
|||
private Long familiarFaultId; // 常见维修结论id
|
||||
private String familiarFaultDescription; // 常见维修结论描述
|
||||
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -16,10 +16,10 @@ public class MaintenanceOrderListVo implements Serializable {
|
|||
|
||||
private Long id; // id
|
||||
private String orderNo; // 订单编号
|
||||
private Long orderSource; // 订单来源 0-客户上报；1-系统创建；2-维修员创建；3-检修员创建；4-客服创建；5-维修主管创建
|
||||
private Long orderStatus; // 订单状态 0-待抢单；1-待接单；2-接单超时；3-检测中；4-待客户确认；5-维修中；6-已完成；7-已退单；8-已关闭
|
||||
private Integer orderSource; // 订单来源 0-客户上报；1-系统创建；2-维修员创建；3-检修员创建；4-客服创建；5-维修主管创建
|
||||
private Integer orderStatus; // 订单状态 0-待抢单；1-待接单；2-接单超时；3-检测中；4-待客户确认；5-维修中；6-已完成；7-已退单；8-已关闭
|
||||
private Long clientId; // 客户id
|
||||
private Long deviceId; // 设备id
|
||||
private Long equipmentId; // 设备id
|
||||
private Long faultId; // 故障id
|
||||
private String faultDescription; // 故障描述
|
||||
private String faultImg; // 故障图片
|
||||
|
|
@ -44,4 +44,11 @@ public class MaintenanceOrderListVo implements Serializable {
|
|||
private Date createTime; // 创建时间
|
||||
private Date updateTime; // 更新时间
|
||||
|
||||
private String faultName; //故障名称
|
||||
private String equipmentNo; //设备编号
|
||||
private String equipmentName; //设备名称
|
||||
private String detailedAddress; //设备详情地址
|
||||
private String clientName; // 客户姓名
|
||||
private String creatorName; // 创建人姓名
|
||||
private String receiverName; // 接单人姓名
|
||||
}
|
||||
|
|
|
|||
|
|
@ -0,0 +1,58 @@
|
|||
package com.hcy.common.dto.order;
|
||||
|
||||
import com.baomidou.mybatisplus.annotation.IdType;
|
||||
import com.baomidou.mybatisplus.annotation.TableId;
|
||||
import lombok.Data;
|
||||
|
||||
import java.io.Serializable;
|
||||
import java.math.BigDecimal;
|
||||
import java.util.Date;
|
||||
|
||||
@Data
|
||||
public class MaintenanceOrderDto implements Serializable {
|
||||
|
||||
private static final long serialVersionUID = 1L;
|
||||
|
||||
@TableId(value="id", type= IdType.AUTO)
|
||||
private Long id; // id
|
||||
private String orderNo; // 订单编号
|
||||
private Integer orderSource; // 订单来源 0-客户上报；1-系统创建；2-维修员创建；3-检修员创建；4-客服创建；5-维修主管创建
|
||||
private Integer orderStatus; // 订单状态 0-待抢单；1-待接单；2-接单超时；3-检测中；4-待客户确认；5-维修中；6-已完成；7-已退单；8-已关闭
|
||||
private Long clientId; // 客户id
|
||||
private Long equipmentId; // 设备id
|
||||
private Long faultId; // 故障id
|
||||
private String faultDescription; // 故障描述
|
||||
private String faultImg; // 故障图片
|
||||
private Long receiverType; // 接单类型 0-区域派单；1-距离派单
|
||||
private Long provinceId; // 省id
|
||||
private Long cityId; // 市id
|
||||
private Long districtId; // 区id
|
||||
private BigDecimal orderDistance; // 订单距离
|
||||
private BigDecimal totalAmount; // 总金额
|
||||
private BigDecimal actualAmount; // 实际金额
|
||||
private Long receiverId; // 接单人id
|
||||
private Long repairId; // 返修id
|
||||
private Date receiverTime; // 接单时间
|
||||
private Date cancelOrderTime; // 取消订单时间
|
||||
private String cancelCause; // 取消原因
|
||||
private String refuseMaintenanceCause; // 拒绝维修原因
|
||||
private String remark; // 备注
|
||||
private Long creatorId; // 创建人id
|
||||
private Date orderAccomplishTime; // 订单完成时间
|
||||
private Long familiarFaultId; // 常见维修结论id
|
||||
private String familiarFaultDescription; // 常见维修结论描述
|
||||
private Date createTime; // 创建时间
|
||||
private Date updateTime; // 更新时间
|
||||
private Integer isDelete; // 是否删除 0-未删除 1-删除
|
||||
|
||||
private String faultName; //故障名称
|
||||
private String equipmentNo; //设备编号
|
||||
private String equipmentName; //设备名称
|
||||
private String detailedAddress; //设备详情地址
|
||||
private String clientName; // 客户姓名
|
||||
private String creatorName; // 创建人姓名
|
||||
private String receiverName; // 接单人姓名
|
||||
private Long equipmentProvinceId; //设备省id
|
||||
private Long equipmentDistrictId; //设备区id
|
||||
private Long equipmentCityId; //设备市id
|
||||
}
|
||||
|
|
@ -1,28 +0,0 @@
|
|||
package com.hcy.common.entity.CommonMaintenance;
|
||||
|
||||
import com.baomidou.mybatisplus.annotation.IdType;
|
||||
import com.baomidou.mybatisplus.annotation.TableId;
|
||||
import lombok.Data;
|
||||
|
||||
import java.io.Serializable;
|
||||
|
||||
/**
|
||||
* 常见维修结论描述实体
|
||||
*/
|
||||
@Data
|
||||
public class CommonMaintenance implements Serializable {
|
||||
|
||||
private static final long serialVersionUID = 1L;
|
||||
|
||||
@TableId(value="id", type= IdType.AUTO)
|
||||
private Long id; // 主键id
|
||||
private String name; // 名称
|
||||
private Long sort; // 显示排序
|
||||
private String description; // 描述
|
||||
private Integer accountStatus; // 状态（0=启用，1=停用）
|
||||
private Integer isDelete; // 是否删除: [0=否, 1=是]
|
||||
private Long createTime; // 创建时间
|
||||
private Long updateTime; // 更新时间
|
||||
private Long deleteTime; // 删除时间
|
||||
|
||||
}
|
||||
|
|
@ -1,28 +0,0 @@
|
|||
package com.hcy.common.entity.CommonOverhaul;
|
||||
|
||||
import com.baomidou.mybatisplus.annotation.IdType;
|
||||
import com.baomidou.mybatisplus.annotation.TableId;
|
||||
import lombok.Data;
|
||||
|
||||
import java.io.Serializable;
|
||||
|
||||
/**
|
||||
* 常见检修结论描述实体
|
||||
*/
|
||||
@Data
|
||||
public class CommonOverhaul implements Serializable {
|
||||
|
||||
private static final long serialVersionUID = 1L;
|
||||
|
||||
@TableId(value="id", type= IdType.AUTO)
|
||||
private Long id; // 主键id
|
||||
private String name; // 名称
|
||||
private Long sort; // 显示排序
|
||||
private String description; // 描述
|
||||
private Integer accountStatus; // 状态（0=启用，1=停用）
|
||||
private Integer isDelete; // 是否删除: [0=否, 1=是]
|
||||
private Long createTime; // 创建时间
|
||||
private Long updateTime; // 更新时间
|
||||
private Long deleteTime; // 删除时间
|
||||
|
||||
}
|
||||
|
|
@ -1,28 +0,0 @@
|
|||
package com.hcy.common.entity.ScrapType;
|
||||
|
||||
import com.baomidou.mybatisplus.annotation.IdType;
|
||||
import com.baomidou.mybatisplus.annotation.TableId;
|
||||
import lombok.Data;
|
||||
|
||||
import java.io.Serializable;
|
||||
|
||||
/**
|
||||
* 报废类型管理实体
|
||||
*/
|
||||
@Data
|
||||
public class ScrapType implements Serializable {
|
||||
|
||||
private static final long serialVersionUID = 1L;
|
||||
|
||||
@TableId(value="id", type= IdType.AUTO)
|
||||
private Long id; // 主键id
|
||||
private String name; // 名称
|
||||
private Long sort; // 显示排序
|
||||
private String description; // 描述
|
||||
private Integer accountStatus; // 状态（0=启用，1=停用）
|
||||
private Integer isDelete; // 是否删除: [0=否, 1=是]
|
||||
private Long createTime; // 创建时间
|
||||
private Long updateTime; // 更新时间
|
||||
private Long deleteTime; // 删除时间
|
||||
|
||||
}
|
||||
|
|
@ -1,28 +0,0 @@
|
|||
package com.hcy.common.entity.commonFault;
|
||||
|
||||
import com.baomidou.mybatisplus.annotation.IdType;
|
||||
import com.baomidou.mybatisplus.annotation.TableId;
|
||||
import lombok.Data;
|
||||
|
||||
import java.io.Serializable;
|
||||
|
||||
/**
|
||||
* 常见故障管理实体
|
||||
*/
|
||||
@Data
|
||||
public class CommonFault implements Serializable {
|
||||
|
||||
private static final long serialVersionUID = 1L;
|
||||
|
||||
@TableId(value="id", type= IdType.AUTO)
|
||||
private Long id; // 主键id
|
||||
private String name; // 名称
|
||||
private Long sort; // 显示排序
|
||||
private String description; // 描述
|
||||
private Integer accountStatus; // 状态
|
||||
private Integer isDelete; // 是否删除: [0=否, 1=是]
|
||||
private Long createTime; // 创建时间
|
||||
private Long updateTime; // 更新时间
|
||||
private Long deleteTime; // 删除时间
|
||||
|
||||
}
|
||||
|
|
@ -19,10 +19,10 @@ public class MaintenanceOrder implements Serializable {
|
|||
@TableId(value="id", type= IdType.AUTO)
|
||||
private Long id; // id
|
||||
private String orderNo; // 订单编号
|
||||
private Long orderSource; // 订单来源 0-客户上报；1-系统创建；2-维修员创建；3-检修员创建；4-客服创建；5-维修主管创建
|
||||
private Long orderStatus; // 订单状态 0-待抢单；1-待接单；2-接单超时；3-检测中；4-待客户确认；5-维修中；6-已完成；7-已退单；8-已关闭
|
||||
private Integer orderSource; // 订单来源 0-客户上报；1-系统创建；2-维修员创建；3-检修员创建；4-客服创建；5-维修主管创建
|
||||
private Integer orderStatus; // 订单状态 0-待抢单；1-待接单；2-接单超时；3-检测中；4-待客户确认；5-维修中；6-已完成；7-已退单；8-已关闭
|
||||
private Long clientId; // 客户id
|
||||
private Long deviceId; // 设备id
|
||||
private Long equipmentId; // 设备id
|
||||
private Long faultId; // 故障id
|
||||
private String faultDescription; // 故障描述
|
||||
private String faultImg; // 故障图片
|
||||
|
|
|
|||
|
|
@ -0,0 +1,59 @@
|
|||
package com.hcy.common.enums.order;
|
||||
|
||||
import com.google.common.collect.Maps;
|
||||
|
||||
import java.util.Map;
|
||||
|
||||
/**
|
||||
* 检修工单梅举
|
||||
* @author dabin
|
||||
*/
|
||||
public enum MaintenanceOrderStatusEnum {
|
||||
|
||||
//订单状态 0-待抢单；1-待接单；2-接单超时；3-巡检中；4-已完成；5-已退单；6-待巡检
|
||||
WAITING_LIST(0,"待抢单"),
|
||||
PENDING_ORDER(1,"待接单"),
|
||||
ORDER_TIMEOUT(2,"接单超时"),
|
||||
CHECKING(3,"检测中"),
|
||||
WAIT_CONFIRMATION(4,"待确认"),
|
||||
MAINTENANCE_ING(5,"维修中"),
|
||||
FINISHED(6,"已完成"),
|
||||
CHARGEBACK(6,"已退单"),
|
||||
CLOSED(6,"已关闭");
|
||||
|
||||
private final int status;
|
||||
private final String desc;
|
||||
|
||||
MaintenanceOrderStatusEnum(int status, String desc) {
|
||||
this.status = status;
|
||||
this.desc = desc;
|
||||
}
|
||||
|
||||
/**
|
||||
* 获取状态码
|
||||
*
|
||||
* @return int
|
||||
* @author dabin
|
||||
*/
|
||||
public int getStatus() {
|
||||
return this.status;
|
||||
}
|
||||
|
||||
/**
|
||||
* 获取提示
|
||||
*
|
||||
* @return String
|
||||
* @author dabin
|
||||
*/
|
||||
public String getDesc() {
|
||||
return this.desc;
|
||||
}
|
||||
|
||||
public static Map<Integer, String> getMap() {
|
||||
Map<Integer, String> map = Maps.newHashMap();
|
||||
for (MaintenanceOrderStatusEnum maintenanceOrderStatusEnum : MaintenanceOrderStatusEnum.values()) {
|
||||
map.put(maintenanceOrderStatusEnum.status, maintenanceOrderStatusEnum.desc);
|
||||
}
|
||||
return map;
|
||||
}
|
||||
}
|
||||
|
|
@ -11,30 +11,26 @@ import java.util.Map;
|
|||
|
||||
public enum OrderStateEnum {
|
||||
//订单来源 1-系统创建；4-客服创建
|
||||
SYSTEMCREATION(1,"系统创建"),
|
||||
CUSTOMERSERVICECREATION(4,"客服创建"),
|
||||
SYSTEM_CREATION(1,"系统创建"),
|
||||
CUSTOMER_SERVICE_CREATION(4,"客服创建"),
|
||||
|
||||
//订单状态 0-待抢单；1-待接单；2-接单超时；3-巡检中；4-已完成；5-已退单；6-待巡检
|
||||
WAITINGLIST(0,"待抢单"),
|
||||
PENDINGORDER(1,"待接单"),
|
||||
ORDERTIMEOUT(2,"接单超时"),
|
||||
DURINGINSPECTION(3,"巡检中"),
|
||||
WAITING_LIST(0,"待抢单"),
|
||||
PENDING_ORDER(1,"待接单"),
|
||||
ORDER_TIMEOUT(2,"接单超时"),
|
||||
DURING_INSPECTION(3,"巡检中"),
|
||||
COMPLETED(4,"已完成"),
|
||||
RETURNEDORDER(5,"已退单"),
|
||||
TOBEINSPECTED(6,"待巡检"),
|
||||
RETURNED_ORDER(5,"已退单"),
|
||||
TO_BE_INSPECTED(6,"待巡检"),
|
||||
|
||||
//接单类型 0-区域派单；1-距离派单
|
||||
REGIONALDISPATCH(0,"区域派单"),
|
||||
DISTANCEORDER(1,"距离派单"),
|
||||
REGIONAL_DISPATCH(0,"区域派单"),
|
||||
DISTANCE_ORDER(1,"距离派单"),
|
||||
|
||||
//工单去向 (0=工单池，1=检修员)
|
||||
WORKORDERTANK(0,"工单池"),
|
||||
WORK_ORDER_TANK(0,"工单池"),
|
||||
REPAIRER(1,"检修员"),
|
||||
|
||||
//是否删除 0-未删除 1-删除
|
||||
NOTDELETED(0,"未删除"),
|
||||
DELETE(1, "删除"),
|
||||
|
||||
//巡检结果（0=正常 1=异常）
|
||||
NORMAL(0,"正常"),
|
||||
ABNORMAL(1, "异常");
|
||||
|
|
|
|||
|
|
@ -1,13 +0,0 @@
|
|||
package com.hcy.common.mapper.CommonMaintenance;
|
||||
|
||||
|
||||
import com.hcy.common.core.basics.IBaseMapper;
|
||||
import com.hcy.common.entity.CommonMaintenance.CommonMaintenance;
|
||||
import org.apache.ibatis.annotations.Mapper;
|
||||
|
||||
/**
|
||||
* 常见维修结论描述Mapper
|
||||
*/
|
||||
@Mapper
|
||||
public interface CommonMaintenanceMapper extends IBaseMapper<CommonMaintenance> {
|
||||
}
|
||||
|
|
@ -1,13 +0,0 @@
|
|||
package com.hcy.common.mapper.CommonOverhaul;
|
||||
|
||||
|
||||
import com.hcy.common.core.basics.IBaseMapper;
|
||||
import com.hcy.common.entity.CommonOverhaul.CommonOverhaul;
|
||||
import org.apache.ibatis.annotations.Mapper;
|
||||
|
||||
/**
|
||||
* 常见检修结论描述Mapper
|
||||
*/
|
||||
@Mapper
|
||||
public interface CommonOverhaulMapper extends IBaseMapper<CommonOverhaul> {
|
||||
}
|
||||
|
|
@ -1,13 +0,0 @@
|
|||
package com.hcy.common.mapper.ScrapType;
|
||||
|
||||
|
||||
import com.hcy.common.core.basics.IBaseMapper;
|
||||
import com.hcy.common.entity.ScrapType.ScrapType;
|
||||
import org.apache.ibatis.annotations.Mapper;
|
||||
|
||||
/**
|
||||
* 报废类型管理Mapper
|
||||
*/
|
||||
@Mapper
|
||||
public interface ScrapTypeMapper extends IBaseMapper<ScrapType> {
|
||||
}
|
||||
|
|
@ -1,13 +0,0 @@
|
|||
package com.hcy.common.mapper.commonFault;
|
||||
|
||||
|
||||
import com.hcy.common.core.basics.IBaseMapper;
|
||||
import com.hcy.common.entity.commonFault.CommonFault;
|
||||
import org.apache.ibatis.annotations.Mapper;
|
||||
|
||||
/**
|
||||
* 常见故障管理Mapper
|
||||
*/
|
||||
@Mapper
|
||||
public interface CommonFaultMapper extends IBaseMapper<CommonFault> {
|
||||
}
|
||||
|
|
@ -1,12 +1,17 @@
|
|||
package com.hcy.common.mapper.order;
|
||||
|
||||
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
||||
import com.hcy.common.core.basics.IBaseMapper;
|
||||
import com.hcy.common.dto.order.MaintenanceOrderDto;
|
||||
import com.hcy.common.entity.order.MaintenanceOrder;
|
||||
import org.apache.ibatis.annotations.Mapper;
|
||||
import org.apache.ibatis.annotations.Param;
|
||||
|
||||
/**
|
||||
* 检修订单Mapper
|
||||
*/
|
||||
@Mapper
|
||||
public interface MaintenanceOrderMapper extends IBaseMapper<MaintenanceOrder> {
|
||||
|
||||
Page<MaintenanceOrderDto> list(Page page,@Param("param") MaintenanceOrderDto maintenanceOrderDto);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -0,0 +1,48 @@
|
|||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
|
||||
<mapper namespace="com.hcy.common.mapper.order.MaintenanceOrderMapper">
|
||||
|
||||
<select id="list" resultType="com.hcy.common.dto.order.MaintenanceOrderDto">
|
||||
SELECT
|
||||
lmo.*,
|
||||
lf.`name` as faultName,
|
||||
lc.client_name as clientName,
|
||||
le.number as equipmentNo,
|
||||
le.name as equipmentName,
|
||||
le.detailed_address as detailedAddress,
|
||||
lsaa.username as creatorName,
|
||||
lu.username as receiverName,
|
||||
le.province_id as equipmentProvinceId,
|
||||
le.district_id as equipmentDistrictId,
|
||||
le.city_id as equipmentCityId
|
||||
FROM
|
||||
la_maintenance_order AS lmo
|
||||
LEFT JOIN la_client AS lc ON lc.id = lmo.client_id
|
||||
LEFT JOIN la_equipment AS le ON le.id = lmo.equipment_id
|
||||
LEFT JOIN la_fault AS lf On lf.id = lmo.fault_id
|
||||
LEFT JOIN la_system_auth_admin AS lsaa ON lsaa.id = lmo.creator_id
|
||||
LEFT JOIN la_user AS lu ON lu.id = lmo.receiver_id
|
||||
<where>
|
||||
lmo.is_delete = 0
|
||||
<if test="param.orderNo != null and param.orderNo != ''">
|
||||
and lmo.order_no like concat('%',#{param.orderNo},'%')
|
||||
</if>
|
||||
<if test="param.orderSource != null">
|
||||
and lmo.order_source = #{param.orderSource}
|
||||
</if>
|
||||
<if test="param.clientName != null and param.clientName != ''">
|
||||
and lc.name like concat('%',#{param.clientName},'%')
|
||||
</if>
|
||||
<if test="param.creatorName != null and param.creatorName != ''">
|
||||
and lsaa.username like concat('%',#{param.creatorName},'%')
|
||||
</if>
|
||||
<if test="param.receiverName != null and param.receiverName != ''">
|
||||
and lu.username like concat('%',#{param.receiverName},'%')
|
||||
</if>
|
||||
<if test="param.orderStatus != null">
|
||||
and order_status = #{param.orderStatus}
|
||||
</if>
|
||||
</where>
|
||||
order by create_time desc
|
||||
</select>
|
||||
</mapper>
|
||||
|
|
@ -10,8 +10,8 @@
|
|||
t.username,
|
||||
t.nickname,
|
||||
t.avatar,
|
||||
t.role,
|
||||
sd.NAME AS dept,
|
||||
sr.NAME AS role,
|
||||
t.is_multipoint,
|
||||
t.is_disable,
|
||||
t.last_login_ip,
|
||||
|
|
|
|||
|
|
@ -10,8 +10,8 @@
|
|||
t.username,
|
||||
t.nickname,
|
||||
t.avatar,
|
||||
t.role,
|
||||
sd.NAME AS dept,
|
||||
sr.NAME AS role,
|
||||
t.is_multipoint,
|
||||
t.is_disable,
|
||||
t.last_login_ip,
|
||||
|
|
|
|||
|
|
@ -74,9 +74,6 @@ public class LoginServiceImpl implements ILoginService {
|
|||
@Resource
|
||||
SystemConfigMapper systemConfigMapper;
|
||||
|
||||
@Resource
|
||||
ICouponService couponService;
|
||||
|
||||
/**
|
||||
* 注册账号
|
||||
*
|
||||
|
|
@ -183,7 +180,7 @@ public class LoginServiceImpl implements ILoginService {
|
|||
|
||||
Map<String, Object> response = new LinkedHashMap<>();
|
||||
response.put("id", user.getId());
|
||||
response.put("isBindMobile", !user.getMobile().equals(""));
|
||||
response.put("isBindMobile", !"".equals(user.getMobile()));
|
||||
response.put("token", token);
|
||||
return response;
|
||||
} catch (WxErrorException e) {
|
||||
|
|
|
|||
|
|
@ -14,14 +14,17 @@ import com.hcy.common.entity.client.ClientContacts;
|
|||
import com.hcy.common.entity.distribution.Distributor;
|
||||
import com.hcy.common.entity.staff.Staff;
|
||||
import com.hcy.common.entity.system.SystemAuthAdmin;
|
||||
import com.hcy.common.entity.system.SystemAuthRole;
|
||||
import com.hcy.common.entity.user.User;
|
||||
import com.hcy.common.entity.user.UserAuth;
|
||||
import com.hcy.common.enums.NoticeEnum;
|
||||
import com.hcy.common.enums.user.SystemAuthRoleEnum;
|
||||
import com.hcy.common.exception.OperateException;
|
||||
import com.hcy.common.mapper.client.ClientContactsMapper;
|
||||
import com.hcy.common.mapper.distribution.DistributorMapper;
|
||||
import com.hcy.common.mapper.staff.StaffMapper;
|
||||
import com.hcy.common.mapper.system.SystemAuthAdminMapper;
|
||||
import com.hcy.common.mapper.system.SystemAuthRoleMapper;
|
||||
import com.hcy.common.mapper.user.UserAuthMapper;
|
||||
import com.hcy.common.mapper.user.UserMapper;
|
||||
import com.hcy.common.utils.*;
|
||||
|
|
@ -38,6 +41,8 @@ import org.springframework.stereotype.Service;
|
|||
import org.springframework.util.Assert;
|
||||
|
||||
import javax.annotation.Resource;
|
||||
import java.util.Arrays;
|
||||
import java.util.LinkedHashMap;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
|
||||
|
|
@ -62,6 +67,9 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements IU
|
|||
@Resource
|
||||
SystemAuthAdminMapper systemAuthAdminMapper;
|
||||
|
||||
@Resource
|
||||
SystemAuthRoleMapper systemAuthRoleMapper;
|
||||
|
||||
/**
|
||||
* 个人中心
|
||||
*
|
||||
|
|
@ -75,10 +83,6 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements IU
|
|||
.select("id,sn,avatar,real_name,nickname,username,mobile")
|
||||
.eq("id", userId)
|
||||
.last("limit 1"));
|
||||
UserAuth userAuth = userAuthMapper.selectOne(new QueryWrapper<UserAuth>()
|
||||
.select("id,openid")
|
||||
.eq("user_id", userId)
|
||||
.last("limit 1"));
|
||||
|
||||
UserCenterVo vo = new UserCenterVo();
|
||||
BeanUtils.copyProperties(user, vo);
|
||||
|
|
@ -106,14 +110,26 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements IU
|
|||
.eq(SystemAuthAdmin::getIsDelete, GlobalConstant.NOT_DELETE)
|
||||
.last("limit 1");
|
||||
if(clientContacts != null && clientContacts.getAdminId() != null){
|
||||
queryWrapper.eq(SystemAuthAdmin::getUserId, clientContacts.getAdminId());
|
||||
queryWrapper.eq(SystemAuthAdmin::getId, clientContacts.getAdminId());
|
||||
}else{
|
||||
queryWrapper.eq(SystemAuthAdmin::getUserId, userId);
|
||||
}
|
||||
|
||||
SystemAuthAdmin systemAuthAdmin = systemAuthAdminMapper.selectOne(queryWrapper);
|
||||
if(systemAuthAdmin != null){
|
||||
vo.setRoleId(systemAuthAdmin.getRole());
|
||||
String[] roleIdList = systemAuthAdmin.getRole().split(",");
|
||||
//设置角色名称
|
||||
LinkedHashMap<Integer, String> roleMap = new LinkedHashMap<>();
|
||||
List<SystemAuthRole> systemAuthRoleList = systemAuthRoleMapper.findSystemAuthRoleListByIds(systemAuthAdmin.getRole());
|
||||
for (SystemAuthRole systemAuthRole : systemAuthRoleList) {
|
||||
for (String roleId : roleIdList) {
|
||||
if(systemAuthRole.getId().toString().equals(roleId) &&
|
||||
systemAuthRole.getIsMnpLogin().equals(Integer.valueOf(SystemAuthRoleEnum.CAN_LOGIN.getType()))){
|
||||
roleMap.put(systemAuthRole.getId(), systemAuthRole.getName());
|
||||
}
|
||||
}
|
||||
}
|
||||
vo.setRoleMap(roleMap);
|
||||
}
|
||||
|
||||
return vo;
|
||||
|
|
|
|||
|
|
@ -24,7 +24,6 @@ import org.springframework.stereotype.Service;
|
|||
import org.springframework.util.Assert;
|
||||
|
||||
import javax.annotation.Resource;
|
||||
import java.util.Date;
|
||||
import java.util.LinkedList;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
|
|
@ -66,7 +65,7 @@ public class RoutingInspectionOrderServiceImpl implements IRoutingInspectionOrde
|
|||
if(StringUtils.isNotEmpty(params.get("inspectionOrderStatus"))){
|
||||
inspectionOrderDto.setInspectionOrderStatus(Long.valueOf(params.get("inspectionOrderStatus")));
|
||||
}else{
|
||||
inspectionOrderDto.setInspectionOrderStatus(Long.valueOf(OrderStateEnum.PENDINGORDER.getStatus()));
|
||||
inspectionOrderDto.setInspectionOrderStatus(Long.valueOf(OrderStateEnum.PENDING_ORDER.getStatus()));
|
||||
}
|
||||
|
||||
Page<RoutingInspectionOrderDto> iPage = routingInspectionOrderMapper.frontPageList(page, inspectionOrderDto);
|
||||
|
|
@ -145,7 +144,7 @@ public class RoutingInspectionOrderServiceImpl implements IRoutingInspectionOrde
|
|||
|
||||
Assert.notNull(model, "数据不存在!");
|
||||
|
||||
model.setInspectionOrderStatus(OrderStateEnum.TOBEINSPECTED.getStatus()); //用户接单后工单状态为待巡检
|
||||
model.setInspectionOrderStatus(OrderStateEnum.TO_BE_INSPECTED.getStatus()); //用户接单后工单状态为待巡检
|
||||
routingInspectionOrderMapper.updateById(model);
|
||||
}
|
||||
|
||||
|
|
@ -164,7 +163,7 @@ public class RoutingInspectionOrderServiceImpl implements IRoutingInspectionOrde
|
|||
|
||||
Assert.notNull(model, "数据不存在!");
|
||||
|
||||
model.setInspectionOrderStatus(OrderStateEnum.DURINGINSPECTION.getStatus()); //用户开始巡检后工单状态为巡检中
|
||||
model.setInspectionOrderStatus(OrderStateEnum.DURING_INSPECTION.getStatus()); //用户开始巡检后工单状态为巡检中
|
||||
routingInspectionOrderMapper.updateById(model);
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -3,6 +3,7 @@ package com.hcy.front.vo.user;
|
|||
import lombok.Data;
|
||||
|
||||
import java.io.Serializable;
|
||||
import java.util.Map;
|
||||
|
||||
/**
|
||||
* 用户个人中心Vo
|
||||
|
|
@ -20,6 +21,6 @@ public class UserCenterVo implements Serializable {
|
|||
private String username;
|
||||
private String mobile;
|
||||
|
||||
private String roleId; //角色id
|
||||
private Long clientId; //客户id
|
||||
private Map<Integer,String> roleMap; //角色信息 key:id value:name
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in New Issue