suzhou-jichuang-lanhai
/
taicangzongzhi-java
10
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

工作动态list修改，大屏数据来源接口修改

Browse Source
dongdingding
董丁丁 2 years ago
parent 3189f7c161
commit 45dc861045
7 changed files with 34 additions and 24 deletions
Show Stats Download Patch File Download Diff File

1
ruoyi-admin/src/main/java/com/ruoyi/screen/controller/ZongzhiScreenOpinionController.java
Unescape View File

@ -10,7 +10,6 @@ import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
import javax.validation.Valid;
import java.util.ArrayList;
import java.util.List;
/**

1
ruoyi-admin/src/main/java/com/ruoyi/screen/controller/ZongzhiScreenSaftyController.java
Unescape View File

@ -5,7 +5,6 @@ import com.ruoyi.screen.domain.response.*;
import com.ruoyi.screen.service.ZongzhiScreenSaftyService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;

6
ruoyi-admin/src/main/java/com/ruoyi/screen/domain/response/ZongzhiSourceResponse.java
Unescape View File

@ -19,8 +19,10 @@ public class ZongzhiSourceResponse {
/**
* 类型 1.云断监管 2：APT（M） 3.硬探针 4.软探针 5.系统检测
* 类型 1.云断监管 2：APT（M） 3.硬探针 4.软探针 5.监管单位
* 6.网站监测
* 7.系统监测
*/
@ApiModelProperty(value = "类型 1.云断监管 2：APT（M） 3.硬探针 4.软探针 5.系统检测")
@ApiModelProperty(value = "类型 1.云断监管 2：APT（M） 3.硬探针 4.软探针 5.监管单位 6.网站监测 7.系统监测")
private int type;
}

30
ruoyi-admin/src/main/java/com/ruoyi/zongzhi/controller/TcWorkDongtaiController.java
Unescape View File

@ -1,27 +1,17 @@
package com.ruoyi.zongzhi.controller;
import java.util.List;
import javax.servlet.http.HttpServletResponse;
import io.swagger.annotations.Api;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.PutMapping;
import org.springframework.web.bind.annotation.DeleteMapping;
import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.common.enums.BusinessType;
import com.ruoyi.common.core.page.TableDataInfo;
import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.zongzhi.domain.TcWorkDongtai;
import com.ruoyi.zongzhi.service.ITcWorkDongtaiService;
import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.common.core.page.TableDataInfo;
import io.swagger.annotations.Api;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import javax.servlet.http.HttpServletResponse;
import java.util.List;
/**
* 工作动态Controller
@ -100,4 +90,8 @@ public class TcWorkDongtaiController extends BaseController
{
return toAjax(tcWorkDongtaiService.deleteTcWorkDongtaiByIds(ids));
}
}

2
ruoyi-admin/src/main/java/com/ruoyi/zongzhi/domain/TcDataSource.java
Unescape View File

@ -36,7 +36,7 @@ public class TcDataSource extends BaseEntity {
* 4. 软探针
* 5. 系统检测
*/
@ApiModelProperty(value = "1.云断监管 2.APT")
@ApiModelProperty(value = "类型 1.云断监管 2：APT（M） 3.硬探针 4.软探针 5.监管单位 6.网站监测 7.系统监测")
@Excel(name = "类型")
private Long type;

11
ruoyi-admin/src/main/java/com/ruoyi/zongzhi/domain/TcWorkDongtai.java
Unescape View File

@ -46,6 +46,14 @@ public class TcWorkDongtai extends BaseEntity {
@ApiModelProperty(value = "材料名称")
private String materialsName;
/**
* 动态名称
*/
@Excel(name = "动态名称")
@ApiModelProperty(value = "动态名称")
private String name;
/**
* 发布时间
*/
@ -81,4 +89,7 @@ public class TcWorkDongtai extends BaseEntity {
@ApiModelProperty(value = "修改人ID")
private Long updateId;
}

7
ruoyi-system/src/main/resources/mapper/zongzhi/TcWorkDongtaiMapper.xml
Unescape View File

@ -8,6 +8,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<result property="id" column="id" />
<result property="areaId" column="area_id" />
<result property="type" column="type" />
<result property="name" column="name" />
<result property="materialsName" column="materials_name" />
<result property="fabuTime" column="fabu_time" />
<result property="materialsFileName" column="materials_file_name" />
@ -22,7 +23,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</resultMap>
<sql id="selectTcWorkDongtaiVo">
select id, area_id, type, materials_name, fabu_time, materials_file_name, materials_file_url, create_id, create_by, create_time, update_id, update_by, update_time, remark from tc_work_dongtai
select id, area_id, type, materials_name, name,fabu_time, materials_file_name, materials_file_url, create_id, create_by, create_time, update_id, update_by, update_time, remark from tc_work_dongtai
</sql>
<select id="selectTcWorkDongtaiList" parameterType="TcWorkDongtai" resultMap="TcWorkDongtaiResult">
@ -30,6 +31,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<where>
<if test="areaId != null "> and area_id = #{areaId}</if>
<if test="type != null and type != ''"> and type = #{type}</if>
<if test="name != null and name != ''"> and name = #{name}</if>
<if test="materialsName != null and materialsName != ''"> and materials_name like concat('%', #{materialsName}, '%')</if>
<if test="fabuTime != null "> and fabu_time = #{fabuTime}</if>
<if test="materialsFileName != null and materialsFileName != ''"> and materials_file_name like concat('%', #{materialsFileName}, '%')</if>
@ -50,6 +52,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="id != null">id,</if>
<if test="areaId != null">area_id,</if>
<if test="type != null">type,</if>
<if test="name != null">name,</if>
<if test="materialsName != null">materials_name,</if>
<if test="fabuTime != null">fabu_time,</if>
<if test="materialsFileName != null">materials_file_name,</if>
@ -66,6 +69,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="id != null">#{id},</if>
<if test="areaId != null">#{areaId},</if>
<if test="type != null">#{type},</if>
<if test="name != null">#{name},</if>
<if test="materialsName != null">#{materialsName},</if>
<if test="fabuTime != null">#{fabuTime},</if>
<if test="materialsFileName != null">#{materialsFileName},</if>
@ -85,6 +89,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<trim prefix="SET" suffixOverrides=",">
<if test="areaId != null">area_id = #{areaId},</if>
<if test="type != null">type = #{type},</if>
<if test="name != null">name = #{name},</if>
<if test="materialsName != null">materials_name = #{materialsName},</if>
<if test="fabuTime != null">fabu_time = #{fabuTime},</if>
<if test="materialsFileName != null">materials_file_name = #{materialsFileName},</if>

Write Preview
Loading…
Cancel
Save