Merge remote-tracking branch 'origin/dev' into dev

rs-website/rs-website-api/src/main/java/com/upyuns/platform/rs/website/dto/CommonInfoDto.java

@@ -12,4 +12,5 @@ import lombok.Data;
 @Data
 public class CommonInfoDto extends PageParam {
 	Integer type;
+	String name;
 }

rs-website/rs-website-api/src/main/java/com/upyuns/platform/rs/website/dto/ImageInformationStorageDto.java

@@ -14,4 +14,5 @@ public class ImageInformationStorageDto extends PageParam {
 	Integer status;
 	Integer type;
 	String name;
+	String sort;
 }

rs-website/rs-website-api/src/main/java/com/upyuns/platform/rs/website/dto/IndustryApplicationInfoDto.java

@@ -16,4 +16,5 @@ public class IndustryApplicationInfoDto extends PageParam {
 	Integer indexShow;
 	Integer status;
 	String title;
+	Integer sortType;
 }

rs-website/rs-website-api/src/main/java/com/upyuns/platform/rs/website/dto/NewsInfoDto.java

@@ -12,4 +12,6 @@ import lombok.Data;
 @Data
 public class NewsInfoDto extends PageParam {
 	Integer typeId;
+	Integer sortType;
+	Integer status;
 }

rs-website/rs-website-api/src/main/java/com/upyuns/platform/rs/website/entity/CompanyInfo.java

+package com.upyuns.platform.rs.website.entity;
+
+import java.io.Serializable;
+import java.util.Date;
+import javax.persistence.*;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+
+/**
+ * 
+ * 
+ * @author zjw
+ * @email jiaoruizhen@126.com
+ * @date 2020-12-11 10:25:29
+ */
+@Data
+@Table(name = "company_info")
+public class CompanyInfo implements Serializable {
+	private static final long serialVersionUID = 1L;
+	
+	    /**
+    *  
+   */
+    @Id
+	@GeneratedValue(strategy = GenerationType.IDENTITY)
+	@ApiModelProperty("")
+    private Integer id;
+	
+	    /**
+     *  公司介绍
+     */
+    @Column(name = "intro")
+	@ApiModelProperty(value = "公司介绍")
+    private String intro;
+	
+	    /**
+     *  电话信息
+     */
+    @Column(name = "phone")
+	@ApiModelProperty(value = "电话信息")
+    private String phone;
+	
+	    /**
+     *  电子邮件
+     */
+    @Column(name = "email")
+	@ApiModelProperty(value = "电子邮件")
+    private String email;
+	
+	    /**
+     *  地址
+     */
+    @Column(name = "address")
+	@ApiModelProperty(value = "地址")
+    private String address;
+	
+	    /**
+     *  图片logo
+     */
+    @Column(name = "pic")
+	@ApiModelProperty(value = "图片logo")
+    private String pic;
+	
+	    /**
+     *  纬度
+     */
+    @Column(name = "lat")
+	@ApiModelProperty(value = "纬度")
+    private String lat;
+	
+	    /**
+     *  经度
+     */
+    @Column(name = "lng")
+	@ApiModelProperty(value = "经度")
+    private String lng;
+	
+	    /**
+     *  公司名称
+     */
+    @Column(name = "name")
+	@ApiModelProperty(value = "公司名称")
+    private String name;
+
+    private Integer isDel;
+
+    private Integer indexShow;
+
+	/**
+	 *  创建时间
+	 */
+	@Column(name = "crt_time")
+	@ApiModelProperty(value = "创建时间", hidden = true )
+	private Date crtTime;
+
+	/**
+	 *  更新时间
+	 */
+	@Column(name = "upd_time")
+	@ApiModelProperty(value = "更新时间", hidden = true )
+	private Date updTime;
+
+}

rs-website/rs-website-server/src/main/java/com/upyuns/platform/rs/website/biz/CompanyInfoBiz.java

