--no commit message

app/sysuser/src/main/java/com/zrqx/sysuser/commons/form/fg/aboutus/FgAboutusContentForm.java

+package com.zrqx.sysuser.commons.form.fg.aboutus;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+public class FgAboutusContentForm {
+
+	@ApiModelProperty("推荐状态:0未推荐，1推荐")
+	private Integer recommended;
+	@ApiModelProperty("数量")
+	private Integer num;
+}

app/sysuser/src/main/java/com/zrqx/sysuser/commons/form/fg/aboutus/FgAboutusForm.java

+package com.zrqx.sysuser.commons.form.fg.aboutus;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+public class FgAboutusForm {
+
+	@ApiModelProperty("栏目名称")
+	private String columnName;
+	@ApiModelProperty("栏目id")
+	private Integer id;
+}

app/sysuser/src/main/java/com/zrqx/sysuser/commons/form/fg/aboutus/FgQueryAboutusColumnForm.java

+package com.zrqx.sysuser.commons.form.fg.aboutus;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+public class FgQueryAboutusColumnForm {
+
+	@ApiModelProperty(value="宣传栏目名称")
+	private String name;
+	@ApiModelProperty(value="数量",required=true)
+	private Integer num;
+}

app/sysuser/src/main/java/com/zrqx/sysuser/commons/vo/fg/aboutus/FgAboutusVo.java

+package com.zrqx.sysuser.commons.vo.fg.aboutus;
+
+import java.util.List;
+
+import com.zrqx.sysuser.commons.model.aboutus.AboutUsColumn;
+import com.zrqx.sysuser.commons.model.aboutus.AboutUsContent;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+public class FgAboutusVo extends AboutUsColumn{
+
+	@ApiModelProperty("内容")
+	private List<AboutUsContent> list;
+}

app/sysuser/src/main/java/com/zrqx/sysuser/fg/controller/aboutus/FgAboutUsColumnController.java

+package com.zrqx.sysuser.fg.controller.aboutus;
+
+import java.util.List;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import com.zrqx.core.util.page.PageInfo;
+import com.zrqx.core.util.page.PageParam;
+import com.zrqx.core.util.response.CallBack;
+import com.zrqx.sysuser.commons.form.fg.aboutus.FgAboutusForm;
+import com.zrqx.sysuser.commons.form.fg.aboutus.FgQueryAboutusColumnForm;
+import com.zrqx.sysuser.commons.model.aboutus.AboutUsColumn;
+import com.zrqx.sysuser.commons.vo.fg.aboutus.FgAboutusVo;
+import com.zrqx.sysuser.fg.service.aboutus.FgAboutUsColumnService;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+
+@Controller
+@RestController
+@RequestMapping("/fg/aboutus-column")
+@Api(description = "前台-关于我们平台-栏目")
+public class FgAboutUsColumnController {
+
+	@Autowired
+	private FgAboutUsColumnService service;
+	
+	@ApiOperation(value = "查询", notes = "根据栏目名称，数量获取一组内容")
+	@GetMapping(value = "/num")
+	public CallBack<List<AboutUsColumn>> getByColumn(FgQueryAboutusColumnForm query) {
+		return CallBack.success(service.getByColumn(query));
+	}
+	
+	@ApiOperation(value = "查询所有栏目", notes = "查询所有栏目")
+	@GetMapping(value = "/list")
+	public CallBack<List<AboutUsColumn>> getList() {
+		return CallBack.success(service.selectAll());
+	}
+	
+	@ApiOperation(value = "分页查询", notes = "分页查询")
+	@GetMapping(value = "/page")
+	public CallBack<PageInfo<FgAboutusVo>> page(PageParam pageParam,FgAboutusForm form) {
+		pageParam.setOrderBy("sort desc");
+		return CallBack.success(service.page(pageParam,form));  
+	}
+	
+}

app/sysuser/src/main/java/com/zrqx/sysuser/fg/controller/aboutus/FgAboutUsContentController.java

