学校管理

renren-admin/src/main/java/io/renren/modules/qmgj/controller/SchoolInfoController.java

@@ -0,0 +1,77 @@
+package io.renren.modules.qmgj.controller;
+
+import io.renren.common.utils.PageUtils;
+import io.renren.common.utils.R;
+import io.renren.common.validator.ValidatorUtils;
+import io.renren.modules.qmgj.entity.SchoolInfoEntity;
+import io.renren.modules.qmgj.service.SchoolInfoService;
+import org.apache.shiro.authz.annotation.RequiresPermissions;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.Arrays;
+import java.util.Map;
+
+
+/**
+ * 学校表
+ *
+ */
+@RestController
+@RequestMapping("qmgj/school")
+public class SchoolInfoController {
+    @Autowired
+    private SchoolInfoService schoolInfoService;
+
+    /**
+     * 列表
+     */
+    @RequestMapping("/list")
+    @RequiresPermissions("qmgj:school:list")
+    public R list(@RequestParam Map<String, Object> params){
+        PageUtils page = schoolInfoService.queryPage(params);
+        return R.ok().put("page", page);
+    }
+
+    /**
+     * 信息
+     */
+    @RequestMapping("/info/{id}")
+    @RequiresPermissions("qmgj:school:info")
+    public R info(@PathVariable("id") Long id){
+        SchoolInfoEntity schoolInfo = schoolInfoService.queryById(id);
+        return R.ok().put("schoolInfo", schoolInfo);
+    }
+
+    /**
+     * 保存
+     */
+    @RequestMapping("/save")
+    @RequiresPermissions("qmgj:school:save")
+    public R save(@RequestBody SchoolInfoEntity schoolInfo){
+        schoolInfoService.saveEntity(schoolInfo);
+        return R.ok();
+    }
+
+    /**
+     * 修改
+     */
+    @RequestMapping("/update")
+    @RequiresPermissions("qmgj:school:update")
+    public R update(@RequestBody SchoolInfoEntity schoolInfo){
+        ValidatorUtils.validateEntity(schoolInfo);
+        schoolInfoService.updateEntityById(schoolInfo);
+        return R.ok();
+    }
+
+    /**
+     * 删除
+     */
+    @RequestMapping("/delete")
+    @RequiresPermissions("qmgj:school:delete")
+    public R delete(@RequestBody Long[] ids){
+        schoolInfoService.removeByIds(Arrays.asList(ids));
+        return R.ok();
+    }
+
+}

renren-admin/src/main/java/io/renren/modules/qmgj/dao/SchoolInfoDao.java

@@ -0,0 +1,14 @@
+package io.renren.modules.qmgj.dao;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import io.renren.modules.qmgj.entity.SchoolInfoEntity;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * 学校表
+ *
+ */
+@Mapper
+public interface SchoolInfoDao extends BaseMapper<SchoolInfoEntity> {
+
+}

renren-admin/src/main/java/io/renren/modules/qmgj/entity/SchoolInfoEntity.java

@@ -0,0 +1,53 @@
+package io.renren.modules.qmgj.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * 学校表
+ * 
+ */
+@Data
+@TableName("school_info")
+public class SchoolInfoEntity implements Serializable {
+	private static final long serialVersionUID = 1L;
+
+	/**
+	 * 主键
+	 */
+	@TableId(value = "GUID", type = IdType.UUID)
+	private String GUID;
+	@TableField("TOPORGID")
+	private String TOPORGID;
+	@TableField("INPUTUSERID")
+	private String INPUTUSERID;
+	@TableField("INPUTORGID")
+	private String INPUTORGID;
+	@TableField("INPUTTIME")
+	private String INPUTTIME;
+	/**
+	 * 学校名称
+	 */
+	@TableField("SCHOOLNAME")
+	private String SCHOOLNAME;
+	/**
+	 * 省份
+	 */
+	@TableField("PROVINCE")
+	private String PROVINCE;
+	@TableField(exist = false)
+	private String PROVINCENAME;
+	/**
+	 * 市
+	 */
+	@TableField("REGION")
+	private String REGION;
+	@TableField(exist = false)
+	private String REGIONNAME;
+
+}

renren-admin/src/main/java/io/renren/modules/qmgj/service/SchoolInfoService.java

@@ -0,0 +1,23 @@
+package io.renren.modules.qmgj.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import io.renren.common.utils.PageUtils;
+import io.renren.modules.qmgj.entity.SchoolInfoEntity;
+
+import java.util.Map;
+
+/**
+ * 学校表
+ *
+ */
+public interface SchoolInfoService extends IService<SchoolInfoEntity> {
+
+    PageUtils queryPage(Map<String, Object> params);
+
+    SchoolInfoEntity queryById(Long id);
+
+    void saveEntity(SchoolInfoEntity schoolInfo);
+
+    void updateEntityById(SchoolInfoEntity schoolInfo);
+}
+

renren-admin/src/main/java/io/renren/modules/qmgj/service/impl/ActivityServiceImpl.java