+package com.upyuns.platform.rs.website.biz;
+
+import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.bean.copier.CopyOptions;
+import com.github.wxiaoqi.security.common.msg.ObjectRestResponse;
+import com.github.wxiaoqi.security.common.util.Query;
+import com.github.wxiaoqi.security.common.util.process.ResultCode;
+import com.github.wxiaoqi.security.common.vo.PageDataVO;
+import com.upyuns.platform.rs.website.dto.CommonInfoDto;
+import com.upyuns.platform.rs.website.entity.CommonInfo;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.stereotype.Service;
+
+import com.upyuns.platform.rs.website.entity.CompanyInfo;
+import com.upyuns.platform.rs.website.mapper.CompanyInfoMapper;
+import com.github.wxiaoqi.security.common.biz.BaseBiz;
+import tk.mybatis.mapper.entity.Example;
+
+import java.util.List;
+
+/**
+ * 
+ *
+ * @author zjw
+ * @email jiaoruizhen@126.com
+ * @date 2020-12-11 10:25:29
+ */
+@Service
+public class CompanyInfoBiz extends BaseBiz<CompanyInfoMapper,CompanyInfo> {
+
+	/**
+	 * 新增公司信息
+	 * @param companyInfo
+	 * @return
+	 */
+	public ObjectRestResponse addUpdate(CompanyInfo companyInfo) {
+		if (companyInfo == null) {
+			return ObjectRestResponse.paramIsEmpty();
+		}
+		if (companyInfo.getId() != null) {
+			CompanyInfo old = selectById(companyInfo.getId());
+			if (old == null || old.getIsDel() == 1) {
+				return ObjectRestResponse.createFailedResult(ResultCode.NOTEXIST_CODE, ResultCode.getMsg(ResultCode.NOTEXIST_CODE));
+			}
+			BeanUtil.copyProperties(companyInfo, old, CopyOptions.create().setIgnoreNullValue(true).setIgnoreError(true));
+			updateSelectiveByIdRe(old);
+		} else {
+			insertSelectiveRe(companyInfo);
+		}
+		return ObjectRestResponse.succ();
+	}
+
+	/**
+	 * 分页查询公司信息
+	 * @param commonInfoDto
+	 * @return
+	 */
+	public ObjectRestResponse getAll(CommonInfoDto commonInfoDto) {
+		Example example = new Example(CompanyInfo.class);
+		Example.Criteria criteria = example.createCriteria();
+		criteria.andEqualTo("isDel", 0);
+		if (StringUtils.isNotBlank(commonInfoDto.getName())) {
+			criteria.andLike("name", "%" + commonInfoDto.getName() + "%");
+		}
+		Query query = new Query(commonInfoDto);
+		PageDataVO<CompanyInfo> pageDataVO = PageDataVO.pageInfo(query, () -> mapper.selectByExample(example));
+		return ObjectRestResponse.succ(pageDataVO);
+	}
+
+
+	public ObjectRestResponse getIndexShow() {
+		Example example = new Example(CompanyInfo.class);
+		example.createCriteria().andEqualTo("isDel", 0).andEqualTo("indexShow", 1);
+		example.orderBy("updTime").desc();
+		List<CompanyInfo> list = mapper.selectByExample(example);
+		if (list != null && list.size() > 0) {
+			return ObjectRestResponse.succ(list.get(0));
+		}
+		return ObjectRestResponse.succ(new CompanyInfo());
+	}
+}
\ No newline at end of file

rs-website/rs-website-server/src/main/java/com/upyuns/platform/rs/website/biz/ImageImgStorageBiz.java

@@ -79,7 +79,7 @@ public class ImageImgStorageBiz extends BaseBiz<ImageImgStorageMapper,ImageImgSt
 	 * @param imageInformationStorageDto
 	 * @return
 	 */
