添加资产编号

pcbms/src/main/java/com/hssx/pcbms/controller/InstitutionController.java

@@ -0,0 +1,71 @@
+package com.hssx.pcbms.controller;
+
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.github.pagehelper.PageHelper;
+import com.github.pagehelper.PageInfo;
+import com.hssx.pcbms.entity.Goods;
+import com.hssx.pcbms.entity.IdeaComment;
+import com.hssx.pcbms.entity.Institution;
+import com.hssx.pcbms.entity.vo.InstitutionVO;
+import com.hssx.pcbms.mapper.InstitutionMapper;
+import com.hssx.pcbms.service.InstitutionService;
+import com.hssx.pcbms.util.HttpRespMsg;
+import com.hssx.pcbms.util.PageUtil;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.ResponseBody;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.List;
+
+/**
+ * <p>
+ *  前端控制器
+ * </p>
+ *
+ * @author 吴涛涛
+ * @since 2019-11-05
+ */
+@Controller
+@RequestMapping("/institution")
+public class InstitutionController {
+    @Autowired
+    private InstitutionService institutionService;
+
+    /**
+     * 制度标题列表
+     * 参数：pageNum:当前页，pageSize：每页多少条
+     * @return
+     */
+    @ApiOperation(value = "制度标题列表", notes = "制度标题列表")
+    @RequestMapping("/list")
+    @ResponseBody
+    public HttpRespMsg list(PageUtil page) {
+        HttpRespMsg msg = new HttpRespMsg();
+        PageHelper.startPage(page.getPageNum(),page.getPageSize());
+        List<Institution> institutions = institutionService.list(new QueryWrapper<Institution>().select("id,title"));
+        PageInfo<Institution> info = new PageInfo<>(institutions);
+        msg.data = info;
+        return msg;
+    }
+    /**
+     * 制度标题列表
+     * 参数：id:制度id
+     * @return
+     */
+    @ApiOperation(value = "制度标题列表", notes = "制度标题列表")
+    @RequestMapping("/detail")
+    @ResponseBody
+    public HttpRespMsg detail(Institution institution) {
+        HttpRespMsg msg = new HttpRespMsg();
+        msg = institutionService.getDetail(institution);
+        return msg;
+    }
+
+}
+

pcbms/src/main/java/com/hssx/pcbms/entity/Institution.java

@@ -0,0 +1,96 @@
+package com.hssx.pcbms.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+import com.baomidou.mybatisplus.annotation.TableId;
+import java.time.LocalDateTime;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.fasterxml.jackson.annotation.JsonFormat;
+
+import java.io.Serializable;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author 吴涛涛
+ * @since 2019-11-05
+ */
+public class Institution extends Model<Institution> {
+
+    private static final long serialVersionUID=1L;
+
+    /**
+     * 制度表主键
+     */
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+    /**
+     * 制度的标题
+     */
+    @TableField("title")
+    private String title;
+
+    /**
+     * 制度的内容
+     */
+    @TableField("content")
+    private String content;
+
+    /**
+     * 创建日期
+     */
+    @TableField("indate")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    private LocalDateTime indate;
+
+
+    public Integer getId() {
+        return id;
+    }
+
+    public void setId(Integer id) {
+        this.id = id;
+    }
+
+    public String getTitle() {
+        return title;
+    }
+
+    public void setTitle(String title) {
+        this.title = title;
+    }
+
+    public String getContent() {
+        return content;
+    }
+
+    public void setContent(String content) {
+        this.content = content;
+    }
+
+    public LocalDateTime getIndate() {
+        return indate;
+    }
+
+    public void setIndate(LocalDateTime indate) {
+        this.indate = indate;
+    }
+
+    @Override
+    protected Serializable pkVal() {
+        return this.id;
+    }
+
+    @Override
+    public String toString() {
+        return "Institution{" +
+        "id=" + id +
+        ", title=" + title +
+        ", content=" + content +
+        ", indate=" + indate +
+        "}";
+    }
+}

pcbms/src/main/java/com/hssx/pcbms/entity/InstitutionFile.java