@@ -1924,11 +1924,25 @@ public class ActivityServiceImpl extends ServiceImpl<ActivityDao, ActivityEntity
     @Override
     @Transactional(rollbackFor = Exception.class)
     public void closeActivity(List<Long> ids) {
+        //同步更新发布状态
         if (CollectionUtil.isNotEmpty(ids)) {
+            long nowTime = System.currentTimeMillis();
+            String format = DateFormatUtils.format(new Date(), "yyyy-MM-dd HH:mm:ss");
             for (Long id : ids) {
                 ActivityEntity activityEntity = this.loadById(id, true);
                 Integer isEnable = activityEntity.getIsEnable();
                 activityEntity.setIsEnable(NumberUtil.equals(isEnable, BigDecimal.ZERO.intValue()) ? YnEnum.YES.value() : YnEnum.NO.value());
+                //发布状态
+                long startTime = DateUtil.parseDate(activityEntity.getStartTime(), "yyyy-MM-dd HH:mm").getTime();
+                if ("1".equals(activityEntity.getIsPublish())) {
+                    activityEntity.setIsPublish("0");
+                } else {
+                    if (startTime < nowTime) {
+                        throw new RRException("活动开始时间不能小于当前时间");
+                    }
+                    activityEntity.setIsPublish("1");
+                    activityEntity.setPublishTime(format);
+                }
                 baseMapper.updateById(activityEntity);
             }
         }

renren-admin/src/main/java/io/renren/modules/qmgj/service/impl/SchoolInfoServiceImpl.java

@@ -0,0 +1,90 @@
+package io.renren.modules.qmgj.service.impl;
+
+import cn.hutool.core.util.ObjectUtil;
+import cn.hutool.core.util.StrUtil;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import io.renren.common.utils.Constant;
+import io.renren.common.utils.DateUtils;
+import io.renren.common.utils.PageUtils;
+import io.renren.common.utils.Query;
+import io.renren.common.xss.SQLFilter;
+import io.renren.modules.qmgj.dao.SchoolInfoDao;
+import io.renren.modules.qmgj.entity.SchoolInfoEntity;
+import io.renren.modules.qmgj.service.SchoolInfoService;
+import io.renren.modules.qmjz.entity.Region;
+import io.renren.modules.qmjz.service.RegionService;
+import org.apache.commons.lang.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.Date;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+
+
+@Service("schoolInfoService")
+public class SchoolInfoServiceImpl extends ServiceImpl<SchoolInfoDao, SchoolInfoEntity> implements SchoolInfoService {
+
+    @Autowired
+    private SchoolInfoDao schoolInfoDao;
+    @Autowired
+    private RegionService regionService;
+
+    @Override
+    public PageUtils queryPage(Map<String, Object> params) {
+        QueryWrapper<SchoolInfoEntity> wrapper = new QueryWrapper<>();
+        wrapper.like(StrUtil.isNotBlank((String) params.get("SCHOOLNAME")), "SCHOOLNAME", (String) params.get("SCHOOLNAME"));
+        wrapper.eq(StrUtil.isNotBlank((String) params.get("PROVINCE")), "PROVINCE", ((String) params.get("PROVINCE")));
+        wrapper.eq(StrUtil.isNotBlank((String) params.get("REGION")), "REGION", ((String) params.get("REGION")));
+
+        //排序
+        String orderField = SQLFilter.sqlInject((String) params.get(Constant.ORDER_FIELD));
+        String order = (String) params.get(Constant.ORDER);
+        if (StringUtils.isNotEmpty(orderField) && StringUtils.isNotEmpty(order)) {
+            if (Constant.ASC.equalsIgnoreCase(order)) {
+                wrapper.orderByAsc(orderField);
+            } else {
+                wrapper.orderByDesc(orderField);
+            }
+        }
+        wrapper.orderByDesc(!"INPUTTIME".equals(orderField), "INPUTTIME");
+        IPage<SchoolInfoEntity> page = this.page(new Query<SchoolInfoEntity>().getPage(params), wrapper);
+        page.setRecords(convertList(page.getRecords()));
+        return new PageUtils(page);
+    }
+
+    @Override
+    public SchoolInfoEntity queryById(Long id) {
+        return convert(schoolInfoDao.selectById(id));
+    }
+
+    @Override
+    public void saveEntity(SchoolInfoEntity schoolInfo) {
+        schoolInfo.setINPUTTIME(DateUtils.format(new Date(), "yyyy-MM-dd HH:mm:ss"));
+        schoolInfoDao.insert(schoolInfo);
+    }
+
+    @Override
+    public void updateEntityById(SchoolInfoEntity schoolInfo) {
+        schoolInfoDao.updateById(schoolInfo);
+    }
+
+    private List<SchoolInfoEntity> convertList(List<SchoolInfoEntity> list) {
+        return list.stream().map(s -> convert(s)).collect(Collectors.toList());
+    }
+
+    private SchoolInfoEntity convert(SchoolInfoEntity entity) {
+        entity.setPROVINCENAME(getName(entity.getPROVINCE()));
+        entity.setREGIONNAME(getName(entity.getREGION()));
+        return entity;
+    }
+
+    private String getName(String code) {
+        Region region = regionService.loadById(Long.valueOf(code), false);
+        return ObjectUtil.isNull(region) ? null : region.getName();
+    }
+
+}