-	public ObjectRestResponse selectList(ImageInformationStorageDto imageInformationStorageDto) {
+	public ObjectRestResponse selectList(ImageInformationStorageDto imageInformationStorageDto, Integer sort) {
 		Example example = new Example(ImageImgStorage.class);
 		Example.Criteria criteria = example.createCriteria();
 		criteria.andEqualTo("isDel", 0);
@@ -92,7 +92,11 @@ public class ImageImgStorageBiz extends BaseBiz<ImageImgStorageMapper,ImageImgSt
 		if (StringUtils.isNotBlank(imageInformationStorageDto.getName())) {
 			criteria.andLike("name", "%" + imageInformationStorageDto.getName() + "%");
 		}
-		example.orderBy("updTime").desc();
+		if (sort == 1) {
+			example.orderBy("updTime").desc();
+		} else {
+			example.orderBy("rank");
+		}
 		Query query = new Query(imageInformationStorageDto);
 		PageDataVO<ImageImgStorage> pageDataVO = PageDataVO.pageInfo(query, () -> mapper.selectByExample(example));
 		if (pageDataVO != null && pageDataVO.getData() != null) {

rs-website/rs-website-server/src/main/java/com/upyuns/platform/rs/website/controller/CompanyInfoController.java

+package com.upyuns.platform.rs.website.controller;
+
+import com.github.wxiaoqi.security.common.msg.ObjectRestResponse;
+import com.github.wxiaoqi.security.common.rest.BaseController;
+import com.upyuns.platform.rs.website.biz.CompanyInfoBiz;
+import com.upyuns.platform.rs.website.dto.CommonInfoDto;
+import com.upyuns.platform.rs.website.entity.CompanyInfo;
+import org.springframework.web.bind.annotation.*;
+
+@RestController
+@RequestMapping("companyInfo")
+public class CompanyInfoController extends BaseController<CompanyInfoBiz,CompanyInfo> {
+
+	@PostMapping(value = "addUpdate")
+	public ObjectRestResponse addUpdate(@RequestBody CompanyInfo companyInfo) {
+		return baseBiz.addUpdate(companyInfo);
+	}
+
+	@GetMapping(value = "getAll")
+	public ObjectRestResponse getAll(CommonInfoDto commonInfoDto) {
+		return baseBiz.getAll(commonInfoDto);
+	}
+
+	@GetMapping(value = "detail")
+	public ObjectRestResponse getOne() {
+		return baseBiz.getIndexShow();
+	}
+}
\ No newline at end of file

rs-website/rs-website-server/src/main/java/com/upyuns/platform/rs/website/controller/ImageImgStorageController.java

@@ -15,7 +15,7 @@ public class ImageImgStorageController extends BaseController<ImageImgStorageBiz
 
 	@GetMapping(value = "getList")
 	public ObjectRestResponse getList(ImageInformationStorageDto imageInformationStorageDto) {
-		return baseBiz.selectList(imageInformationStorageDto);
+		return baseBiz.selectList(imageInformationStorageDto, 1);
 	}
 
 	@PostMapping(value = "addUpdate")

rs-website/rs-website-server/src/main/java/com/upyuns/platform/rs/website/controller/web/CompanyInfoWebController.java

+package com.upyuns.platform.rs.website.controller.web;
+
+import com.github.wxiaoqi.security.common.msg.ObjectRestResponse;
+import com.github.wxiaoqi.security.common.rest.BaseController;
+import com.upyuns.platform.rs.website.biz.CompanyInfoBiz;
+import com.upyuns.platform.rs.website.entity.CompanyInfo;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+@RestController
+@RequestMapping("companyInfo/web")
+public class CompanyInfoWebController extends BaseController<CompanyInfoBiz,CompanyInfo> {
+
+	@GetMapping(value = "/app/unauth/detail")
+	public ObjectRestResponse getOne() {
+		return baseBiz.getIndexShow();
+	}
+
+}
\ No newline at end of file

rs-website/rs-website-server/src/main/java/com/upyuns/platform/rs/website/controller/web/ImageImgStorageWebController.java

@@ -23,4 +23,9 @@ public class ImageImgStorageWebController extends BaseController<ImageImgStorage
 	public ObjectRestResponse getAll(Integer type) {
 		return baseBiz.getAll(type);
 	}
+
+	@GetMapping(value = "/app/unauth/getList")
+	public ObjectRestResponse getList(ImageInformationStorageDto imageInformationStorageDto) {
+		return baseBiz.selectList(imageInformationStorageDto, 2);
+	}
 }
\ No newline at end of file

rs-website/rs-website-server/src/main/java/com/upyuns/platform/rs/website/controller/web/IndustryApplicationWebInfoController.java

+package com.upyuns.platform.rs.website.controller.web;
+
+import com.github.wxiaoqi.security.common.msg.ObjectRestResponse;
+import com.github.wxiaoqi.security.common.rest.BaseController;
+import com.upyuns.platform.rs.website.biz.IndustryApplicationInfoBiz;
+import com.upyuns.platform.rs.website.dto.IndustryApplicationInfoDto;
+import com.upyuns.platform.rs.website.entity.IndustryApplicationInfo;
+import org.springframework.web.bind.annotation.*;
+
+@RestController
+@RequestMapping("industryApplicationInfo/web")
+public class IndustryApplicationWebInfoController extends BaseController<IndustryApplicationInfoBiz, IndustryApplicationInfo> {
+
+	@GetMapping(value = "/app/unauth/getList")
+	public ObjectRestResponse getList(IndustryApplicationInfoDto industryApplicationInfoDto) {
+		industryApplicationInfoDto.setSortType(1);
+		industryApplicationInfoDto.setStatus(1);
+		return baseBiz.selectList(industryApplicationInfoDto);
+	}
+
+	@GetMapping(value = "/app/unauth/getAll")
+	public ObjectRestResponse getAll() {
+		return baseBiz.getAllIndexShow();
+	}
+
+	@GetMapping(value = "/app/unauth/detail")
+	public ObjectRestResponse detail(Integer id) {
+		return ObjectRestResponse.succ(baseBiz.selectById(id));
+	}
+
+}
\ No newline at end of file

rs-website/rs-website-server/src/main/java/com/upyuns/platform/rs/website/controller/web/NewsInfoWebController.java

+package com.upyuns.platform.rs.website.controller.web;
+
+import com.github.wxiaoqi.security.common.msg.ObjectRestResponse;
+import com.github.wxiaoqi.security.common.rest.BaseController;
+import com.upyuns.platform.rs.website.biz.NewsInfoBiz;
+import com.upyuns.platform.rs.website.dto.NewsInfoDto;
+import com.upyuns.platform.rs.website.entity.NewsInfo;
+import org.springframework.web.bind.annotation.*;
+
+@RestController
+@RequestMapping("newsInfo/web")
+public class NewsInfoWebController extends BaseController<NewsInfoBiz, NewsInfo> {
+
+	@GetMapping(value = "/app/unauth/getList")
+	public ObjectRestResponse getList(NewsInfoDto newsInfoDto) {
+		newsInfoDto.setStatus(1);
+		newsInfoDto.setSortType(1);
+		return baseBiz.selectList(newsInfoDto);
+	}
+
+	@GetMapping(value = "/app/unauth/getAll")
+	public ObjectRestResponse getAll(NewsInfoDto newsInfoDto) {
+		return baseBiz.selectList(newsInfoDto);
+	}
+
+	@GetMapping(value = "/app/unauth/detail")
+	public ObjectRestResponse detail(Integer id) {
+		return ObjectRestResponse.succ(baseBiz.selectById(id));
+	}
+}
\ No newline at end of file

rs-website/rs-website-server/src/main/java/com/upyuns/platform/rs/website/mapper/CompanyInfoMapper.java

+package com.upyuns.platform.rs.website.mapper;
+
+import com.upyuns.platform.rs.website.entity.CompanyInfo;
+import tk.mybatis.mapper.common.Mapper;
+
+/**
+ * 
+ * 
+ * @author zjw
+ * @email jiaoruizhen@126.com
+ * @date 2020-12-11 10:25:29
+ */
+public interface CompanyInfoMapper extends Mapper<CompanyInfo> {
+	
+}

rs-website/rs-website-server/src/main/resources/mapper/CompanyInfoMapper.xml

+<?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.upyuns.platform.rs.website.mapper.CompanyInfoMapper">
+
+</mapper>
\ No newline at end of file

rs-website/rs-website-server/src/main/resources/mapper/IndustryApplicationInfoMapper.xml

@@ -25,8 +25,13 @@
             </if>
             and iai.is_del = 0
         </where>
+        <if test="sortType == 1">
+            order by iai.rank
+        </if>
+        <if test="sortType != 1">
+            order by iai.upd_time DESC
+        </if>
 
-        order by iai.upd_time DESC
     </select>
 
 </mapper>
\ No newline at end of file

rs-website/rs-website-server/src/main/resources/mapper/NewsInfoMapper.xml

@@ -10,8 +10,17 @@
             <if test="typeId != null">
                 and ni.type_id = #{typeId}
             </if>
+            <if test="status != null">
+                and ni.status = #{status}
+            </if>
+            and ni.is_del = 0
         </where>
-        order by ni.rank
+        <if test="sortType == 1">
+            order by ni.rank
+        </if>
+        <if test="sortType != 1">
+            order by ni.upd_time DESC
+        </if>
     </select>
 
 </mapper>
\ No newline at end of file