--no commit message

app/sysuser/src/main/java/com/zrqx/sysuser/bg/controller/footer/FooterColumnController.java

+package com.zrqx.sysuser.bg.controller.footer;
+
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+
+import org.apache.commons.lang.StringUtils;
+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.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import com.zrqx.core.enums.AboutUsStatusEnum;
+import com.zrqx.core.exception.BaseException;
+import com.zrqx.core.util.bean.BeanUtils;
+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.bg.service.aboutus.AboutUsColumnService;
+import com.zrqx.sysuser.bg.service.footer.FooterColumnService;
+import com.zrqx.sysuser.commons.model.aboutus.AboutUsColumn;
+import com.zrqx.sysuser.commons.model.footer.FooterColumn;
+import com.zrqx.sysuser.commons.vo.bg.aboutus.AboutUsColumnVo;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import tk.mybatis.mapper.entity.Example;
+import tk.mybatis.mapper.entity.Example.Criteria;
+
+@RestController
+@Api(description = "网站管理-页脚栏目")
+@RequestMapping("/bg/footer/column")
+public class FooterColumnController {
+
+	@Autowired
+	private FooterColumnService service;
+	
+	@ApiOperation(value = "新增", notes = "新增一个")
+	@PostMapping(value = "/save")
+	public CallBack<Boolean> save(@RequestBody FooterColumn entity) {
+		Example example = service.createExample();
+		example.createCriteria().andEqualTo("name",entity.getName());
+		if(service.selectOneByExample(example) != null){
+			throw new BaseException("栏目已存在");
+		}
+		entity.setCreateTime(new Date());
+		if (!service.insert(entity)) {
+			throw new BaseException("操作失败");
+		}
+		return CallBack.success(true);
+	}
+	
+	@ApiOperation(value = "查询是否存在", notes = "查询是否存在")
+	@GetMapping(value = "/isExist")
+	public CallBack<Boolean> isExistByAccount(String id, String name) {
+		Example example = service.createExample();
+		Criteria cr = example.createCriteria();
+		cr.andEqualTo("name",name);
+		if(id != null){
+			cr.andNotEqualTo("id", id);
+		}
+		return CallBack.success(service.selectOneByExample(example) != null);
+	}
+	
+	@ApiOperation(value = "删除", notes = "删除")
+	@PostMapping(value = "/delete/{oid}")
+	public CallBack<Boolean> deleteByIds(@PathVariable Integer oid) {
+		if (!service.deleteByPrimaryKey(oid)) {
+			throw new BaseException("操作失败");
+		}
+		return CallBack.success(true);
+	}
+	
+	@ApiOperation(value = "删除", notes = "删除")
+	@PostMapping(value = "/batch/delete")
+	public CallBack<Boolean> deleteByIds(@RequestBody List<Integer> ids) {
+		if (!service. batchDelete(ids)) {
+			throw new BaseException("操作失败");
+		}
+		return CallBack.success(true);
+	}
+	
+	@ApiOperation(value = "修改", notes = "修改")
+	@PostMapping(value = "/update")
+	public CallBack<Boolean> update(@RequestBody FooterColumn entity) {
+		Example example = service.createExample();
+		Criteria cr = example.createCriteria();
+		cr.andEqualTo("name",entity.getName());
+		if(entity.getId() != null){
+			cr.andNotEqualTo("id", entity.getId());
+		}
+		if(service.selectOneByExample(example) != null){
+			throw new BaseException("栏目已存在");
+		}
+		entity.setUpdateTime(new Date());
+		if (!service.updateByPrimaryKeySelective(entity)) {
+			throw new BaseException("操作失败");
+		}
+		return CallBack.success(true);
+	}
+
+	@ApiOperation(value = "查询", notes = "根据ID查询")
+	@GetMapping(value = "/{oid}")
+	public CallBack<FooterColumn> getById(@PathVariable Integer oid) {
+		return CallBack.success(service.selectByPrimaryKey(oid));
+	}
+
+	@ApiOperation(value = "查询", notes = "查询")
+	@GetMapping(value = "/page")
+	public CallBack<PageInfo<FooterColumn>> getUserPage(PageParam pageParam) {
+		if(StringUtils.isBlank(pageParam.getOrderBy())){
+			pageParam.setOrderBy("sort asc,createTime desc");
+		}
+		List<FooterColumn> list = new ArrayList<FooterColumn>();
+		PageInfo<FooterColumn> pageInfo = service.queryAll(pageParam);
+		pageInfo.getList().forEach(v ->{
+			FooterColumn vo = new FooterColumn();
+			BeanUtils.copyProperties(v, vo);
+			list.add(vo);
+		});
+		return CallBack.success(new PageInfo<FooterColumn>(list));
+	}
+	
+	@ApiOperation(value = "查询", notes = "查询")
+	@GetMapping(value = "/list")
+	public CallBack<List<FooterColumn>> getUserPage(String order) {
+		Example ex = service.createExample();
+		if(StringUtils.isBlank(order)){
+			ex.setOrderByClause("sort");
+		}else{
+			ex.setOrderByClause(order);
+		}
+		return CallBack.success(service.selectByExample(ex));
+	}
+}

