bonus
/
gz_digital_signage
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

This commit is contained in:
lSun 2025-04-25 10:58:09 +08:00
parent 3a9b4bd239 b53444e71e
commit 8430d69fa1
6 changed files with 99 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
src/main/java/com/bonus/digitalSignage/basic/controller/TbProjectController.java
View File

@ -6,6 +6,7 @@ import com.bonus.digitalSignage.backstage.entity.dto.QueryParamDto;
import com.bonus.digitalSignage.basic.service.TbProjectService;
import com.bonus.digitalSignage.basic.vo.TbProjectVo;
import com.bonus.digitalSignage.system.vo.EncryptedReq;
import com.bonus.digitalSignage.utils.ExcelUtil;
import com.bonus.digitalSignage.utils.ServerResponse;
import com.github.pagehelper.PageHelper;
import io.swagger.annotations.ApiOperation;
@ -16,6 +17,8 @@ import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import javax.annotation.Resource;
import javax.servlet.http.HttpServletResponse;
import java.util.List;
/**
* @author 马三炮
@ -71,12 +74,37 @@ public class TbProjectController {
* @param dto
* @return
*/
@PostMapping(value = "UpdateTbProject")
@PostMapping(value = "updateTbProject")
@DecryptAndVerify(decryptedClass = TbProjectVo.class)//加解密统一管理
@LogAnnotation(operModul = "基础管理-线路工程管理", operation = "修改", operDesc = "系统级事件",operType="查询")
public ServerResponse UpdateTbProject(EncryptedReq<TbProjectVo> dto) {
return tbProjectService.UpdateTbProject(dto.getData());
public ServerResponse updateTbProject(EncryptedReq<TbProjectVo> dto) {
return tbProjectService.updateTbProject(dto.getData());
}
/**
* 线路工程管理-删除
* @param dto
* @return
*/
@PostMapping(value = "delTbProject")
@DecryptAndVerify(decryptedClass = TbProjectVo.class)//加解密统一管理
@LogAnnotation(operModul = "基础管理-线路工程管理", operation = "修改", operDesc = "系统级事件",operType="查询")
public ServerResponse delTbProject(EncryptedReq<TbProjectVo> dto) {
return tbProjectService.delTbProject(dto.getData());
}
/**
*线路工程管理导出
* @param data
* @return
*/
@PostMapping(value = "/tbProjectExport")
@DecryptAndVerify(decryptedClass = TbProjectVo.class)
@LogAnnotation(operModul = "线路工程管理-导出", operation = "导出", operDesc = "系统级事件",operType="导出")
public void tbProjectExport(HttpServletResponse response, EncryptedReq<TbProjectVo> data) {
List<TbProjectVo> safetyMeasuresList = tbProjectService.tbProjectExport(data.getData());
ExcelUtil<TbProjectVo> util = new ExcelUtil<TbProjectVo>(TbProjectVo.class);
util.exportExcel(response, safetyMeasuresList, "线路工程管理");
}
}

4
src/main/java/com/bonus/digitalSignage/basic/dao/TbProjectMapper.java
View File

@ -9,9 +9,11 @@ public interface TbProjectMapper {
TbProjectVo getTbProjectById(TbProjectVo data);
void UpdateTbProject(TbProjectVo data);
void updateTbProject(TbProjectVo data);
void addTbProject(TbProjectVo data);
TbProjectVo getTbProjectByProName(TbProjectVo data);
void delTbProject(TbProjectVo data);
}

19
src/main/java/com/bonus/digitalSignage/basic/service/TbProjectService.java
View File

@ -3,6 +3,8 @@ package com.bonus.digitalSignage.basic.service;
import com.bonus.digitalSignage.basic.vo.TbProjectVo;
import com.bonus.digitalSignage.utils.ServerResponse;
import java.util.List;
public interface TbProjectService {
/**
* 线路工程管理-查询列表
@ -23,7 +25,7 @@ public interface TbProjectService {
* @param data
* @return
*/
ServerResponse UpdateTbProject(TbProjectVo data);
ServerResponse updateTbProject(TbProjectVo data);
/**
* 线路工程管理-新增
@ -31,4 +33,19 @@ public interface TbProjectService {
* @return
*/
ServerResponse addTbProject(TbProjectVo data);
/**
* 线路工程管理-删除
* @param data
* @return
*/
ServerResponse delTbProject(TbProjectVo data);
/**
*线路工程管理导出
* @param data
* @return
*/
List<TbProjectVo> tbProjectExport(TbProjectVo data);
}

