文物模块， 新增qrCode字段，

zhoushan-system-api/src/main/java/com/fdage/controller/CollectionController.java

@@ -97,20 +97,6 @@ public class CollectionController {
     @ResponseBody
     @WebControllerLog(description = "文物库-修改文物")
     @ApiOperation("修改文物")
-//    @ApiImplicitParams({
-//            @ApiImplicitParam(name = "id", value = "文物id", dataType = "String"),
-//            @ApiImplicitParam(name = "name", value = "文物名称", dataType = "String"),
-//            @ApiImplicitParam(name = "description", value = "文物描述", dataType = "String"),
-//            @ApiImplicitParam(name = "timeId", value = "年代id", dataType = "String"),
-//            @ApiImplicitParam(name = "typeId", value = "类型id", dataType = "String"),
-//            @ApiImplicitParam(name = "modelUrl", value = "文物模型url", dataType = "String"),
-//            @ApiImplicitParam(name = "discoveryTime", value = "文物发现时间", dataType = "String"),
-//            @ApiImplicitParam(name = "repairTime", value = "文物维修时间", dataType = "String"),
-//            @ApiImplicitParam(name = "venue", value = "文物所在场馆", dataType = "String"),
-//            @ApiImplicitParam(name = "contentUrl", value = "多媒体内容Url", dataType = "String"),
-//            @ApiImplicitParam(name = "pic", value = "4dmodel文物的封面图", dataType = "String"),
-//            @ApiImplicitParam(name = "num", value = "藏品编号", dataType = "String"),
-//            @ApiImplicitParam(name = "state", value = "状态,0：展示，1：隐藏", dataType = "String")})
     public AjaxJson updateCollection(@RequestBody RequestCollection bo){
         if(bo == null || StringUtils.isEmpty(bo.getName()) ||
                 bo.getTimeId() == null  || bo.getTypeId() == null ){
@@ -119,26 +105,11 @@ public class CollectionController {
 
         TbCollection collection = new TbCollection();
         BeanUtils.copyProperties(bo, collection);
-//        collection.setTypeImages(convertTypeImages(bo.getTypeImages()));
         service.update(collection);
         return AjaxJson.success();
     }
 
-    // 将数组转字符串
-//    private String convertTypeImages(List<String> param){
-//        StringBuilder buffer = new StringBuilder();
-//        int size = param.size();
-//        int flag = 0;
-//        for (String s : param) {
-//            flag ++;
-//            buffer.append(s);
-//            if (size != flag) {
-//                buffer.append(",");
-//            }
-//        }
-//        return buffer.toString();
-//
-//    }
+
 
     @PostMapping("deleteCollection")
     @ResponseBody

zhoushan-system-common/src/main/java/com/fdage/request/RequestCollection.java

@@ -56,4 +56,7 @@ public class RequestCollection extends RequestBase{
 
     @ApiModelProperty(value = "轮播板式")
     private String urlList;
+
+    @ApiModelProperty(value = "二维码")
+    private String qrCode;
 }

zhoushan-system-common/src/main/java/com/fdage/respon/ResponCollection.java

@@ -68,4 +68,7 @@ public class ResponCollection {
 
     @ApiModelProperty(value = "轮播板式")
     private String urlList;
+
+    @ApiModelProperty(value = "二维码")
+    private String qrCode;
 }

zhoushan-system-dao/src/main/java/com/fdage/dao/base/TbCollectionMapper.java

@@ -13,7 +13,7 @@ public interface TbCollectionMapper {
 
     int updateByPrimaryKeySelective(TbCollection record);
 
-    int updateByPrimaryKeyWithBLOBs(TbCollection record);
+//    int updateByPrimaryKeyWithBLOBs(TbCollection record);
 
     int updateByPrimaryKey(TbCollection record);
 

zhoushan-system-dao/src/main/java/com/fdage/pojo/TbCollection.java

@@ -68,211 +68,8 @@ public class TbCollection {
     @ApiModelProperty(value = "轮播板式", notes = "数组转字符串存储")
     private String urlList;
 
-//    public String getTypeImages() {
-//        return typeImages;
-//    }
-
-//    public void setTypeImages(String typeImages) {
-//        this.typeImages = typeImages;
-//    }
-//
-//
-//
-//
-//
-//
-//
-//    public String getType() {
-//        return type;
-//    }
-//
-//    public void setType(String type) {
-//        this.type = type;
-//    }
-//
-//
-//
-//    public String getVisit() {
-//        return visit;
-//    }
-//
-//    public void setVisit(String visit) {
-//        this.visit = visit;
-//    }
-//
-//    public String getIcon() {
-//        return icon;
-//    }
-//
-//    public void setIcon(String icon) {
-//        this.icon = icon;
-//    }
-//
-//    public String getDirCode() {
-//        return dirCode;
-//    }
-//
-//    public void setDirCode(String dirCode) {
-//        this.dirCode = dirCode;
-//    }
-//
-//    public Integer getDownloadNum() {
-//        return downloadNum;
-//    }
-//
-//    public void setDownloadNum(Integer downloadNum) {
-//        this.downloadNum = downloadNum;
-//    }
-//
-//    public Integer getLikeNum() {
-//        return likeNum;
-//    }
-//
-//    public void setLikeNum(Integer likeNum) {
-//        this.likeNum = likeNum;
-//    }
-//
-//    public Integer getOpenNum() {
-//        return openNum;
-//    }
-//
-//    public void setOpenNum(Integer openNum) {
-//        this.openNum = openNum;
-//    }
-//
-//    public Integer getSearchNum() {
-//        return searchNum;
-//    }
-//
-//    public void setSearchNum(Integer searchNum) {
-//        this.searchNum = searchNum;
-//    }
-//
-//    public String getUnityUrl() {
-//        return unityUrl;
-//    }
-//
-//    public void setUnityUrl(String unityUrl) {
-//        this.unityUrl = unityUrl;
-//    }
-//
-//    public String getUnityPic() {
-//        return unityPic;
-//    }
-//
-//    public void setUnityPic(String unityPic) {
-//        this.unityPic = unityPic;
-//    }
-//
-//    public String getNum() {
-//        return num;
-//    }
-//
-//    public void setNum(String num) {
-//        this.num = num;
-//    }
-//
-//    public Long getId() {
-//        return id;
-//    }
-//
-//    public void setId(Long id) {
-//        this.id = id;
-//    }
-//
-//    public String getName() {
-//        return name;
-//    }
-//
-//    public void setName(String name) {
-//        this.name = name == null ? null : name.trim();
-//    }
-//
-//    public Long getTypeId() {
-//        return typeId;
-//    }
-//
-//    public void setTypeId(Long typeId) {
-//        this.typeId = typeId;
-//    }
-//
-//    public Long getTimeId() {
-//        return timeId;
-//    }
-//
-//    public void setTimeId(Long timeId) {
-//        this.timeId = timeId;
-//    }
-//
-//    public Date getDiscoveryTime() {
-//        return discoveryTime;
-//    }
-//
-//    public void setDiscoveryTime(Date discoveryTime) {
-//        this.discoveryTime = discoveryTime;
-//    }
-//
-//    public Date getRepairTime() {
-//        return repairTime;
-//    }
-//
-//    public void setRepairTime(Date repairTime) {
-//        this.repairTime = repairTime;
-//    }
-//
-//    public String getVenue() {
-//        return venue;
-//    }
-//
-//    public void setVenue(String venue) {
-//        this.venue = venue == null ? null : venue.trim();
-//    }
-//
-//    public String getPic() {
-//        return pic;
-//    }
-//
-//    public void setPic(String pic) {
-//        this.pic = pic == null ? null : pic.trim();
-//    }
-//
-//    public String getModelUrl() {
-//        return modelUrl;
-//    }
-//
-//    public void setModelUrl(String modelUrl) {
-//        this.modelUrl = modelUrl == null ? null : modelUrl.trim();
-//    }
-//
-//    public String getContentUrl() {
-//        return contentUrl;
-//    }
-//
-//    public void setContentUrl(String contentUrl) {
-//        this.contentUrl = contentUrl == null ? null : contentUrl.trim();
-//    }
-//
-//    public Integer getState() {
-//        return state;
-//    }
-//
-//    public void setState(Integer state) {
-//        this.state = state;
-//    }
-//
-//    public Date getCreateTime() {
-//        return createTime;
-//    }
-//
-//    public void setCreateTime(Date createTime) {
-//        this.createTime = createTime;
-//    }
-//
-//    public String getDescription() {
-//        return description;
-//    }
-//
-//    public void setDescription(String description) {
-//        this.description = description == null ? null : description.trim();
-//    }
+    @ApiModelProperty(value = "二维码")
+    private String qrCode;
+
+
 }

zhoushan-system-dao/src/main/resources/mapper/base/TbCollectionMapper.xml

@@ -30,7 +30,7 @@
   </resultMap>
   <sql id="Base_Column_List">
     id, name, type_id, time_id, num, dir_code, icon, discovery_time, repair_time, venue, pic, unity_pic, unity_url, model_url, content_url,
-    state, create_time, like_num, open_num, search_num, download_num, type, url_list
+    state, create_time, like_num, open_num, search_num, download_num, type, url_list, qr_code
   </sql>
   <sql id="Blob_Column_List">
     description
@@ -136,6 +136,9 @@
       <if test="type != null">
         type ,
       </if>
+      <if test="qrCode != null">
+        qr_code ,
+      </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides=",">
       <if test="id != null">
@@ -199,6 +202,9 @@
       <if test="type != null">
         #{type,jdbcType=VARCHAR},
       </if>
+      <if test="qrCode != null">
+        #{qrCode,jdbcType=VARCHAR},
+      </if>
     </trim>
   </insert>
   <update id="updateByPrimaryKeySelective" parameterType="com.fdage.pojo.TbCollection">
@@ -261,6 +267,9 @@
       <if test="type != null">
         type = #{type,jdbcType=VARCHAR},
       </if>
+      <if test="qrCode != null">
+        qr_code = #{qrCode,jdbcType=VARCHAR},
+      </if>
 
     </set>
     where id = #{id,jdbcType=BIGINT}

zhoushan-system-dao/src/main/resources/mapper/cust/TbCollectionMapperCust.xml

@@ -21,7 +21,7 @@
     a.repair_time as repairTime, a.venue, a.model_url as modelUrl, a.content_url as contentUrl, a.state,
     a.create_time as createTime, a.description, b.name as timeName, c.name as typeName, a.pic, a.num,
     a.like_num as likeNum, a.open_num as openNum, a.search_num as searchNum, download_num as downloadNum,
-    a.unity_pic as unityPic, a.unity_url as unityUrl, a.icon, a.dir_code as dirCode, a.type, a.url_list
+    a.unity_pic as unityPic, a.unity_url as unityUrl, a.icon, a.dir_code as dirCode, a.type, a.url_list, a.qr_code
     from tb_collection a LEFT JOIN tb_collection_time b on a.time_id = b.id
     LEFT JOIN tb_collection_type c ON a.type_id = c.id
     WHERE 1 = 1
@@ -44,7 +44,7 @@
     a.repair_time as repairTime, a.venue, a.model_url as modelUrl, a.content_url as contentUrl, a.state,
     a.create_time as createTime, a.description, b.name as timeName, c.name as typeName, a.pic, a.num,
     a.like_num as likeNum, a.open_num as openNum, a.search_num as searchNum, download_num as downloadNum,
-     a.unity_pic as unityPic, a.unity_url as unityUrl, a.type, a.url_list
+     a.unity_pic as unityPic, a.unity_url as unityUrl, a.type, a.url_list, a.qr_code
     from tb_collection a LEFT JOIN tb_collection_time b on a.time_id = b.id
     LEFT JOIN tb_collection_type c ON a.type_id = c.id
     LEFT JOIN tb_exhibition_collection d ON a.id = d.collection_id
@@ -56,7 +56,7 @@
     a.repair_time as repairTime, a.venue, a.model_url as modelUrl, a.content_url as contentUrl, a.state,
     a.create_time as createTime, a.description, b.name as timeName, c.name as typeName, a.pic, a.num,
     a.like_num as likeNum, a.open_num as openNum, a.search_num as searchNum, download_num as downloadNum,
-    a.unity_pic as unityPic, a.unity_url as unityUrl, a.type, a.url_list
+    a.unity_pic as unityPic, a.unity_url as unityUrl, a.type, a.url_list, a.qr_code
     from tb_collection a LEFT JOIN tb_collection_time b on a.time_id = b.id
     LEFT JOIN tb_collection_type c ON a.type_id = c.id
     WHERE 1 = 1
@@ -105,7 +105,7 @@
     a.repair_time as repairTime, a.venue, a.model_url as modelUrl, a.content_url as contentUrl, a.state,
     a.create_time as createTime, a.description, b.name as timeName, c.name as typeName, a.pic, a.num,
     a.like_num as likeNum, a.open_num as openNum, a.search_num as searchNum, download_num as downloadNum,
-    a.unity_pic as unityPic, a.unity_url as unityUrl, a.type, a.url_list
+    a.unity_pic as unityPic, a.unity_url as unityUrl, a.type, a.url_list, a.qr_code
     from tb_collection a LEFT JOIN tb_collection_time b on a.time_id = b.id
     LEFT JOIN tb_collection_type c ON a.type_id = c.id
     WHERE 1 = 1