+package com.zrqx.sysuser.fg.controller.aboutus;
+
+import java.util.List;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import com.zrqx.core.util.response.CallBack;
+import com.zrqx.sysuser.commons.form.fg.aboutus.FgAboutusContentForm;
+import com.zrqx.sysuser.commons.model.aboutus.AboutUsContent;
+import com.zrqx.sysuser.fg.service.aboutus.FgAboutUsContentService;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+
+@Controller
+@RestController
+@RequestMapping("/fg/aboutus-content")
+@Api(description = "前台-关于我们平台-内容")
+public class FgAboutUsContentController {
+
+	@Autowired
+	private FgAboutUsContentService service;
+	
+	@ApiOperation(value = "根据id查询", notes = "根据id查询内容")
+	@GetMapping(value = "/get/{oid}")
+	public CallBack<AboutUsContent> getById(@PathVariable Integer oid) {
+		return CallBack.success(service.searchById(oid));
+	}
+	
+	@ApiOperation(value = "根据属性为推荐，数量获取一组内容", notes = "根据属性为推荐，数量获取一组内容")
+	@GetMapping(value = "/list")
+	public CallBack<List<AboutUsContent>> getList(FgAboutusContentForm form) {
+		return CallBack.success(service.getList(form));
+	}
+}

app/sysuser/src/main/java/com/zrqx/sysuser/fg/controller/propaganda/FgPropagandaContentController.java

@@ -5,7 +5,6 @@ import java.util.List;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
 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;
 

app/sysuser/src/main/java/com/zrqx/sysuser/fg/mapper/aboutus/FgAboutUsColumnMapper.java

+package com.zrqx.sysuser.fg.mapper.aboutus;
+
+import java.util.List;
+
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Select;
+
+import com.zrqx.core.mapper.BaseMapper;
+import com.zrqx.sysuser.commons.form.fg.aboutus.FgAboutusForm;
+import com.zrqx.sysuser.commons.form.fg.aboutus.FgQueryAboutusColumnForm;
+import com.zrqx.sysuser.commons.model.aboutus.AboutUsColumn;
+import com.zrqx.sysuser.commons.model.aboutus.AboutUsContent;
+
+@Mapper
+public interface FgAboutUsColumnMapper extends BaseMapper<AboutUsColumn>{
+
+	@Select("<script>"
+			+ " select id,name,sort,createTime,updateTime from sys_aboutus_column "
+			+ " where 1=1 "
+			+ " eq(name,form.name) order by sort desc "
+			+ " limit #{form.num} "
+			+ "</script>")
+	List<AboutUsColumn> getByColumn(FgQueryAboutusColumnForm form);
+
+	@Select("<script>"
+			+ " select b.* from  sys_aboutus_content b where 1=1 and status =1 "
+			+ " eq(b.columnId,form.id) "
+			+ "</script>")
+	List<AboutUsContent> page(FgAboutusForm form);
+
+}

app/sysuser/src/main/java/com/zrqx/sysuser/fg/mapper/aboutus/FgAboutUsContentMapper.java

+package com.zrqx.sysuser.fg.mapper.aboutus;
+
+import java.util.List;
+
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Select;
+
+import com.zrqx.core.mapper.BaseMapper;
+import com.zrqx.sysuser.commons.form.fg.aboutus.FgAboutusContentForm;
+import com.zrqx.sysuser.commons.model.aboutus.AboutUsContent;
+
+@Mapper
+public interface FgAboutUsContentMapper extends BaseMapper<AboutUsContent>{
+
+	@Select("<script>"
+			+ " select id,title,columnId,source,keywords,author,diyType,cover,abstract1, "
+			+ " content,count,topStatus,recommended,status,createTime "
+			+ " from sys_aboutus_content where 1=1 and status = 1 "
+			+ " eq(recommended,form.recommended) "
+			+ " order by createTime desc limit #{form.num} "
+			+ "</script>")
+	List<AboutUsContent> getList(FgAboutusContentForm form);
+
+}

app/sysuser/src/main/java/com/zrqx/sysuser/fg/mapper/propaganda/FgPropagandaColumnMapper.java