43
src/main/java/com/bonus/digitalSignage/basic/service/impl/TbProjectServiceImpl.java
View File

@ -41,7 +41,7 @@ public class TbProjectServiceImpl implements TbProjectService {
return ServerResponse.createSuccessPage(pageInfo, data.getPageNum(), data.getPageSize());
} catch (Exception e) {
log.error(e.toString(), e);
return ServerResponse.createErroe("查询列表失败");
return ServerResponse.createErroe("线路工程管理-查询列表失败");
}
}
@ -58,7 +58,7 @@ public class TbProjectServiceImpl implements TbProjectService {
return ServerResponse.createSuccess(tbProject);
} catch (Exception e) {
log.error(e.toString(), e);
return ServerResponse.createErroe("查询详情失败");
return ServerResponse.createErroe("线路工程管理-查询详情失败");
}
}
@ -69,7 +69,7 @@ public class TbProjectServiceImpl implements TbProjectService {
* @return
*/
@Override
public ServerResponse UpdateTbProject(TbProjectVo data) {
public ServerResponse updateTbProject(TbProjectVo data) {
try {
TbProjectVo tbProjectVo = tbProjectMapper.getTbProjectByProName(data);
if (StringUtils.isNotNull(tbProjectVo) && data.getId()!=tbProjectVo.getId()){
@ -77,11 +77,11 @@ public class TbProjectServiceImpl implements TbProjectService {
}
Long userId = UserUtil.getLoginUser().getId();
data.setUpdateUserId(userId);
tbProjectMapper.UpdateTbProject(data);
return ServerResponse.createSuccess("修改成功");
tbProjectMapper.updateTbProject(data);
return ServerResponse.createSuccess("线路工程管理-修改成功");
} catch (Exception e) {
log.error(e.toString(), e);
return ServerResponse.createErroe("修改失败");
return ServerResponse.createErroe("线路工程管理-修改失败");
}
}
@ -101,10 +101,37 @@ public class TbProjectServiceImpl implements TbProjectService {
data.setCreateUserId(userId);
data.setCreateTime(new Date());
tbProjectMapper.addTbProject(data);
return ServerResponse.createSuccess();
return ServerResponse.createSuccess("线路工程管理-新增成功");
} catch (Exception e) {
log.error(e.toString(), e);
return ServerResponse.createErroe("新增失败");
return ServerResponse.createErroe("线路工程管理-新增失败");
}
}
/**
* 线路工程管理-删除
* @param data
* @return
*/
@Override
public ServerResponse delTbProject(TbProjectVo data) {
try {
tbProjectMapper.delTbProject(data);
return ServerResponse.createSuccess("线路工程管理-删除成功");
} catch (Exception e) {
log.error(e.toString(), e);
return ServerResponse.createErroe("线路工程管理-删除失败");
}
}
/**
*线路工程管理导出
* @param data
* @return
*/
@Override
public List<TbProjectVo> tbProjectExport(TbProjectVo data) {
List<TbProjectVo> tbProjectVoList = tbProjectMapper.getTbProjectList(data);
return tbProjectVoList;
}
}

5
src/main/java/com/bonus/digitalSignage/basic/vo/TbProjectVo.java
View File

@ -21,6 +21,11 @@ public class TbProjectVo {
*/
private Long departId;
/**
* 项目部名称
*/
private Long departName;
/**
* 工程名称
*/

9
src/main/resources/mappers/basic/TbProjectMapper.xml
View File

@ -35,7 +35,7 @@
1
</trim>
</insert>
<update id="UpdateTbProject">
<update id="updateTbProject">
update tb_project
<trim prefix="SET" suffixOverrides=",">
<if test="departId != null">depart_id = #{departId},</if>
@ -53,12 +53,17 @@
</trim>
where id = #{id}
</update>
<delete id="delTbProject">
update tb_project set is_active = '0' where id = #{id}
</delete>
<select id="getTbProjectList" resultType="com.bonus.digitalSignage.basic.vo.TbProjectVo">
select tp.id as id,tp.pro_name as proName,A.dict_name as voltageLevel,tp.line_length as lineLength,
select tp.id as id,tp.depart_id as departId,td.depart_name as departName,tp.pro_name as proName,
A.dict_name as voltageLevel,tp.line_length as lineLength,
tp.plan_start_time as planStartTime,tp.plan_end_time as planEndTime,tp.lon as lon,tp.lat as lat,
tp.address as address,B.dict_name as pro_status
from tb_project tp
left join tb_depart td on tp.depart_id = td.id
LEFT JOIN (
SELECT sd.dict_value,sd.dict_name
FROM sys_distinct sd