@@ -0,0 +1,108 @@
+package com.hssx.pcbms.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+import com.baomidou.mybatisplus.annotation.TableId;
+import java.time.LocalDateTime;
+import com.baomidou.mybatisplus.annotation.TableField;
+import java.io.Serializable;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author 吴涛涛
+ * @since 2019-11-05
+ */
+public class InstitutionFile extends Model<InstitutionFile> {
+
+    private static final long serialVersionUID=1L;
+
+    /**
+     * 制度文件表的主键
+     */
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+    /**
+     * 制度表外键 标识是哪项制度的文件
+     */
+    @TableField("institution_id")
+    private Integer institutionId;
+
+    /**
+     * 制度文件的名字
+     */
+    @TableField("name")
+    private String name;
+
+    /**
+     * 制度文件保存的地址
+     */
+    @TableField("url")
+    private String url;
+
+    /**
+     * 制度文件保存的日期
+     */
+    @TableField("indate")
+    private LocalDateTime indate;
+
+
+    public Integer getId() {
+        return id;
+    }
+
+    public void setId(Integer id) {
+        this.id = id;
+    }
+
+    public Integer getInstitutionId() {
+        return institutionId;
+    }
+
+    public void setInstitutionId(Integer institutionId) {
+        this.institutionId = institutionId;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public String getUrl() {
+        return url;
+    }
+
+    public void setUrl(String url) {
+        this.url = url;
+    }
+
+    public LocalDateTime getIndate() {
+        return indate;
+    }
+
+    public void setIndate(LocalDateTime indate) {
+        this.indate = indate;
+    }
+
+    @Override
+    protected Serializable pkVal() {
+        return this.id;
+    }
+
+    @Override
+    public String toString() {
+        return "InstitutionFile{" +
+        "id=" + id +
+        ", institutionId=" + institutionId +
+        ", name=" + name +
+        ", url=" + url +
+        ", indate=" + indate +
+        "}";
+    }
+}

pcbms/src/main/java/com/hssx/pcbms/entity/vo/InstitutionVO.java

@@ -0,0 +1,18 @@
+package com.hssx.pcbms.entity.vo;
+
+import com.hssx.pcbms.entity.Institution;
+import com.hssx.pcbms.entity.InstitutionFile;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * Author: 吴涛涛 cuiyi@itany.com
+ * Date : 2019 - 11 - 05 14:01
+ * Description:<描述>
+ * Version: 1.0
+ */
+@Data
+public class InstitutionVO extends Institution {
+    private List<InstitutionFile> institutionFiles;
+}

pcbms/src/main/java/com/hssx/pcbms/mapper/InstitutionFileMapper.java

@@ -0,0 +1,16 @@
+package com.hssx.pcbms.mapper;
+
+import com.hssx.pcbms.entity.InstitutionFile;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author 吴涛涛
+ * @since 2019-11-05
+ */
+public interface InstitutionFileMapper extends BaseMapper<InstitutionFile> {
+
+}

pcbms/src/main/java/com/hssx/pcbms/mapper/InstitutionMapper.java

@@ -0,0 +1,20 @@
+package com.hssx.pcbms.mapper;
+
+import com.hssx.pcbms.entity.Institution;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.hssx.pcbms.entity.vo.InstitutionVO;
+import com.hssx.pcbms.util.HttpRespMsg;
+import org.apache.ibatis.annotations.Param;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author 吴涛涛
+ * @since 2019-11-05
+ */
+public interface InstitutionMapper extends BaseMapper<Institution> {
+
+    InstitutionVO getDetail(@Param("institution") Institution institution);
+}

pcbms/src/main/java/com/hssx/pcbms/service/InstitutionFileService.java

@@ -0,0 +1,16 @@
+package com.hssx.pcbms.service;
+
+import com.hssx.pcbms.entity.InstitutionFile;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ *  服务类
+ * </p>
+ *
+ * @author 吴涛涛
+ * @since 2019-11-05
+ */
+public interface InstitutionFileService extends IService<InstitutionFile> {
+
+}

pcbms/src/main/java/com/hssx/pcbms/service/InstitutionService.java

@@ -0,0 +1,18 @@
+package com.hssx.pcbms.service;
+
+import com.hssx.pcbms.entity.Institution;
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.hssx.pcbms.util.HttpRespMsg;
+
+/**
+ * <p>
+ *  服务类
+ * </p>
+ *
+ * @author 吴涛涛
+ * @since 2019-11-05
+ */
+public interface InstitutionService extends IService<Institution> {
+
+    HttpRespMsg getDetail(Institution institution);
+}

pcbms/src/main/java/com/hssx/pcbms/service/impl/InstitutionFileServiceImpl.java

@@ -0,0 +1,20 @@
+package com.hssx.pcbms.service.impl;
+
+import com.hssx.pcbms.entity.InstitutionFile;
+import com.hssx.pcbms.mapper.InstitutionFileMapper;
+import com.hssx.pcbms.service.InstitutionFileService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ *  服务实现类
+ * </p>
+ *
+ * @author 吴涛涛
+ * @since 2019-11-05
+ */
+@Service
+public class InstitutionFileServiceImpl extends ServiceImpl<InstitutionFileMapper, InstitutionFile> implements InstitutionFileService {
+
+}

pcbms/src/main/java/com/hssx/pcbms/service/impl/InstitutionServiceImpl.java

@@ -0,0 +1,32 @@
+package com.hssx.pcbms.service.impl;
+
+import com.hssx.pcbms.entity.Institution;
+import com.hssx.pcbms.entity.vo.InstitutionVO;
+import com.hssx.pcbms.mapper.InstitutionMapper;
+import com.hssx.pcbms.service.InstitutionService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.hssx.pcbms.util.HttpRespMsg;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+
+/**
+ * <p>
+ *  服务实现类
+ * </p>
+ *
+ * @author 吴涛涛
+ * @since 2019-11-05
+ */
+@Service
+public class InstitutionServiceImpl extends ServiceImpl<InstitutionMapper, Institution> implements InstitutionService {
+    @Resource
+    private InstitutionMapper institutionMapper;
+    @Override
+    public HttpRespMsg getDetail(Institution institution) {
+        HttpRespMsg msg = new HttpRespMsg();
+        InstitutionVO detail = institutionMapper.getDetail(institution);
+        msg.data = detail;
+        return msg;
+    }
+}

pcbms/src/main/java/com/hssx/pcbms/util/CodeGenerator.java

@@ -204,7 +204,7 @@ public class CodeGenerator {
         //若想要生成的实体类继承某个Controller，则可打开下面注释。写上需要继承的Controller的位置即可
 //        strategy.setSuperControllerClass("com.baomidou.ant.common.BaseController");
         //此处user是表名，多个英文逗号分割
-        strategy.setInclude("maintain_record");
+        strategy.setInclude("institution_file");
 //        strategy.setExclude();//数据库表全生成
 //        strategy.setInclude(scanner("user").split(","));//表名，多个英文逗号分割
         strategy.setControllerMappingHyphenStyle(true);

pcbms/src/main/resources/mapper/InstitutionFileMapper.xml

@@ -0,0 +1,19 @@
+<?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.hssx.pcbms.mapper.InstitutionFileMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.hssx.pcbms.entity.InstitutionFile">
+        <id column="id" property="id" />
+        <result column="institution_id" property="institutionId" />
+        <result column="name" property="name" />
+        <result column="url" property="url" />
+        <result column="indate" property="indate" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, institution_id, name, url, indate
+    </sql>
+
+</mapper>

pcbms/src/main/resources/mapper/InstitutionMapper.xml

@@ -0,0 +1,35 @@
+<?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.hssx.pcbms.mapper.InstitutionMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.hssx.pcbms.entity.Institution">
+        <id column="id" property="id" />
+        <result column="title" property="title" />
+        <result column="content" property="content" />
+        <result column="indate" property="indate" />
+    </resultMap>
+    <resultMap id="BaseResultMapVO" type="com.hssx.pcbms.entity.vo.InstitutionVO">
+        <id column="id" property="id" />
+        <result column="title" property="title" />
+        <result column="content" property="content" />
+        <result column="indate" property="indate" />
+        <collection property="institutionFiles" ofType="com.hssx.pcbms.entity.InstitutionFile">
+            <result column="name" property="name" />
+            <result column="url" property="url" />
+        </collection>
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, title, content, indate
+    </sql>
+
+    <select id="getDetail" resultMap="BaseResultMapVO">
+        select i.id, i.title, i.content, i.indate,isf.name,isf.url
+            from institution i
+            left join institution_file isf
+            on i.id = isf.institution_id
+            where i.id = #{institution.id}
+    </select>
+</mapper>