@@ -11,7 +11,6 @@ import com.zrqx.sysuser.commons.form.fg.propaganda.FgQueryPropaganColumnForm;
 import com.zrqx.sysuser.commons.form.fg.propaganda.PropagandaForm;
 import com.zrqx.sysuser.commons.model.propaganda.PropagandaColumn;
 import com.zrqx.sysuser.commons.model.propaganda.PropagandaContent;
-import com.zrqx.sysuser.commons.vo.fg.propaganda.FgPropagandaVo;
 
 @Mapper
 public interface FgPropagandaColumnMapper extends BaseMapper<PropagandaColumn> {
@@ -24,14 +23,6 @@ public interface FgPropagandaColumnMapper extends BaseMapper<PropagandaColumn> {
 			+ "</script>")
 	List<PropagandaColumn> getByColumn(@Param("form") FgQueryPropaganColumnForm form);
 
-//	@Select("<script>"
-//			+ " select a.*,b.* from sys_propaganda_column a, sys_propaganda_content b where a.id = b.columnId "
-//			+ "<if test = '" + NOTBLANK + "(form.id)'>"
-//			+ " and a.id = #{form.id} "
-//			+ "</if>"
-//			+ " eq(b.columnId,form.id) "
-//			+ " eq(a.name,form.columnName) "
-//			+ "</script>")
 	@Select("<script>"
 			+ " select b.* from  sys_propaganda_content b where 1=1 and status =1 "
 			+ " eq(b.columnId,form.id) "

app/sysuser/src/main/java/com/zrqx/sysuser/fg/service/aboutus/FgAboutUsColumnService.java

+package com.zrqx.sysuser.fg.service.aboutus;
+
+import java.util.List;
+
+import com.zrqx.core.service.BaseService;
+import com.zrqx.core.util.page.PageInfo;
+import com.zrqx.core.util.page.PageParam;
+import com.zrqx.sysuser.commons.form.fg.aboutus.FgAboutusForm;
+import com.zrqx.sysuser.commons.form.fg.aboutus.FgQueryAboutusColumnForm;
+import com.zrqx.sysuser.commons.model.aboutus.AboutUsColumn;
+import com.zrqx.sysuser.commons.vo.fg.aboutus.FgAboutusVo;
+
+public interface FgAboutUsColumnService extends BaseService<AboutUsColumn, Integer>{
+
+	List<AboutUsColumn> getByColumn(FgQueryAboutusColumnForm query);
+
+	PageInfo<FgAboutusVo> page(PageParam pageParam, FgAboutusForm form);
+
+}

app/sysuser/src/main/java/com/zrqx/sysuser/fg/service/aboutus/FgAboutUsColumnServiceImpl.java

+package com.zrqx.sysuser.fg.service.aboutus;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import com.zrqx.core.mapper.BaseMapper;
+import com.zrqx.core.service.BaseServiceImpl;
+import com.zrqx.core.util.bean.BeanUtils;
+import com.zrqx.core.util.page.PageInfo;
+import com.zrqx.core.util.page.PageParam;
+import com.zrqx.sysuser.commons.form.fg.aboutus.FgAboutusForm;
+import com.zrqx.sysuser.commons.form.fg.aboutus.FgQueryAboutusColumnForm;
+import com.zrqx.sysuser.commons.model.aboutus.AboutUsColumn;
+import com.zrqx.sysuser.commons.model.aboutus.AboutUsContent;
+import com.zrqx.sysuser.commons.vo.fg.aboutus.FgAboutusVo;
+import com.zrqx.sysuser.fg.mapper.aboutus.FgAboutUsColumnMapper;
+
+@Service
+public class FgAboutUsColumnServiceImpl extends BaseServiceImpl<AboutUsColumn, Integer> implements FgAboutUsColumnService{
+
+	@Autowired
+	private FgAboutUsColumnMapper mapper;
+	
+	@Override
+	public BaseMapper<AboutUsColumn> getMapper() {
+		return mapper;
+	}
+
+	@Override
+	public List<AboutUsColumn> getByColumn(FgQueryAboutusColumnForm form) {
+		return mapper.getByColumn(form);
+	}
+
+	@Override
+	public PageInfo<FgAboutusVo> page(PageParam pageParam, FgAboutusForm form) {
+		startPage(pageParam);
+		List<FgAboutusVo> list1 = new ArrayList<FgAboutusVo>();
+		FgAboutusVo vo = new FgAboutusVo();
+		AboutUsColumn column = mapper.selectByPrimaryKey(form.getId());
+		BeanUtils.copyProperties(column, vo);
+		List<AboutUsContent> list = mapper.page(form);
+		vo.setList(list);
+		list1.add(vo);
+		return new PageInfo<FgAboutusVo>(list1);
+	}
+
+}

app/sysuser/src/main/java/com/zrqx/sysuser/fg/service/aboutus/FgAboutUsContentService.java

+package com.zrqx.sysuser.fg.service.aboutus;
+
+import java.util.List;
+
+import com.zrqx.core.service.BaseService;
+import com.zrqx.sysuser.commons.form.fg.aboutus.FgAboutusContentForm;
+import com.zrqx.sysuser.commons.model.aboutus.AboutUsContent;
+
+public interface FgAboutUsContentService extends BaseService<AboutUsContent, Integer> {
+
+	AboutUsContent searchById(Integer oid);
+
+	List<AboutUsContent> getList(FgAboutusContentForm form);
+
+}

app/sysuser/src/main/java/com/zrqx/sysuser/fg/service/aboutus/FgAboutUsContentServiceImpl.java

+package com.zrqx.sysuser.fg.service.aboutus;
+
+import java.util.List;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import com.zrqx.core.mapper.BaseMapper;
+import com.zrqx.core.service.BaseServiceImpl;
+import com.zrqx.sysuser.commons.form.fg.aboutus.FgAboutusContentForm;
+import com.zrqx.sysuser.commons.model.aboutus.AboutUsContent;
+import com.zrqx.sysuser.fg.mapper.aboutus.FgAboutUsContentMapper;
+
+@Service
+public class FgAboutUsContentServiceImpl extends BaseServiceImpl<AboutUsContent, Integer> implements FgAboutUsContentService{
+
+	@Autowired
+	private FgAboutUsContentMapper mapper;
+	
+	@Override
+	public BaseMapper<AboutUsContent> getMapper() {
+		return mapper;
+	}
+
+	@Override
+	public AboutUsContent searchById(Integer oid) {
+		AboutUsContent content = this.notNull(oid);
+		// 增加浏览量
+		int traffic = content.getCount() == null ? 0 : content.getCount() + 1;
+		content.setCount(traffic);
+		mapper.updateByPrimaryKeySelective(content);
+		return content;
+	}
+
+	@Override
+	public List<AboutUsContent> getList(FgAboutusContentForm form) {
+		List<AboutUsContent> list = mapper.getList(form);
+		return list;
+	}
+
+}

app/sysuser/src/main/java/com/zrqx/sysuser/fg/service/propaganda/FgPropagandaColumnServiceImpl.java

@@ -18,8 +18,6 @@ import com.zrqx.sysuser.commons.model.propaganda.PropagandaContent;
 import com.zrqx.sysuser.commons.vo.fg.propaganda.FgPropagandaVo;
 import com.zrqx.sysuser.fg.mapper.propaganda.FgPropagandaColumnMapper;
 
-import scala.Array;
-
 @Service
 public class FgPropagandaColumnServiceImpl extends BaseServiceImpl<PropagandaColumn, Integer> implements FgPropagandaColumnService {
 

app/sysuser/src/main/java/com/zrqx/sysuser/fg/service/propaganda/FgPropagandaContentServiceImpl.java

@@ -8,7 +8,6 @@ import org.springframework.stereotype.Service;
 import com.zrqx.core.mapper.BaseMapper;
 import com.zrqx.core.service.BaseServiceImpl;
 import com.zrqx.sysuser.commons.form.fg.propaganda.FgPropagandaContentForm;
-import com.zrqx.sysuser.commons.model.culture.Article;
 import com.zrqx.sysuser.commons.model.propaganda.PropagandaContent;
 import com.zrqx.sysuser.fg.mapper.propaganda.FgPropagandaContentMapper;