app/sysuser/src/main/java/com/zrqx/sysuser/bg/mapper/footer/FooterColumnMapper.java

+package com.zrqx.sysuser.bg.mapper.footer;
+
+import org.springframework.stereotype.Service;
+
+import com.zrqx.core.mapper.BaseMapper;
+import com.zrqx.sysuser.commons.model.footer.FooterColumn;
+
+@Service
+public interface FooterColumnMapper extends BaseMapper<FooterColumn>{
+
+}

app/sysuser/src/main/java/com/zrqx/sysuser/bg/service/footer/FooterColumnService.java

+package com.zrqx.sysuser.bg.service.footer;
+
+import com.zrqx.core.service.BaseService;
+import com.zrqx.sysuser.commons.model.footer.FooterColumn;
+
+public interface FooterColumnService extends BaseService<FooterColumn, Integer>{
+
+}

app/sysuser/src/main/java/com/zrqx/sysuser/bg/service/footer/FooterColumnServiceImpl.java

+package com.zrqx.sysuser.bg.service.footer;
+
+import org.springframework.stereotype.Service;
+
+import com.zrqx.core.mapper.BaseMapper;
+import com.zrqx.core.service.BaseServiceImpl;
+import com.zrqx.sysuser.commons.model.footer.FooterColumn;
+
+@Service
+public class FooterColumnServiceImpl extends BaseServiceImpl<FooterColumn, Integer> implements FooterColumnService{
+
+	@Override
+	public BaseMapper<FooterColumn> getMapper() {
+		return null;
+	}
+
+}

app/sysuser/src/main/java/com/zrqx/sysuser/commons/model/aboutus/AboutUsColumn.java

@@ -25,6 +25,8 @@ public class AboutUsColumn {
 	private Integer id;
 	@ApiModelProperty(value="栏目名称",required=true)
 	private String name;
+	@ApiModelProperty("英文名称")
+	private String englishName;
 	@ApiModelProperty(value="栏目序号")
 	private Integer sort;
 	@ApiModelProperty(value="展示方式：详情1 列表2")

app/sysuser/src/main/java/com/zrqx/sysuser/commons/model/footer/Footer.java

@@ -17,8 +17,12 @@ public class Footer {
 	@GeneratedValue(generator = "JDBC")
 	@ApiModelProperty("页脚id，新增时不需要填写")
 	private Integer id;
+	@ApiModelProperty("页脚栏目id")
+	private Integer columnId;
 	@ApiModelProperty("页脚标题")
 	private String title;
+	@ApiModelProperty("链接")
+	private String links;
 	@ApiModelProperty("来源")
 	private String source;
 	@ApiModelProperty("内容")

app/sysuser/src/main/java/com/zrqx/sysuser/commons/model/footer/FooterColumn.java

+package com.zrqx.sysuser.commons.model.footer;
+
+import java.util.Date;
+
+import javax.persistence.GeneratedValue;
+import javax.persistence.Id;
+import javax.persistence.Table;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+@Table(name = "sys_footer_column")
+@ApiModel(value = "FooterColumn" , description = "页脚栏目")
+public class FooterColumn {
+
+	@Id
+	@GeneratedValue(generator = "JDBC")
+	@ApiModelProperty("页脚id，新增时不需要填写")
+	private Integer id;
+	@ApiModelProperty("栏目名称")
+	private String name;
+	@ApiModelProperty("排序")
+	private Integer sort;
+	@ApiModelProperty("创建时间")
+	private Date createTime;
+	@ApiModelProperty("修改时间")
+	private Date updateTime;
+}

app/sysuser/src/main/java/com/zrqx/sysuser/commons/model/propaganda/PropagandaColumn.java

@@ -25,6 +25,8 @@ public class PropagandaColumn {
 	private Integer id;
 	@ApiModelProperty(value="栏目名称",required=true)
 	private String name;
+	@ApiModelProperty("英文名称")
+	private String englishName;
 	@ApiModelProperty(value="栏目序号")
 	private Integer sort;
 	@ApiModelProperty(value="创建时间")