From becef3054ef21798cbdf2f24d20e2c4498db9114 Mon Sep 17 00:00:00 2001 From: dongdingding <207595406@qq.com> Date: Wed, 13 Dec 2023 10:42:47 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ruoyi-admin/pom.xml | 7 + .../pt/controller/BEventAccessController.java | 5 +- .../BEventProgressPushController.java | 6 +- .../com/ruoyi/pt/domain/BEventAccess.java | 12 +- .../ruoyi/pt/domain/BEventProgressPush.java | 9 +- .../ruoyi/pt/mapper/BEventAccessMapper.java | 6 +- .../pt/mapper/BEventProgressPushMapper.java | 7 +- .../pt/service/IBEventAccessService.java | 10 +- .../service/IBEventProgressPushService.java | 7 +- .../service/impl/BEventAccessServiceImpl.java | 41 +++-- .../impl/BEventProgressPushServiceImpl.java | 9 +- .../src/main/resources/application.yml | 4 +- .../ruoyi/framework/config/MyBatisConfig.java | 99 +++--------- .../mapper/pt/BEventAccessMapper.xml | 150 ++++++++++-------- .../mapper/pt/BEventProgressPushMapper.xml | 123 ++++++++------ 15 files changed, 261 insertions(+), 234 deletions(-) diff --git a/ruoyi-admin/pom.xml b/ruoyi-admin/pom.xml index b647399..8ce9868 100644 --- a/ruoyi-admin/pom.xml +++ b/ruoyi-admin/pom.xml @@ -21,6 +21,13 @@ com.github.xiaoymin knife4j-openapi2-spring-boot-starter + + + com.baomidou + mybatis-plus-boot-starter + 3.5.3.1 + + diff --git a/ruoyi-admin/src/main/java/com/ruoyi/pt/controller/BEventAccessController.java b/ruoyi-admin/src/main/java/com/ruoyi/pt/controller/BEventAccessController.java index e5c9a77..ae6674d 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/pt/controller/BEventAccessController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/pt/controller/BEventAccessController.java @@ -63,8 +63,9 @@ public class BEventAccessController extends BaseController { */ @ApiOperation(value = "事件推送接⼝") @PostMapping("/imports") - public AjaxResult add(@RequestBody BEventAccess bEventAccess) { - return toAjax(bEventAccessService.insertBEventAccess(bEventAccess)); + public AjaxResult add(@RequestBody List bEventAccess) { + bEventAccessService.saveBatch(bEventAccess); + return AjaxResult.success(); } /** diff --git a/ruoyi-admin/src/main/java/com/ruoyi/pt/controller/BEventProgressPushController.java b/ruoyi-admin/src/main/java/com/ruoyi/pt/controller/BEventProgressPushController.java index a4f57b8..e9cd101 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/pt/controller/BEventProgressPushController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/pt/controller/BEventProgressPushController.java @@ -22,7 +22,7 @@ import java.util.List; */ @Api(tags = "事件进度推送") @RestController -@RequestMapping("/eventProgress") +@RequestMapping("/gateway/event/event/eventData/eventProgress/") public class BEventProgressPushController extends BaseController { @Autowired private IBEventProgressPushService bEventProgressPushService; @@ -63,8 +63,8 @@ public class BEventProgressPushController extends BaseController { */ @ApiOperation(value = "新增事件进度推送") @PostMapping("/imports") - public AjaxResult add(@RequestBody BEventProgressPush bEventProgressPush) { - return toAjax(bEventProgressPushService.insertBEventProgressPush(bEventProgressPush)); + public AjaxResult add(@RequestBody List bEventProgressPush) { + return toAjax(bEventProgressPushService.saveBatch(bEventProgressPush)); } /** diff --git a/ruoyi-admin/src/main/java/com/ruoyi/pt/domain/BEventAccess.java b/ruoyi-admin/src/main/java/com/ruoyi/pt/domain/BEventAccess.java index a050974..7c756f6 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/pt/domain/BEventAccess.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/pt/domain/BEventAccess.java @@ -1,11 +1,17 @@ package com.ruoyi.pt.domain; +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 com.ruoyi.common.annotation.Excel; import com.ruoyi.common.core.domain.BaseEntity; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import java.io.Serializable; + /** * 事件接⼊对象 b_event_access * @@ -14,12 +20,14 @@ import lombok.Data; */ @Data @ApiModel("事件接⼊") -public class BEventAccess extends BaseEntity { - private static final long serialVersionUID = 1L; +@TableName("b_event_access") +public class BEventAccess implements Serializable { + /** * id */ + @TableId(type = IdType.AUTO) private Long id; /** diff --git a/ruoyi-admin/src/main/java/com/ruoyi/pt/domain/BEventProgressPush.java b/ruoyi-admin/src/main/java/com/ruoyi/pt/domain/BEventProgressPush.java index 359459c..f4703a4 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/pt/domain/BEventProgressPush.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/pt/domain/BEventProgressPush.java @@ -1,5 +1,8 @@ package com.ruoyi.pt.domain; +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; import com.ruoyi.common.annotation.Excel; import com.ruoyi.common.core.domain.BaseEntity; import io.swagger.annotations.ApiModel; @@ -8,6 +11,8 @@ import lombok.Data; import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; +import java.io.Serializable; + /** * 事件进度推送对象 b_event_progress_push * @@ -16,12 +21,14 @@ import org.apache.commons.lang3.builder.ToStringStyle; */ @Data @ApiModel("事件进度推送") -public class BEventProgressPush extends BaseEntity { +@TableName("b_event_progress_push") +public class BEventProgressPush implements Serializable { private static final long serialVersionUID = 1L; /** * id */ + @TableId(type = IdType.AUTO) private Long id; /** diff --git a/ruoyi-admin/src/main/java/com/ruoyi/pt/mapper/BEventAccessMapper.java b/ruoyi-admin/src/main/java/com/ruoyi/pt/mapper/BEventAccessMapper.java index eca6fb7..e8d6999 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/pt/mapper/BEventAccessMapper.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/pt/mapper/BEventAccessMapper.java @@ -1,6 +1,8 @@ package com.ruoyi.pt.mapper; import java.util.List; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.ruoyi.pt.domain.BEventAccess; /** @@ -9,7 +11,7 @@ import com.ruoyi.pt.domain.BEventAccess; * @author ruoyi * @date 2023-12-06 */ -public interface BEventAccessMapper +public interface BEventAccessMapper extends BaseMapper { /** * 查询事件接⼊ @@ -33,7 +35,7 @@ public interface BEventAccessMapper * @param bEventAccess 事件接⼊ * @return 结果 */ - public int insertBEventAccess(BEventAccess bEventAccess); + public int insertBEventAccess(List bEventAccess); /** * 修改事件接⼊ diff --git a/ruoyi-admin/src/main/java/com/ruoyi/pt/mapper/BEventProgressPushMapper.java b/ruoyi-admin/src/main/java/com/ruoyi/pt/mapper/BEventProgressPushMapper.java index 17819c3..1945194 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/pt/mapper/BEventProgressPushMapper.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/pt/mapper/BEventProgressPushMapper.java @@ -1,6 +1,9 @@ package com.ruoyi.pt.mapper; import java.util.List; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.ruoyi.pt.domain.BEventAccess; import com.ruoyi.pt.domain.BEventProgressPush; /** @@ -9,7 +12,7 @@ import com.ruoyi.pt.domain.BEventProgressPush; * @author ruoyi * @date 2023-12-06 */ -public interface BEventProgressPushMapper +public interface BEventProgressPushMapper extends BaseMapper { /** * 查询事件进度推送 @@ -33,7 +36,7 @@ public interface BEventProgressPushMapper * @param bEventProgressPush 事件进度推送 * @return 结果 */ - public int insertBEventProgressPush(BEventProgressPush bEventProgressPush); + public int insertBEventProgressPush(List bEventProgressPush); /** * 修改事件进度推送 diff --git a/ruoyi-admin/src/main/java/com/ruoyi/pt/service/IBEventAccessService.java b/ruoyi-admin/src/main/java/com/ruoyi/pt/service/IBEventAccessService.java index 765483a..ef3decc 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/pt/service/IBEventAccessService.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/pt/service/IBEventAccessService.java @@ -1,6 +1,8 @@ package com.ruoyi.pt.service; import java.util.List; + +import com.baomidou.mybatisplus.extension.service.IService; import com.ruoyi.pt.domain.BEventAccess; /** @@ -9,7 +11,7 @@ import com.ruoyi.pt.domain.BEventAccess; * @author ruoyi * @date 2023-12-06 */ -public interface IBEventAccessService +public interface IBEventAccessService extends IService { /** * 查询事件接⼊ @@ -21,7 +23,7 @@ public interface IBEventAccessService /** * 查询事件接⼊列表 - * + * * @param bEventAccess 事件接⼊ * @return 事件接⼊集合 */ @@ -29,11 +31,11 @@ public interface IBEventAccessService /** * 新增事件接⼊ - * + * * @param bEventAccess 事件接⼊ * @return 结果 */ - public int insertBEventAccess(BEventAccess bEventAccess); + public boolean insertBEventAccess(List bEventAccess); /** * 修改事件接⼊ diff --git a/ruoyi-admin/src/main/java/com/ruoyi/pt/service/IBEventProgressPushService.java b/ruoyi-admin/src/main/java/com/ruoyi/pt/service/IBEventProgressPushService.java index 0736c89..b43e38f 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/pt/service/IBEventProgressPushService.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/pt/service/IBEventProgressPushService.java @@ -1,6 +1,9 @@ package com.ruoyi.pt.service; import java.util.List; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.ruoyi.pt.domain.BEventAccess; import com.ruoyi.pt.domain.BEventProgressPush; /** @@ -9,7 +12,7 @@ import com.ruoyi.pt.domain.BEventProgressPush; * @author ruoyi * @date 2023-12-06 */ -public interface IBEventProgressPushService +public interface IBEventProgressPushService extends IService { /** * 查询事件进度推送 @@ -33,7 +36,7 @@ public interface IBEventProgressPushService * @param bEventProgressPush 事件进度推送 * @return 结果 */ - public int insertBEventProgressPush(BEventProgressPush bEventProgressPush); + public int insertBEventProgressPush(List bEventProgressPush); /** * 修改事件进度推送 diff --git a/ruoyi-admin/src/main/java/com/ruoyi/pt/service/impl/BEventAccessServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/pt/service/impl/BEventAccessServiceImpl.java index c72ed04..9f084e1 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/pt/service/impl/BEventAccessServiceImpl.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/pt/service/impl/BEventAccessServiceImpl.java @@ -1,6 +1,8 @@ package com.ruoyi.pt.service.impl; import java.util.List; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import com.ruoyi.pt.mapper.BEventAccessMapper; @@ -9,85 +11,80 @@ import com.ruoyi.pt.service.IBEventAccessService; /** * 事件接⼊Service业务层处理 - * + * * @author ruoyi * @date 2023-12-06 */ @Service -public class BEventAccessServiceImpl implements IBEventAccessService -{ +public class BEventAccessServiceImpl extends ServiceImpl implements IBEventAccessService { @Autowired private BEventAccessMapper bEventAccessMapper; + @Autowired + private IBEventAccessService ibEventAccessService; /** * 查询事件接⼊ - * + * * @param id 事件接⼊主键 * @return 事件接⼊ */ @Override - public BEventAccess selectBEventAccessById(Long id) - { + public BEventAccess selectBEventAccessById(Long id) { return bEventAccessMapper.selectBEventAccessById(id); } /** * 查询事件接⼊列表 - * + * * @param bEventAccess 事件接⼊ * @return 事件接⼊ */ @Override - public List selectBEventAccessList(BEventAccess bEventAccess) - { + public List selectBEventAccessList(BEventAccess bEventAccess) { return bEventAccessMapper.selectBEventAccessList(bEventAccess); } /** * 新增事件接⼊ - * + * * @param bEventAccess 事件接⼊ * @return 结果 */ @Override - public int insertBEventAccess(BEventAccess bEventAccess) - { - return bEventAccessMapper.insertBEventAccess(bEventAccess); + public boolean insertBEventAccess(List bEventAccess) { + return ibEventAccessService.saveBatch(bEventAccess); } /** * 修改事件接⼊ - * + * * @param bEventAccess 事件接⼊ * @return 结果 */ @Override - public int updateBEventAccess(BEventAccess bEventAccess) - { + public int updateBEventAccess(BEventAccess bEventAccess) { return bEventAccessMapper.updateBEventAccess(bEventAccess); } /** * 批量删除事件接⼊ - * + * * @param ids 需要删除的事件接⼊主键 * @return 结果 */ @Override - public int deleteBEventAccessByIds(Long[] ids) - { + public int deleteBEventAccessByIds(Long[] ids) { return bEventAccessMapper.deleteBEventAccessByIds(ids); } /** * 删除事件接⼊信息 - * + * * @param id 事件接⼊主键 * @return 结果 */ @Override - public int deleteBEventAccessById(Long id) - { + public int deleteBEventAccessById(Long id) { return bEventAccessMapper.deleteBEventAccessById(id); } } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/pt/service/impl/BEventProgressPushServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/pt/service/impl/BEventProgressPushServiceImpl.java index 20e07a6..0a52f6c 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/pt/service/impl/BEventProgressPushServiceImpl.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/pt/service/impl/BEventProgressPushServiceImpl.java @@ -1,6 +1,11 @@ package com.ruoyi.pt.service.impl; import java.util.List; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.ruoyi.pt.domain.BEventAccess; +import com.ruoyi.pt.mapper.BEventAccessMapper; +import com.ruoyi.pt.service.IBEventAccessService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import com.ruoyi.pt.mapper.BEventProgressPushMapper; @@ -14,7 +19,7 @@ import com.ruoyi.pt.service.IBEventProgressPushService; * @date 2023-12-06 */ @Service -public class BEventProgressPushServiceImpl implements IBEventProgressPushService +public class BEventProgressPushServiceImpl extends ServiceImpl implements IBEventProgressPushService { @Autowired private BEventProgressPushMapper bEventProgressPushMapper; @@ -50,7 +55,7 @@ public class BEventProgressPushServiceImpl implements IBEventProgressPushService * @return 结果 */ @Override - public int insertBEventProgressPush(BEventProgressPush bEventProgressPush) + public int insertBEventProgressPush(List bEventProgressPush) { return bEventProgressPushMapper.insertBEventProgressPush(bEventProgressPush); } diff --git a/ruoyi-admin/src/main/resources/application.yml b/ruoyi-admin/src/main/resources/application.yml index 5a62896..c5e0ea9 100644 --- a/ruoyi-admin/src/main/resources/application.yml +++ b/ruoyi-admin/src/main/resources/application.yml @@ -99,8 +99,10 @@ token: # 令牌有效期（默认30分钟） expireTime: 30 + + # MyBatis配置 -mybatis: +mybatis-plus: # 搜索指定包别名 typeAliasesPackage: com.ruoyi.**.domain # 配置mapper的扫描，找到所有的mapper.xml映射文件 diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/config/MyBatisConfig.java b/ruoyi-framework/src/main/java/com/ruoyi/framework/config/MyBatisConfig.java index 057c941..49ed14d 100644 --- a/ruoyi-framework/src/main/java/com/ruoyi/framework/config/MyBatisConfig.java +++ b/ruoyi-framework/src/main/java/com/ruoyi/framework/config/MyBatisConfig.java @@ -1,20 +1,8 @@ package com.ruoyi.framework.config; -import java.io.IOException; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.HashSet; -import java.util.List; -import javax.sql.DataSource; -import org.apache.ibatis.io.VFS; -import org.apache.ibatis.session.SqlSessionFactory; -import org.mybatis.spring.SqlSessionFactoryBean; -import org.mybatis.spring.boot.autoconfigure.SpringBootVFS; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.core.env.Environment; -import org.springframework.core.io.DefaultResourceLoader; import org.springframework.core.io.Resource; import org.springframework.core.io.support.PathMatchingResourcePatternResolver; import org.springframework.core.io.support.ResourcePatternResolver; @@ -22,111 +10,76 @@ import org.springframework.core.type.classreading.CachingMetadataReaderFactory; import org.springframework.core.type.classreading.MetadataReader; import org.springframework.core.type.classreading.MetadataReaderFactory; import org.springframework.util.ClassUtils; -import com.ruoyi.common.utils.StringUtils; + +import java.io.IOException; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.HashSet; +import java.util.List; /** * Mybatis支持*匹配扫描包 - * + * * @author ruoyi */ @Configuration -public class MyBatisConfig -{ +public class MyBatisConfig { + static final String DEFAULT_RESOURCE_PATTERN = "**/*.class"; @Autowired private Environment env; - static final String DEFAULT_RESOURCE_PATTERN = "**/*.class"; - - public static String setTypeAliasesPackage(String typeAliasesPackage) - { + public static String setTypeAliasesPackage(String typeAliasesPackage) { ResourcePatternResolver resolver = (ResourcePatternResolver) new PathMatchingResourcePatternResolver(); MetadataReaderFactory metadataReaderFactory = new CachingMetadataReaderFactory(resolver); List allResult = new ArrayList(); - try - { - for (String aliasesPackage : typeAliasesPackage.split(",")) - { + try { + for (String aliasesPackage : typeAliasesPackage.split(",")) { List result = new ArrayList(); aliasesPackage = ResourcePatternResolver.CLASSPATH_ALL_URL_PREFIX + ClassUtils.convertClassNameToResourcePath(aliasesPackage.trim()) + "/" + DEFAULT_RESOURCE_PATTERN; Resource[] resources = resolver.getResources(aliasesPackage); - if (resources != null && resources.length > 0) - { + if (resources != null && resources.length > 0) { MetadataReader metadataReader = null; - for (Resource resource : resources) - { - if (resource.isReadable()) - { + for (Resource resource : resources) { + if (resource.isReadable()) { metadataReader = metadataReaderFactory.getMetadataReader(resource); - try - { + try { result.add(Class.forName(metadataReader.getClassMetadata().getClassName()).getPackage().getName()); - } - catch (ClassNotFoundException e) - { + } catch (ClassNotFoundException e) { e.printStackTrace(); } } } } - if (result.size() > 0) - { + if (result.size() > 0) { HashSet hashResult = new HashSet(result); allResult.addAll(hashResult); } } - if (allResult.size() > 0) - { + if (allResult.size() > 0) { typeAliasesPackage = String.join(",", (String[]) allResult.toArray(new String[0])); - } - else - { + } else { throw new RuntimeException("mybatis typeAliasesPackage 路径扫描错误,参数typeAliasesPackage:" + typeAliasesPackage + "未找到任何包"); } - } - catch (IOException e) - { + } catch (IOException e) { e.printStackTrace(); } return typeAliasesPackage; } - public Resource[] resolveMapperLocations(String[] mapperLocations) - { + public Resource[] resolveMapperLocations(String[] mapperLocations) { ResourcePatternResolver resourceResolver = new PathMatchingResourcePatternResolver(); List resources = new ArrayList(); - if (mapperLocations != null) - { - for (String mapperLocation : mapperLocations) - { - try - { + if (mapperLocations != null) { + for (String mapperLocation : mapperLocations) { + try { Resource[] mappers = resourceResolver.getResources(mapperLocation); resources.addAll(Arrays.asList(mappers)); - } - catch (IOException e) - { + } catch (IOException e) { // ignore } } } return resources.toArray(new Resource[resources.size()]); } - - @Bean - public SqlSessionFactory sqlSessionFactory(DataSource dataSource) throws Exception - { - String typeAliasesPackage = env.getProperty("mybatis.typeAliasesPackage"); - String mapperLocations = env.getProperty("mybatis.mapperLocations"); - String configLocation = env.getProperty("mybatis.configLocation"); - typeAliasesPackage = setTypeAliasesPackage(typeAliasesPackage); - VFS.addImplClass(SpringBootVFS.class); - - final SqlSessionFactoryBean sessionFactory = new SqlSessionFactoryBean(); - sessionFactory.setDataSource(dataSource); - sessionFactory.setTypeAliasesPackage(typeAliasesPackage); - sessionFactory.setMapperLocations(resolveMapperLocations(StringUtils.split(mapperLocations, ","))); - sessionFactory.setConfigLocation(new DefaultResourceLoader().getResource(configLocation)); - return sessionFactory.getObject(); - } } \ No newline at end of file diff --git a/ruoyi-system/src/main/resources/mapper/pt/BEventAccessMapper.xml b/ruoyi-system/src/main/resources/mapper/pt/BEventAccessMapper.xml index 38d4c7b..50652b1 100644 --- a/ruoyi-system/src/main/resources/mapper/pt/BEventAccessMapper.xml +++ b/ruoyi-system/src/main/resources/mapper/pt/BEventAccessMapper.xml @@ -111,75 +111,87 @@ where id = #{id} - - insert into b_event_access - - inner_event_id, - area_code, - community_code, - grid_code, - scence, - title, - content, - event_time, - event_coordinate, - msg_type, - msg_type_name, - event_url, - case_status, - event_creator, - event_creator_tel, - event_place_name, - event_duration, - execute_type, - remind_status, - event_file, - event_label, - scence_type, - scence_typename, - acceptance_time, - deal_time_limit, - refuse_time_limit, - feedback_time, - completion_time, - main_organizer, - enforce_law_organizer, - co_organizer, - - - #{innerEventId}, - #{areaCode}, - #{communityCode}, - #{gridCode}, - #{scence}, - #{title}, - #{content}, - #{eventTime}, - #{eventCoordinate}, - #{msgType}, - #{msgTypeName}, - #{eventUrl}, - #{caseStatus}, - #{eventCreator}, - #{eventCreatorTel}, - #{eventPlaceName}, - #{eventDuration}, - #{executeType}, - #{remindStatus}, - #{eventFile}, - #{eventLabel}, - #{scenceType}, - #{scenceTypename}, - #{acceptanceTime}, - #{dealTimeLimit}, - #{refuseTimeLimit}, - #{feedbackTime}, - #{completionTime}, - #{mainOrganizer}, - #{enforceLawOrganizer}, - #{coOrganizer}, - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + update b_event_access diff --git a/ruoyi-system/src/main/resources/mapper/pt/BEventProgressPushMapper.xml b/ruoyi-system/src/main/resources/mapper/pt/BEventProgressPushMapper.xml index f6d872a..3f3d532 100644 --- a/ruoyi-system/src/main/resources/mapper/pt/BEventProgressPushMapper.xml +++ b/ruoyi-system/src/main/resources/mapper/pt/BEventProgressPushMapper.xml @@ -1,67 +1,90 @@ + PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> - + - - - - - - - - - + + + + + + + + + - select id, inner_event_id, detail, url, progress_time, event_progress_status, event_progress_executor, event_progress_executor_id, event_progress_executor_org from b_event_progress_push + select id, + inner_event_id, + detail, + url, + progress_time, + event_progress_status, + event_progress_executor, + event_progress_executor_id, + event_progress_executor_org + from b_event_progress_push - + - - - insert into b_event_progress_push - - inner_event_id, - detail, - url, - progress_time, - event_progress_status, - event_progress_executor, - event_progress_executor_id, - event_progress_executor_org, - - - #{innerEventId}, - #{detail}, - #{url}, - #{progressTime}, - #{eventProgressStatus}, - #{eventProgressExecutor}, - #{eventProgressExecutorId}, - #{eventProgressExecutorOrg}, - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + update b_event_progress_push @@ -79,11 +102,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - delete from b_event_progress_push where id = #{id} + delete + from b_event_progress_push + where id = #{id} - delete from b_event_progress_push where id in + delete from b_event_progress_push where id in #{id}