bug修复
This commit is contained in:
parent
0831e48fec
commit
e06fb67d85
@ -1,53 +1,32 @@
|
|||||||
package com.zhgd.xmgl.modules.baotou.controller;
|
package com.zhgd.xmgl.modules.baotou.controller;
|
||||||
|
|
||||||
import com.alibaba.fastjson.JSONObject;
|
import com.alibaba.fastjson.JSON;
|
||||||
|
import com.baomidou.mybatisplus.core.metadata.IPage;
|
||||||
import com.zhgd.annotation.OperLog;
|
import com.zhgd.annotation.OperLog;
|
||||||
import io.swagger.annotations.Api;
|
|
||||||
import io.swagger.annotations.ApiImplicitParam;
|
|
||||||
import io.swagger.annotations.ApiOperation;
|
|
||||||
import io.swagger.annotations.ApiImplicitParams;
|
|
||||||
import java.util.HashMap;
|
|
||||||
import springfox.documentation.annotations.ApiIgnore;
|
|
||||||
import java.util.Arrays;
|
|
||||||
import java.util.List;
|
|
||||||
import java.util.Map;
|
|
||||||
import java.io.IOException;
|
|
||||||
import java.io.UnsupportedEncodingException;
|
|
||||||
import java.net.URLDecoder;
|
|
||||||
import javax.servlet.http.HttpServletRequest;
|
|
||||||
import javax.servlet.http.HttpServletResponse;
|
|
||||||
import com.zhgd.jeecg.common.api.vo.Result;
|
import com.zhgd.jeecg.common.api.vo.Result;
|
||||||
import com.zhgd.jeecg.common.system.query.QueryGenerator;
|
|
||||||
import com.zhgd.jeecg.common.util.oConvertUtils;
|
|
||||||
import org.apache.commons.collections.MapUtils;
|
|
||||||
import com.zhgd.xmgl.modules.baotou.entity.ProjectHomeNotice;
|
import com.zhgd.xmgl.modules.baotou.entity.ProjectHomeNotice;
|
||||||
import com.zhgd.xmgl.modules.baotou.service.IProjectHomeNoticeService;
|
import com.zhgd.xmgl.modules.baotou.service.IProjectHomeNoticeService;
|
||||||
|
import io.swagger.annotations.Api;
|
||||||
import org.simpleframework.xml.core.Validate;
|
import io.swagger.annotations.ApiImplicitParam;
|
||||||
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
|
import io.swagger.annotations.ApiImplicitParams;
|
||||||
import com.baomidou.mybatisplus.core.metadata.IPage;
|
import io.swagger.annotations.ApiOperation;
|
||||||
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
|
||||||
import lombok.extern.slf4j.Slf4j;
|
import lombok.extern.slf4j.Slf4j;
|
||||||
|
import org.apache.commons.collections.MapUtils;
|
||||||
import org.jeecgframework.poi.excel.ExcelImportUtil;
|
import org.simpleframework.xml.core.Validate;
|
||||||
import org.jeecgframework.poi.excel.def.NormalExcelConstants;
|
|
||||||
import org.jeecgframework.poi.excel.entity.ExportParams;
|
|
||||||
import org.jeecgframework.poi.excel.entity.ImportParams;
|
|
||||||
import org.jeecgframework.poi.excel.view.JeecgEntityExcelView;
|
|
||||||
|
|
||||||
import org.springframework.beans.factory.annotation.Autowired;
|
import org.springframework.beans.factory.annotation.Autowired;
|
||||||
import org.springframework.web.bind.annotation.*;
|
import org.springframework.web.bind.annotation.*;
|
||||||
import org.springframework.web.multipart.MultipartFile;
|
import springfox.documentation.annotations.ApiIgnore;
|
||||||
import org.springframework.web.multipart.MultipartHttpServletRequest;
|
|
||||||
import org.springframework.web.servlet.ModelAndView;
|
import java.util.HashMap;
|
||||||
import com.alibaba.fastjson.JSON;
|
import java.util.List;
|
||||||
|
import java.util.Map;
|
||||||
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @Title: Controller
|
* @Title: Controller
|
||||||
* @Description: 首页通知公告
|
* @Description: 首页通知公告
|
||||||
* @author: pds
|
* @author: pds
|
||||||
* @date: 2024-11-25
|
* @date: 2024-11-25
|
||||||
* @version: V1.0
|
* @version: V1.0
|
||||||
*/
|
*/
|
||||||
@RestController
|
@RestController
|
||||||
@ -55,85 +34,100 @@ import com.alibaba.fastjson.JSON;
|
|||||||
@Slf4j
|
@Slf4j
|
||||||
@Api(tags = "首页通知公告相关Api")
|
@Api(tags = "首页通知公告相关Api")
|
||||||
public class ProjectHomeNoticeController {
|
public class ProjectHomeNoticeController {
|
||||||
@Autowired
|
@Autowired
|
||||||
private IProjectHomeNoticeService projectHomeNoticeService;
|
private IProjectHomeNoticeService projectHomeNoticeService;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 分页列表查询
|
* 分页列表查询
|
||||||
* @return
|
*
|
||||||
*/
|
* @return
|
||||||
|
*/
|
||||||
@OperLog(operModul = "首页通知公告管理", operType = "分页查询", operDesc = "分页列表查询首页通知公告信息")
|
@OperLog(operModul = "首页通知公告管理", operType = "分页查询", operDesc = "分页列表查询首页通知公告信息")
|
||||||
@ApiOperation(value = "分页列表查询首页通知公告信息", notes = "分页列表查询首页通知公告信息", httpMethod="GET")
|
@ApiOperation(value = "分页列表查询首页通知公告信息", notes = "分页列表查询首页通知公告信息", httpMethod = "GET")
|
||||||
@ApiImplicitParams({
|
@ApiImplicitParams({
|
||||||
@ApiImplicitParam(name = "pageNo", value = "第几页", paramType = "query", required = true, dataType = "Integer"),
|
@ApiImplicitParam(name = "pageNo", value = "第几页", paramType = "query", required = true, dataType = "Integer"),
|
||||||
@ApiImplicitParam(name = "pageSize", value = "每页显示条数", paramType = "query", required = true, dataType = "Integer"),
|
@ApiImplicitParam(name = "pageSize", value = "每页显示条数", paramType = "query", required = true, dataType = "Integer"),
|
||||||
})
|
})
|
||||||
@GetMapping(value = "/page")
|
@GetMapping(value = "/page")
|
||||||
public Result<IPage<ProjectHomeNotice>> queryPageList(@ApiIgnore @RequestParam HashMap<String, Object> param) {
|
public Result<IPage<ProjectHomeNotice>> queryPageList(@ApiIgnore @RequestParam HashMap<String, Object> param) {
|
||||||
return Result.success(projectHomeNoticeService.queryPageList(param));
|
return Result.success(projectHomeNoticeService.queryPageList(param));
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 列表查询
|
* 列表查询
|
||||||
* @return
|
*
|
||||||
*/
|
* @return
|
||||||
|
*/
|
||||||
@OperLog(operModul = "首页通知公告管理", operType = "列表查询", operDesc = "列表查询首页通知公告信息")
|
@OperLog(operModul = "首页通知公告管理", operType = "列表查询", operDesc = "列表查询首页通知公告信息")
|
||||||
@ApiOperation(value = "列表查询首页通知公告信息", notes = "列表查询首页通知公告信息", httpMethod="GET")
|
@ApiOperation(value = "列表查询首页通知公告信息", notes = "列表查询首页通知公告信息", httpMethod = "GET")
|
||||||
@GetMapping(value = "/list")
|
@GetMapping(value = "/list")
|
||||||
public Result<List<ProjectHomeNotice>> queryList(@ApiIgnore @RequestParam HashMap<String, Object> param) {
|
public Result<List<ProjectHomeNotice>> queryList(@ApiIgnore @RequestParam HashMap<String, Object> param) {
|
||||||
return Result.success(projectHomeNoticeService.queryList(param));
|
return Result.success(projectHomeNoticeService.queryList(param));
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 添加
|
* 添加
|
||||||
* @param projectHomeNotice
|
*
|
||||||
* @return
|
* @param projectHomeNotice
|
||||||
*/
|
* @return
|
||||||
|
*/
|
||||||
@OperLog(operModul = "首页通知公告管理", operType = "添加", operDesc = "添加首页通知公告信息")
|
@OperLog(operModul = "首页通知公告管理", operType = "添加", operDesc = "添加首页通知公告信息")
|
||||||
@ApiOperation(value = "添加首页通知公告信息", notes = "添加首页通知公告信息" , httpMethod="POST")
|
@ApiOperation(value = "添加首页通知公告信息", notes = "添加首页通知公告信息", httpMethod = "POST")
|
||||||
@PostMapping(value = "/add")
|
@PostMapping(value = "/add")
|
||||||
public Result<ProjectHomeNotice> add(@RequestBody @Validate ProjectHomeNotice projectHomeNotice) {
|
public Result<ProjectHomeNotice> add(@RequestBody @Validate ProjectHomeNotice projectHomeNotice) {
|
||||||
projectHomeNoticeService.add(projectHomeNotice);
|
projectHomeNoticeService.add(projectHomeNotice);
|
||||||
return Result.ok();
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* 编辑
|
|
||||||
* @param projectHomeNotice
|
|
||||||
* @return
|
|
||||||
*/
|
|
||||||
@OperLog(operModul = "首页通知公告管理", operType = "编辑", operDesc = "编辑首页通知公告信息")
|
|
||||||
@ApiOperation(value = "编辑首页通知公告信息", notes = "编辑首页通知公告信息" , httpMethod="POST")
|
|
||||||
@PostMapping(value = "/edit")
|
|
||||||
public Result<ProjectHomeNotice> edit(@RequestBody ProjectHomeNotice projectHomeNotice) {
|
|
||||||
projectHomeNoticeService.edit(projectHomeNotice);
|
|
||||||
return Result.ok();
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* 通过id删除
|
|
||||||
* @return
|
|
||||||
*/
|
|
||||||
@OperLog(operModul = "首页通知公告管理", operType = "删除", operDesc = "删除首页通知公告信息")
|
|
||||||
@ApiOperation(value = "删除首页通知公告信息", notes = "删除首页通知公告信息" , httpMethod="POST")
|
|
||||||
@ApiImplicitParam(name = "id", value = "首页通知公告ID", paramType = "body", required = true, dataType = "String", example = "{\"id\":\"1\"}")
|
|
||||||
@PostMapping(value = "/delete")
|
|
||||||
public Result<ProjectHomeNotice> delete(@ApiIgnore @RequestBody HashMap<String ,Object> map) {
|
|
||||||
projectHomeNoticeService.delete(MapUtils.getString(map, "id"));
|
|
||||||
return Result.ok();
|
return Result.ok();
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 通过id查询
|
* 编辑
|
||||||
* @param id
|
*
|
||||||
* @return
|
* @param projectHomeNotice
|
||||||
*/
|
* @return
|
||||||
|
*/
|
||||||
|
@OperLog(operModul = "首页通知公告管理", operType = "编辑", operDesc = "编辑首页通知公告信息")
|
||||||
|
@ApiOperation(value = "编辑首页通知公告信息", notes = "编辑首页通知公告信息", httpMethod = "POST")
|
||||||
|
@PostMapping(value = "/edit")
|
||||||
|
public Result<ProjectHomeNotice> edit(@RequestBody ProjectHomeNotice projectHomeNotice) {
|
||||||
|
projectHomeNoticeService.edit(projectHomeNotice);
|
||||||
|
return Result.ok();
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 通过id删除
|
||||||
|
*
|
||||||
|
* @return
|
||||||
|
*/
|
||||||
|
@OperLog(operModul = "首页通知公告管理", operType = "删除", operDesc = "删除首页通知公告信息")
|
||||||
|
@ApiOperation(value = "删除首页通知公告信息", notes = "删除首页通知公告信息", httpMethod = "POST")
|
||||||
|
@ApiImplicitParam(name = "id", value = "首页通知公告ID", paramType = "body", required = true, dataType = "String", example = "{\"id\":\"1\"}")
|
||||||
|
@PostMapping(value = "/delete")
|
||||||
|
public Result<ProjectHomeNotice> delete(@ApiIgnore @RequestBody HashMap<String, Object> map) {
|
||||||
|
projectHomeNoticeService.delete(MapUtils.getString(map, "id"));
|
||||||
|
return Result.ok();
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 通过id查询
|
||||||
|
*
|
||||||
|
* @param id
|
||||||
|
* @return
|
||||||
|
*/
|
||||||
@OperLog(operModul = "首页通知公告管理", operType = "通过id查询", operDesc = "通过id查询首页通知公告信息")
|
@OperLog(operModul = "首页通知公告管理", operType = "通过id查询", operDesc = "通过id查询首页通知公告信息")
|
||||||
@ApiOperation(value = "通过id查询首页通知公告信息", notes = "通过id查询首页通知公告信息" , httpMethod="GET")
|
@ApiOperation(value = "通过id查询首页通知公告信息", notes = "通过id查询首页通知公告信息", httpMethod = "GET")
|
||||||
@ApiImplicitParam(name = "id", value = "首页通知公告ID", paramType = "query", required = true, dataType = "Integer")
|
@ApiImplicitParam(name = "id", value = "首页通知公告ID", paramType = "query", required = true, dataType = "Integer")
|
||||||
@GetMapping(value = "/queryById")
|
@GetMapping(value = "/queryById")
|
||||||
public Result<ProjectHomeNotice> queryById(@RequestParam(name="id",required=true) String id) {
|
public Result<ProjectHomeNotice> queryById(@RequestParam(name = "id", required = true) String id) {
|
||||||
return Result.success(projectHomeNoticeService.queryById(id));
|
return Result.success(projectHomeNoticeService.queryById(id));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@OperLog(operModul = "首页通知公告管理", operType = "添加", operDesc = "从工作流添加首页通知公告")
|
||||||
|
@ApiOperation(value = "从工作流添加首页通知公告", notes = "从工作流添加首页通知公告", httpMethod = "POST")
|
||||||
|
@PostMapping(value = "/flow/add")
|
||||||
|
public Result addFromFlow(@RequestBody @Validate Map<String, Object> param) {
|
||||||
|
log.info("从工作流添加首页通知公告:{}", JSON.toJSONString(param));
|
||||||
|
projectHomeNoticeService.addFromFlow(param);
|
||||||
|
return Result.ok();
|
||||||
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
@ -67,6 +67,7 @@ public class ProjectHomeWorkController {
|
|||||||
@ApiImplicitParams({
|
@ApiImplicitParams({
|
||||||
@ApiImplicitParam(name = "pageNo", value = "第几页", paramType = "query", required = true, dataType = "Integer"),
|
@ApiImplicitParam(name = "pageNo", value = "第几页", paramType = "query", required = true, dataType = "Integer"),
|
||||||
@ApiImplicitParam(name = "pageSize", value = "每页显示条数", paramType = "query", required = true, dataType = "Integer"),
|
@ApiImplicitParam(name = "pageSize", value = "每页显示条数", paramType = "query", required = true, dataType = "Integer"),
|
||||||
|
@ApiImplicitParam(name = "seeI", value = "1项目子账号只看到自己的数据", paramType = "query", required = true, dataType = "Integer"),
|
||||||
})
|
})
|
||||||
@GetMapping(value = "/page")
|
@GetMapping(value = "/page")
|
||||||
public Result<IPage<ProjectHomeWork>> queryPageList(@ApiIgnore @RequestParam HashMap<String, Object> param) {
|
public Result<IPage<ProjectHomeWork>> queryPageList(@ApiIgnore @RequestParam HashMap<String, Object> param) {
|
||||||
|
|||||||
@ -10,6 +10,12 @@
|
|||||||
<if test="param.projectHomeWorkId == null or param.projectHomeWorkId == ''">
|
<if test="param.projectHomeWorkId == null or param.projectHomeWorkId == ''">
|
||||||
and t.project_home_work_id is null
|
and t.project_home_work_id is null
|
||||||
</if>
|
</if>
|
||||||
|
<if test="param.projectHomeWorkId == null and param.formNameList != null and param.seeI == '1'.toString() and param.accountType == '6'.toString() ">
|
||||||
|
and
|
||||||
|
<foreach collection="param.formNameList" index="index" item="item" open="(" separator="or" close=")">
|
||||||
|
(t.file_url like concat('%',#{item},'%'))
|
||||||
|
</foreach>
|
||||||
|
</if>
|
||||||
)t
|
)t
|
||||||
${ew.customSqlSegment}
|
${ew.customSqlSegment}
|
||||||
</select>
|
</select>
|
||||||
|
|||||||
@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
|
|||||||
import com.baomidou.mybatisplus.core.metadata.IPage;
|
import com.baomidou.mybatisplus.core.metadata.IPage;
|
||||||
import java.util.HashMap;
|
import java.util.HashMap;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
|
import java.util.Map;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @Description: 首页通知公告
|
* @Description: 首页通知公告
|
||||||
@ -50,4 +51,5 @@ public interface IProjectHomeNoticeService extends IService<ProjectHomeNotice> {
|
|||||||
*/
|
*/
|
||||||
ProjectHomeNotice queryById(String id);
|
ProjectHomeNotice queryById(String id);
|
||||||
|
|
||||||
|
void addFromFlow(Map<String, Object> param);
|
||||||
}
|
}
|
||||||
|
|||||||
@ -39,8 +39,10 @@ import java.util.stream.Collectors;
|
|||||||
*/
|
*/
|
||||||
@Service
|
@Service
|
||||||
public class DeviceUnitServiceImpl extends ServiceImpl<DeviceUnitMapper, DeviceUnit> implements IDeviceUnitService {
|
public class DeviceUnitServiceImpl extends ServiceImpl<DeviceUnitMapper, DeviceUnit> implements IDeviceUnitService {
|
||||||
|
@Lazy
|
||||||
@Autowired
|
@Autowired
|
||||||
IProjectGroupUnitService projectGroupUnitService;
|
IProjectGroupUnitService projectGroupUnitService;
|
||||||
|
@Lazy
|
||||||
@Autowired
|
@Autowired
|
||||||
private DeviceUnitMapper deviceUnitMapper;
|
private DeviceUnitMapper deviceUnitMapper;
|
||||||
@Lazy
|
@Lazy
|
||||||
@ -49,6 +51,7 @@ public class DeviceUnitServiceImpl extends ServiceImpl<DeviceUnitMapper, DeviceU
|
|||||||
@Lazy
|
@Lazy
|
||||||
@Autowired
|
@Autowired
|
||||||
private WorkerInfoServiceImpl workerInfoService;
|
private WorkerInfoServiceImpl workerInfoService;
|
||||||
|
@Lazy
|
||||||
@Autowired
|
@Autowired
|
||||||
private EnterpriseInfoServiceImpl enterpriseInfoService;
|
private EnterpriseInfoServiceImpl enterpriseInfoService;
|
||||||
|
|
||||||
|
|||||||
@ -1,9 +1,11 @@
|
|||||||
package com.zhgd.xmgl.modules.baotou.service.impl;
|
package com.zhgd.xmgl.modules.baotou.service.impl;
|
||||||
|
import java.util.Date;
|
||||||
|
|
||||||
import com.zhgd.jeecg.common.execption.OpenAlertException;
|
import com.zhgd.jeecg.common.execption.OpenAlertException;
|
||||||
import com.zhgd.xmgl.modules.baotou.entity.ProjectHomeNotice;
|
import com.zhgd.xmgl.modules.baotou.entity.ProjectHomeNotice;
|
||||||
import com.zhgd.xmgl.modules.baotou.mapper.ProjectHomeNoticeMapper;
|
import com.zhgd.xmgl.modules.baotou.mapper.ProjectHomeNoticeMapper;
|
||||||
import com.zhgd.xmgl.modules.baotou.service.IProjectHomeNoticeService;
|
import com.zhgd.xmgl.modules.baotou.service.IProjectHomeNoticeService;
|
||||||
|
import com.zhgd.xmgl.util.FlowUtil;
|
||||||
import org.springframework.stereotype.Service;
|
import org.springframework.stereotype.Service;
|
||||||
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
|
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
|
||||||
import com.baomidou.mybatisplus.core.metadata.IPage;
|
import com.baomidou.mybatisplus.core.metadata.IPage;
|
||||||
@ -13,6 +15,8 @@ import com.zhgd.xmgl.util.PageUtil;
|
|||||||
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
|
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
|
||||||
import java.util.HashMap;
|
import java.util.HashMap;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
|
import java.util.Map;
|
||||||
|
|
||||||
import com.zhgd.xmgl.util.RefUtil;
|
import com.zhgd.xmgl.util.RefUtil;
|
||||||
import org.springframework.transaction.annotation.Transactional;
|
import org.springframework.transaction.annotation.Transactional;
|
||||||
import org.springframework.beans.factory.annotation.Autowired;
|
import org.springframework.beans.factory.annotation.Autowired;
|
||||||
@ -85,4 +89,15 @@ public class ProjectHomeNoticeServiceImpl extends ServiceImpl<ProjectHomeNoticeM
|
|||||||
return entity;
|
return entity;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void addFromFlow(Map<String, Object> param) {
|
||||||
|
ProjectHomeNotice e = new ProjectHomeNotice();
|
||||||
|
e.setProjectSn(FlowUtil.getString(param,"projectSn"));
|
||||||
|
e.setWhichModule(FlowUtil.getInteger(param,"whichModule"));
|
||||||
|
e.setTitle(FlowUtil.getString(param,"title"));
|
||||||
|
e.setContent(FlowUtil.getString(param,"content"));
|
||||||
|
e.setFileUrl(FlowUtil.getString(param,"fileUrl"));
|
||||||
|
baseMapper.insert(e);
|
||||||
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
@ -6,19 +6,27 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
|
|||||||
import com.baomidou.mybatisplus.core.metadata.IPage;
|
import com.baomidou.mybatisplus.core.metadata.IPage;
|
||||||
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
||||||
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
|
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
|
||||||
|
import com.wflow.bean.vo.ModelGroupVo;
|
||||||
|
import com.wflow.service.ModelGroupService;
|
||||||
|
import com.wflow.utils.UserUtil;
|
||||||
import com.zhgd.jeecg.common.execption.OpenAlertException;
|
import com.zhgd.jeecg.common.execption.OpenAlertException;
|
||||||
import com.zhgd.jeecg.common.system.query.QueryGenerator;
|
import com.zhgd.jeecg.common.system.query.QueryGenerator;
|
||||||
import com.zhgd.xmgl.modules.baotou.entity.ProjectHomeWork;
|
import com.zhgd.xmgl.modules.baotou.entity.ProjectHomeWork;
|
||||||
import com.zhgd.xmgl.modules.baotou.mapper.ProjectHomeWorkMapper;
|
import com.zhgd.xmgl.modules.baotou.mapper.ProjectHomeWorkMapper;
|
||||||
import com.zhgd.xmgl.modules.baotou.service.IProjectHomeWorkService;
|
import com.zhgd.xmgl.modules.baotou.service.IProjectHomeWorkService;
|
||||||
|
import com.zhgd.xmgl.security.util.SecurityUtils;
|
||||||
import com.zhgd.xmgl.util.PageUtil;
|
import com.zhgd.xmgl.util.PageUtil;
|
||||||
import com.zhgd.xmgl.util.RefUtil;
|
import com.zhgd.xmgl.util.RefUtil;
|
||||||
|
import org.apache.commons.collections.MapUtils;
|
||||||
import org.springframework.beans.factory.annotation.Autowired;
|
import org.springframework.beans.factory.annotation.Autowired;
|
||||||
|
import org.springframework.context.annotation.Lazy;
|
||||||
import org.springframework.stereotype.Service;
|
import org.springframework.stereotype.Service;
|
||||||
import org.springframework.transaction.annotation.Transactional;
|
import org.springframework.transaction.annotation.Transactional;
|
||||||
|
|
||||||
import java.util.HashMap;
|
import java.util.HashMap;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
|
import java.util.Objects;
|
||||||
|
import java.util.stream.Collectors;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @Description: 首页办事指南
|
* @Description: 首页办事指南
|
||||||
@ -31,6 +39,9 @@ import java.util.List;
|
|||||||
public class ProjectHomeWorkServiceImpl extends ServiceImpl<ProjectHomeWorkMapper, ProjectHomeWork> implements IProjectHomeWorkService {
|
public class ProjectHomeWorkServiceImpl extends ServiceImpl<ProjectHomeWorkMapper, ProjectHomeWork> implements IProjectHomeWorkService {
|
||||||
@Autowired
|
@Autowired
|
||||||
private ProjectHomeWorkMapper projectHomeWorkMapper;
|
private ProjectHomeWorkMapper projectHomeWorkMapper;
|
||||||
|
@Lazy
|
||||||
|
@Autowired
|
||||||
|
private ModelGroupService modelGroupService;
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public IPage<ProjectHomeWork> queryPageList(HashMap<String, Object> param) {
|
public IPage<ProjectHomeWork> queryPageList(HashMap<String, Object> param) {
|
||||||
@ -49,6 +60,16 @@ public class ProjectHomeWorkServiceImpl extends ServiceImpl<ProjectHomeWorkMappe
|
|||||||
|
|
||||||
private QueryWrapper<ProjectHomeWork> getQueryWrapper(HashMap<String, Object> param) {
|
private QueryWrapper<ProjectHomeWork> getQueryWrapper(HashMap<String, Object> param) {
|
||||||
QueryWrapper<ProjectHomeWork> queryWrapper = QueryGenerator.initPageQueryWrapper(ProjectHomeWork.class, param, true);
|
QueryWrapper<ProjectHomeWork> queryWrapper = QueryGenerator.initPageQueryWrapper(ProjectHomeWork.class, param, true);
|
||||||
|
Integer seeI = MapUtils.getInteger(param, "seeI");
|
||||||
|
if (Objects.equals(seeI, 1)) {
|
||||||
|
Integer accountType = SecurityUtils.getUser().getAccountType();
|
||||||
|
param.put("accountType", accountType);
|
||||||
|
if (accountType == 6) {
|
||||||
|
List<ModelGroupVo> groupModels = modelGroupService.getGroupModels(UserUtil.getLoginUserId(), null);
|
||||||
|
List<String> formNameList = groupModels.stream().flatMap(o -> o.getItems().stream()).map(o -> o.getFormName()).collect(Collectors.toList());
|
||||||
|
param.put("formNameList", formNameList);
|
||||||
|
}
|
||||||
|
}
|
||||||
queryWrapper.orderByAsc(RefUtil.fieldNameUlc(ProjectHomeWork::getSort));
|
queryWrapper.orderByAsc(RefUtil.fieldNameUlc(ProjectHomeWork::getSort));
|
||||||
return queryWrapper;
|
return queryWrapper;
|
||||||
}
|
}
|
||||||
|
|||||||
@ -52,10 +52,13 @@ public class NoticeServiceImpl extends ServiceImpl<NoticeMapper, Notice> impleme
|
|||||||
@Lazy
|
@Lazy
|
||||||
@Autowired
|
@Autowired
|
||||||
SystemUserServiceImpl systemUserService;
|
SystemUserServiceImpl systemUserService;
|
||||||
|
@Lazy
|
||||||
@Autowired
|
@Autowired
|
||||||
private NoticeMapper noticeMapper;
|
private NoticeMapper noticeMapper;
|
||||||
|
@Lazy
|
||||||
@Autowired
|
@Autowired
|
||||||
private IMqttSender mqttPushClient;
|
private IMqttSender mqttPushClient;
|
||||||
|
@Lazy
|
||||||
@Autowired
|
@Autowired
|
||||||
private SystemUserMapper systemUserMapper;
|
private SystemUserMapper systemUserMapper;
|
||||||
@Value("${mqtt-scope}")
|
@Value("${mqtt-scope}")
|
||||||
@ -63,6 +66,7 @@ public class NoticeServiceImpl extends ServiceImpl<NoticeMapper, Notice> impleme
|
|||||||
@Lazy
|
@Lazy
|
||||||
@Autowired
|
@Autowired
|
||||||
private UniPushService uniPushService;
|
private UniPushService uniPushService;
|
||||||
|
@Lazy
|
||||||
@Autowired
|
@Autowired
|
||||||
private IDeviceUnitService deviceUnitService;
|
private IDeviceUnitService deviceUnitService;
|
||||||
|
|
||||||
|
|||||||
@ -80,6 +80,7 @@ public class WebSecurityConfig extends WebSecurityConfigurerAdapter {
|
|||||||
|
|
||||||
http.authorizeRequests()
|
http.authorizeRequests()
|
||||||
//请求路径允许访问
|
//请求路径允许访问
|
||||||
|
.antMatchers("/xmgl/projectHomeNotice/flow/add").permitAll()
|
||||||
.antMatchers("/xmgl/promotionalVideo/flow/add").permitAll()
|
.antMatchers("/xmgl/promotionalVideo/flow/add").permitAll()
|
||||||
.antMatchers("/xmgl/partyBuildingGuidance/flow/add").permitAll()
|
.antMatchers("/xmgl/partyBuildingGuidance/flow/add").permitAll()
|
||||||
.antMatchers("/xmgl/projectEnterprise/flow/check/param").permitAll()
|
.antMatchers("/xmgl/projectEnterprise/flow/check/param").permitAll()
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user