From 69ee7c605579c009ee3c087fa265619ba55155f6 Mon Sep 17 00:00:00 2001 From: fangyuan <527392886@qq.com> Date: 星期五, 18 十一月 2022 10:57:33 +0800 Subject: [PATCH] 资讯相关接口,栏目相关接口 --- ycl-common/src/main/java/com/ycl/config/WebConfig.java | 88 ++++++------ ycl-platform/src/main/java/com/ycl/controller/NewsInformationController.java | 62 ++++++++ ycl-platform/src/main/java/com/ycl/service/NewsInformationService.java | 2 ycl-platform/src/main/java/com/ycl/mapper/NewsInformationDao.java | 2 ycl-platform/src/main/resources/mapper/NewsInformationPoliceDao.xml | 2 .idea/uiDesigner.xml | 124 +++++++++++++++++ ycl-platform/src/main/java/com/ycl/service/impl/NewsInformationServiceImpl.java | 9 + ycl-platform/src/main/java/com/ycl/mapper/NewsInformationPoliceDao.java | 2 ycl-platform/src/main/java/com/ycl/controller/NewsInformationPoliceController.java | 25 +++ ycl-platform/src/main/java/com/ycl/service/impl/NewsInformationPoliceServiceImpl.java | 2 ycl-platform/src/main/java/com/ycl/entity/NewsColumnInformation.java | 7 + /dev/null | 31 ---- ycl-platform/src/main/resources/mapper/NewsInformationDao.xml | 5 ycl-platform/src/main/java/com/ycl/entity/NewsInformationPolice.java | 7 + ycl-platform/src/main/java/com/ycl/entity/NewsChannel.java | 10 + .idea/compiler.xml | 2 ycl-platform/src/main/java/com/ycl/entity/NewsInformation.java | 32 ++++ 17 files changed, 322 insertions(+), 90 deletions(-) diff --git a/.idea/compiler.xml b/.idea/compiler.xml index 5c2e59d..efcd749 100644 --- a/.idea/compiler.xml +++ b/.idea/compiler.xml @@ -7,8 +7,8 @@ <sourceOutputDir name="target/generated-sources/annotations" /> <sourceTestOutputDir name="target/generated-test-sources/test-annotations" /> <outputRelativeToContentRoot value="true" /> - <module name="ycl-platform" /> <module name="ycl-common" /> + <module name="ycl-platform" /> </profile> </annotationProcessing> </component> diff --git a/.idea/uiDesigner.xml b/.idea/uiDesigner.xml new file mode 100644 index 0000000..b93ac08 --- /dev/null +++ b/.idea/uiDesigner.xml @@ -0,0 +1,124 @@ +<?xml version="1.0" encoding="UTF-8"?> +<project version="4"> + <component name="Palette2"> + <group name="Swing"> + <item class="com.intellij.uiDesigner.HSpacer" tooltip-text="Horizontal Spacer" icon="/com/intellij/uiDesigner/icons/hspacer.png" removable="false" auto-create-binding="false" can-attach-label="false"> + <default-constraints vsize-policy="1" hsize-policy="6" anchor="0" fill="1" /> + </item> + <item class="com.intellij.uiDesigner.VSpacer" tooltip-text="Vertical Spacer" icon="/com/intellij/uiDesigner/icons/vspacer.png" removable="false" auto-create-binding="false" can-attach-label="false"> + <default-constraints vsize-policy="6" hsize-policy="1" anchor="0" fill="2" /> + </item> + <item class="javax.swing.JPanel" icon="/com/intellij/uiDesigner/icons/panel.png" removable="false" auto-create-binding="false" can-attach-label="false"> + <default-constraints vsize-policy="3" hsize-policy="3" anchor="0" fill="3" /> + </item> + <item class="javax.swing.JScrollPane" icon="/com/intellij/uiDesigner/icons/scrollPane.png" removable="false" auto-create-binding="false" can-attach-label="true"> + <default-constraints vsize-policy="7" hsize-policy="7" anchor="0" fill="3" /> + </item> + <item class="javax.swing.JButton" icon="/com/intellij/uiDesigner/icons/button.png" removable="false" auto-create-binding="true" can-attach-label="false"> + <default-constraints vsize-policy="0" hsize-policy="3" anchor="0" fill="1" /> + <initial-values> + <property name="text" value="Button" /> + </initial-values> + </item> + <item class="javax.swing.JRadioButton" icon="/com/intellij/uiDesigner/icons/radioButton.png" removable="false" auto-create-binding="true" can-attach-label="false"> + <default-constraints vsize-policy="0" hsize-policy="3" anchor="8" fill="0" /> + <initial-values> + <property name="text" value="RadioButton" /> + </initial-values> + </item> + <item class="javax.swing.JCheckBox" icon="/com/intellij/uiDesigner/icons/checkBox.png" removable="false" auto-create-binding="true" can-attach-label="false"> + <default-constraints vsize-policy="0" hsize-policy="3" anchor="8" fill="0" /> + <initial-values> + <property name="text" value="CheckBox" /> + </initial-values> + </item> + <item class="javax.swing.JLabel" icon="/com/intellij/uiDesigner/icons/label.png" removable="false" auto-create-binding="false" can-attach-label="false"> + <default-constraints vsize-policy="0" hsize-policy="0" anchor="8" fill="0" /> + <initial-values> + <property name="text" value="Label" /> + </initial-values> + </item> + <item class="javax.swing.JTextField" icon="/com/intellij/uiDesigner/icons/textField.png" removable="false" auto-create-binding="true" can-attach-label="true"> + <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1"> + <preferred-size width="150" height="-1" /> + </default-constraints> + </item> + <item class="javax.swing.JPasswordField" icon="/com/intellij/uiDesigner/icons/passwordField.png" removable="false" auto-create-binding="true" can-attach-label="true"> + <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1"> + <preferred-size width="150" height="-1" /> + </default-constraints> + </item> + <item class="javax.swing.JFormattedTextField" icon="/com/intellij/uiDesigner/icons/formattedTextField.png" removable="false" auto-create-binding="true" can-attach-label="true"> + <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1"> + <preferred-size width="150" height="-1" /> + </default-constraints> + </item> + <item class="javax.swing.JTextArea" icon="/com/intellij/uiDesigner/icons/textArea.png" removable="false" auto-create-binding="true" can-attach-label="true"> + <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3"> + <preferred-size width="150" height="50" /> + </default-constraints> + </item> + <item class="javax.swing.JTextPane" icon="/com/intellij/uiDesigner/icons/textPane.png" removable="false" auto-create-binding="true" can-attach-label="true"> + <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3"> + <preferred-size width="150" height="50" /> + </default-constraints> + </item> + <item class="javax.swing.JEditorPane" icon="/com/intellij/uiDesigner/icons/editorPane.png" removable="false" auto-create-binding="true" can-attach-label="true"> + <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3"> + <preferred-size width="150" height="50" /> + </default-constraints> + </item> + <item class="javax.swing.JComboBox" icon="/com/intellij/uiDesigner/icons/comboBox.png" removable="false" auto-create-binding="true" can-attach-label="true"> + <default-constraints vsize-policy="0" hsize-policy="2" anchor="8" fill="1" /> + </item> + <item class="javax.swing.JTable" icon="/com/intellij/uiDesigner/icons/table.png" removable="false" auto-create-binding="true" can-attach-label="false"> + <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3"> + <preferred-size width="150" height="50" /> + </default-constraints> + </item> + <item class="javax.swing.JList" icon="/com/intellij/uiDesigner/icons/list.png" removable="false" auto-create-binding="true" can-attach-label="false"> + <default-constraints vsize-policy="6" hsize-policy="2" anchor="0" fill="3"> + <preferred-size width="150" height="50" /> + </default-constraints> + </item> + <item class="javax.swing.JTree" icon="/com/intellij/uiDesigner/icons/tree.png" removable="false" auto-create-binding="true" can-attach-label="false"> + <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3"> + <preferred-size width="150" height="50" /> + </default-constraints> + </item> + <item class="javax.swing.JTabbedPane" icon="/com/intellij/uiDesigner/icons/tabbedPane.png" removable="false" auto-create-binding="true" can-attach-label="false"> + <default-constraints vsize-policy="3" hsize-policy="3" anchor="0" fill="3"> + <preferred-size width="200" height="200" /> + </default-constraints> + </item> + <item class="javax.swing.JSplitPane" icon="/com/intellij/uiDesigner/icons/splitPane.png" removable="false" auto-create-binding="false" can-attach-label="false"> + <default-constraints vsize-policy="3" hsize-policy="3" anchor="0" fill="3"> + <preferred-size width="200" height="200" /> + </default-constraints> + </item> + <item class="javax.swing.JSpinner" icon="/com/intellij/uiDesigner/icons/spinner.png" removable="false" auto-create-binding="true" can-attach-label="true"> + <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1" /> + </item> + <item class="javax.swing.JSlider" icon="/com/intellij/uiDesigner/icons/slider.png" removable="false" auto-create-binding="true" can-attach-label="false"> + <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1" /> + </item> + <item class="javax.swing.JSeparator" icon="/com/intellij/uiDesigner/icons/separator.png" removable="false" auto-create-binding="false" can-attach-label="false"> + <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3" /> + </item> + <item class="javax.swing.JProgressBar" icon="/com/intellij/uiDesigner/icons/progressbar.png" removable="false" auto-create-binding="true" can-attach-label="false"> + <default-constraints vsize-policy="0" hsize-policy="6" anchor="0" fill="1" /> + </item> + <item class="javax.swing.JToolBar" icon="/com/intellij/uiDesigner/icons/toolbar.png" removable="false" auto-create-binding="false" can-attach-label="false"> + <default-constraints vsize-policy="0" hsize-policy="6" anchor="0" fill="1"> + <preferred-size width="-1" height="20" /> + </default-constraints> + </item> + <item class="javax.swing.JToolBar$Separator" icon="/com/intellij/uiDesigner/icons/toolbarSeparator.png" removable="false" auto-create-binding="false" can-attach-label="false"> + <default-constraints vsize-policy="0" hsize-policy="0" anchor="0" fill="1" /> + </item> + <item class="javax.swing.JScrollBar" icon="/com/intellij/uiDesigner/icons/scrollbar.png" removable="false" auto-create-binding="true" can-attach-label="false"> + <default-constraints vsize-policy="6" hsize-policy="0" anchor="0" fill="2" /> + </item> + </group> + </component> +</project> \ No newline at end of file diff --git a/ycl-common/src/main/java/com/ycl/config/WebConfig.java b/ycl-common/src/main/java/com/ycl/config/WebConfig.java index b02717d..f581c46 100644 --- a/ycl-common/src/main/java/com/ycl/config/WebConfig.java +++ b/ycl-common/src/main/java/com/ycl/config/WebConfig.java @@ -1,45 +1,43 @@ -//package com.ycl.config; -//import org.springframework.context.annotation.Bean; -//import org.springframework.context.annotation.Configuration; -//import org.springframework.core.Ordered; -//import org.springframework.core.annotation.Order; -//import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder; -//import org.springframework.security.crypto.password.PasswordEncoder; -//import org.springframework.web.cors.CorsConfiguration; -//import org.springframework.web.cors.UrlBasedCorsConfigurationSource; -//import org.springframework.web.filter.CorsFilter; -///** -// * @author Lyq -// * @version 1.0 -// * @date 2022/9/10 11:09 -// */ -//@Configuration -//@Order(Ordered.HIGHEST_PRECEDENCE) -//public class WebConfig { -// -// -// @Bean -// public CorsFilter corsFilter() { -// final UrlBasedCorsConfigurationSource source = new UrlBasedCorsConfigurationSource(); -// final CorsConfiguration config = new CorsConfiguration(); -// // 鍏佽cookies璺ㄥ煙 -// config.setAllowCredentials(true); -// // #鍏佽鍚戣鏈嶅姟鍣ㄦ彁浜よ姹傜殑URI锛�*琛ㄧず鍏ㄩ儴鍏佽锛屽湪SpringMVC涓紝濡傛灉璁炬垚*锛屼細鑷姩杞垚褰撳墠璇锋眰澶翠腑鐨凮rigin -// config.addAllowedOrigin("*"); -// // #鍏佽璁块棶鐨勫ご淇℃伅,*琛ㄧず鍏ㄩ儴 -// config.addAllowedHeader("*"); -// // 棰勬璇锋眰鐨勭紦瀛樻椂闂达紙绉掞級锛屽嵆鍦ㄨ繖涓椂闂存閲岋紝瀵逛簬鐩稿悓鐨勮法鍩熻姹備笉浼氬啀棰勬浜� -// config.setMaxAge(18000L); -// // 鍏佽鎻愪氦璇锋眰鐨勬柟娉曪紝*琛ㄧず鍏ㄩ儴鍏佽 -// config.addAllowedMethod("OPTIONS"); -// config.addAllowedMethod("HEAD"); -// // 鍏佽Get鐨勮姹傛柟娉� -// config.addAllowedMethod("GET"); -// config.addAllowedMethod("PUT"); -// config.addAllowedMethod("POST"); -// config.addAllowedMethod("DELETE"); -// config.addAllowedMethod("PATCH"); -// source.registerCorsConfiguration("/**", config); -// return new CorsFilter(source); -// } -//} +package com.ycl.config; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; +import org.springframework.core.Ordered; +import org.springframework.core.annotation.Order; +import org.springframework.web.cors.CorsConfiguration; +import org.springframework.web.cors.UrlBasedCorsConfigurationSource; +import org.springframework.web.filter.CorsFilter; +/** + * @author Lyq + * @version 1.0 + * @date 2022/9/10 11:09 + */ +@Configuration +@Order(Ordered.HIGHEST_PRECEDENCE) +public class WebConfig { + + + @Bean + public CorsFilter corsFilter() { + final UrlBasedCorsConfigurationSource source = new UrlBasedCorsConfigurationSource(); + final CorsConfiguration config = new CorsConfiguration(); + // 鍏佽cookies璺ㄥ煙 + config.setAllowCredentials(true); + // #鍏佽鍚戣鏈嶅姟鍣ㄦ彁浜よ姹傜殑URI锛�*琛ㄧず鍏ㄩ儴鍏佽锛屽湪SpringMVC涓紝濡傛灉璁炬垚*锛屼細鑷姩杞垚褰撳墠璇锋眰澶翠腑鐨凮rigin + config.addAllowedOrigin("*"); + // #鍏佽璁块棶鐨勫ご淇℃伅,*琛ㄧず鍏ㄩ儴 + config.addAllowedHeader("*"); + // 棰勬璇锋眰鐨勭紦瀛樻椂闂达紙绉掞級锛屽嵆鍦ㄨ繖涓椂闂存閲岋紝瀵逛簬鐩稿悓鐨勮法鍩熻姹備笉浼氬啀棰勬浜� + config.setMaxAge(18000L); + // 鍏佽鎻愪氦璇锋眰鐨勬柟娉曪紝*琛ㄧず鍏ㄩ儴鍏佽 + config.addAllowedMethod("OPTIONS"); + config.addAllowedMethod("HEAD"); + // 鍏佽Get鐨勮姹傛柟娉� + config.addAllowedMethod("GET"); + config.addAllowedMethod("PUT"); + config.addAllowedMethod("POST"); + config.addAllowedMethod("DELETE"); + config.addAllowedMethod("PATCH"); + source.registerCorsConfiguration("/**", config); + return new CorsFilter(source); + } +} diff --git a/ycl-platform/src/main/java/com/ycl/controller/NewsInformationController.java b/ycl-platform/src/main/java/com/ycl/controller/NewsInformationController.java index 7813bbc..9eef60c 100644 --- a/ycl-platform/src/main/java/com/ycl/controller/NewsInformationController.java +++ b/ycl-platform/src/main/java/com/ycl/controller/NewsInformationController.java @@ -5,14 +5,23 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.api.ApiController; import com.baomidou.mybatisplus.extension.api.R; +import com.baomidou.mybatisplus.extension.conditions.query.QueryChainWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.ycl.entity.NewsColumnInformation; import com.ycl.entity.NewsInformation; -import com.ycl.service.NewsInformationService; +import com.ycl.entity.NewsInformationPolice; +import com.ycl.entity.NewsPolice; +import com.ycl.service.*; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.transaction.annotation.Transactional; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; import java.io.Serializable; +import java.sql.SQLException; +import java.util.Collections; import java.util.List; +import java.util.stream.Collectors; /** * 璧勮琛�(NewsInformation)琛ㄦ帶鍒跺眰 @@ -29,6 +38,14 @@ @Resource private NewsInformationService newsInformationService; + @Autowired + private NewsPoliceService policeService; + + @Autowired + private NewsInformationPoliceService newsInformationPoliceService; + + @Autowired + private NewsColumnInformationService newsColumnInformationService; /** * 鍒嗛〉鏌ヨ鎵�鏈夋暟鎹� * @@ -38,7 +55,7 @@ */ @GetMapping public R selectAll(Page<NewsInformation> page, NewsInformation newsInformation) { - return success(this.newsInformationService.page(page, new QueryWrapper<>(newsInformation))); + return success(this.newsInformationService.page(page, new QueryWrapper<>(newsInformation).orderByDesc("publish_time"))); } /** @@ -58,9 +75,29 @@ * @param newsInformation 瀹炰綋瀵硅薄 * @return 鏂板缁撴灉 */ + @Transactional(rollbackFor = SQLException.class) @PostMapping public R insert(@RequestBody NewsInformation newsInformation) { - return success(this.newsInformationService.save(newsInformation)); + Integer saveResult = this.newsInformationService.insertOneInformation(newsInformation); + Integer informationId=newsInformation.getId(); + if (newsInformation.getIsSign()==0){ + List<String> departmentIds = newsInformation.getDepartmentId(); + for (String departmentId:departmentIds){ + QueryWrapper<NewsPolice> wrapper = new QueryWrapper(); + wrapper.eq("news_department_id",departmentId); + List<NewsPolice> list = policeService.list(wrapper); + if (!list.isEmpty()){ + for (NewsPolice newsPolice:list){ + newsInformationPoliceService.save(NewsInformationPolice.builder().newsPoliceId(newsPolice.getId()).newsInformationId(informationId).isSign(0).build()); + } + } + } + } + + for (String columnId:newsInformation.getColumnId()){ + newsColumnInformationService.save(NewsColumnInformation.builder().columnId(Integer.parseInt(columnId)).informationId(informationId).build()); + } + return success(saveResult); } /** @@ -71,6 +108,25 @@ */ @PutMapping public R update(@RequestBody NewsInformation newsInformation) { + Integer informationId = newsInformation.getId(); + if (newsInformation.getIsSign()==0){ + newsInformationPoliceService.remove(new QueryWrapper<NewsInformationPolice>().eq("news_information_id",informationId)); + List<String> departmentIds = newsInformation.getDepartmentId(); + for (String departmentId:departmentIds){ + QueryWrapper<NewsPolice> wrapper = new QueryWrapper(); + wrapper.eq("news_department_id",departmentId); + List<NewsPolice> list = policeService.list(wrapper); + if (!list.isEmpty()){ + for (NewsPolice newsPolice:list){ + newsInformationPoliceService.save(NewsInformationPolice.builder().newsPoliceId(newsPolice.getId()).newsInformationId(informationId).isSign(0).build()); + } + } + } + } + newsColumnInformationService.remove(new QueryWrapper<NewsColumnInformation>().eq("information_id",informationId)); + for (String columnId:newsInformation.getColumnId()){ + newsColumnInformationService.save(NewsColumnInformation.builder().columnId(Integer.parseInt(columnId)).informationId(informationId).build()); + } return success(this.newsInformationService.updateById(newsInformation)); } diff --git a/ycl-platform/src/main/java/com/ycl/controller/NewsInformationPoliceController.java b/ycl-platform/src/main/java/com/ycl/controller/NewsInformationPoliceController.java index ca6d89f..48cf832 100644 --- a/ycl-platform/src/main/java/com/ycl/controller/NewsInformationPoliceController.java +++ b/ycl-platform/src/main/java/com/ycl/controller/NewsInformationPoliceController.java @@ -64,15 +64,22 @@ } /** - * 淇敼鏁版嵁 + * 淇敼淇℃伅鎴栫鏀剁姸鎬� * * @param newsInformationPolice 瀹炰綋瀵硅薄 * @return 淇敼缁撴灉 */ @PutMapping - public R update(@RequestBody NewsInformationPolice newsInformationPolice) { + public R updateSignStatus(@RequestBody NewsInformationPolice newsInformationPolice) { + if (newsInformationPolice.getId()==null){ + QueryWrapper<NewsInformationPolice> wrapper = new QueryWrapper<>(); + NewsInformationPolice one = newsInformationPoliceService.getOne(wrapper.eq("news_information_id", newsInformationPolice.getNewsInformationId()).eq("news_police_id", newsInformationPolice.getNewsPoliceId())); + one.setIsSign(1); + return success(this.newsInformationPoliceService.updateById(one)); + } return success(this.newsInformationPoliceService.updateById(newsInformationPolice)); } + /** * 鍒犻櫎鏁版嵁 @@ -84,5 +91,19 @@ public R delete(@RequestParam("idList") List<Long> idList) { return success(this.newsInformationPoliceService.removeByIds(idList)); } + + /** + * 閫氳繃璧勮id鏌ヨ鎬绘暟鍜屽凡闃呬汉鏁� + * + * @param id 涓婚敭 + * @return 鍗曟潯鏁版嵁 + */ + @GetMapping("information/{id}") + public R selectListByInformationId(@PathVariable Serializable id) { + int sum = this.newsInformationPoliceService.count(new QueryWrapper<NewsInformationPolice>().eq("news_information_id", id)); + int sign = this.newsInformationPoliceService.count(new QueryWrapper<NewsInformationPolice>().eq("news_information_id", id).eq("is_sign",1)); + return success(sign+"/"+sum); + } + } diff --git a/ycl-platform/src/main/java/com/ycl/entity/NewsChannel.java b/ycl-platform/src/main/java/com/ycl/entity/NewsChannel.java index 957e9ea..ed0ecd2 100644 --- a/ycl-platform/src/main/java/com/ycl/entity/NewsChannel.java +++ b/ycl-platform/src/main/java/com/ycl/entity/NewsChannel.java @@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.extension.activerecord.Model; import java.io.Serializable; import java.sql.Date; +import java.util.List; /** * 棰戦亾琛�(NewsChannel)琛ㄥ疄浣撶被 @@ -21,7 +22,16 @@ private String code; //鍒涘缓鏃堕棿 private Date createTime; + //鏍忕洰id + private List<String> columnId; + public List<String> getColumnId() { + return columnId; + } + + public void setColumnId(List<String> columnId) { + this.columnId = columnId; + } public Integer getId() { return id; diff --git a/ycl-platform/src/main/java/com/ycl/entity/NewsColumnInformation.java b/ycl-platform/src/main/java/com/ycl/entity/NewsColumnInformation.java index 98511f1..de28394 100644 --- a/ycl-platform/src/main/java/com/ycl/entity/NewsColumnInformation.java +++ b/ycl-platform/src/main/java/com/ycl/entity/NewsColumnInformation.java @@ -2,6 +2,10 @@ import com.baomidou.mybatisplus.extension.activerecord.Model; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.NoArgsConstructor; + import java.io.Serializable; /** @@ -11,6 +15,9 @@ * @since 2022-11-17 11:38:27 */ @SuppressWarnings("serial") +@Builder +@NoArgsConstructor +@AllArgsConstructor public class NewsColumnInformation extends Model<NewsColumnInformation> { private Integer id; diff --git a/ycl-platform/src/main/java/com/ycl/entity/NewsInformation.java b/ycl-platform/src/main/java/com/ycl/entity/NewsInformation.java index 4de5a1d..1931ea9 100644 --- a/ycl-platform/src/main/java/com/ycl/entity/NewsInformation.java +++ b/ycl-platform/src/main/java/com/ycl/entity/NewsInformation.java @@ -2,8 +2,11 @@ import com.baomidou.mybatisplus.extension.activerecord.Model; +import com.fasterxml.jackson.annotation.JsonFormat; + import java.io.Serializable; import java.sql.Date; +import java.util.List; /** * 璧勮琛�(NewsInformation)琛ㄥ疄浣撶被 @@ -20,16 +23,37 @@ //鍐呭 private String content; //鍙戝竷鏃堕棿 + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") private Date publishTime; - //鏄惁绛炬敹0鏈鏀�1绛炬敹2涓嶉渶瑕佺鏀� + //鏄惁闇�瑕佺鏀�0闇�瑕佺鏀�1涓嶉渶瑕佺鏀� private Integer isSign; //鍒涘缓鏃堕棿 + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") private Date createTime; //璀﹀憳id - private Object sendTo; + private Integer sendTo; //鍥剧墖鍦板潃 private String imageUrl; + //閮ㄩ棬锛堟満鏋勶級id + private List<String> departmentId; + //鏍忕洰id + private List<String> columnId; + public List<String> getColumnId() { + return columnId; + } + + public void setColumnId(List<String> columnId) { + this.columnId = columnId; + } + + public List<String> getDepartmentId() { + return departmentId; + } + + public void setDepartmentId(List<String> departmentId) { + this.departmentId = departmentId; + } public Integer getId() { return id; @@ -79,11 +103,11 @@ this.createTime = createTime; } - public Object getSendTo() { + public Integer getSendTo() { return sendTo; } - public void setSendTo(Object sendTo) { + public void setSendTo(Integer sendTo) { this.sendTo = sendTo; } diff --git a/ycl-platform/src/main/java/com/ycl/entity/NewsInformationPolice.java b/ycl-platform/src/main/java/com/ycl/entity/NewsInformationPolice.java index d1900c0..700239f 100644 --- a/ycl-platform/src/main/java/com/ycl/entity/NewsInformationPolice.java +++ b/ycl-platform/src/main/java/com/ycl/entity/NewsInformationPolice.java @@ -2,6 +2,10 @@ import com.baomidou.mybatisplus.extension.activerecord.Model; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.NoArgsConstructor; + import java.io.Serializable; /** @@ -11,6 +15,9 @@ * @since 2022-11-17 15:17:21 */ @SuppressWarnings("serial") +@Builder +@NoArgsConstructor +@AllArgsConstructor public class NewsInformationPolice extends Model<NewsInformationPolice> { private Integer id; diff --git a/ycl-platform/src/main/java/com/ycl/mapper/NewsInformationDao.java b/ycl-platform/src/main/java/com/ycl/mapper/NewsInformationDao.java index 45a88cc..b92231b 100644 --- a/ycl-platform/src/main/java/com/ycl/mapper/NewsInformationDao.java +++ b/ycl-platform/src/main/java/com/ycl/mapper/NewsInformationDao.java @@ -31,5 +31,7 @@ */ int insertOrUpdateBatch(@Param("entities") List<NewsInformation> entities); +int insertOneInformation(@Param("entity") NewsInformation entity); + } diff --git a/ycl-platform/src/main/java/com/ycl/dao/NewsInformationPoliceDao.java b/ycl-platform/src/main/java/com/ycl/mapper/NewsInformationPoliceDao.java similarity index 97% rename from ycl-platform/src/main/java/com/ycl/dao/NewsInformationPoliceDao.java rename to ycl-platform/src/main/java/com/ycl/mapper/NewsInformationPoliceDao.java index 0d879b5..5928bb3 100644 --- a/ycl-platform/src/main/java/com/ycl/dao/NewsInformationPoliceDao.java +++ b/ycl-platform/src/main/java/com/ycl/mapper/NewsInformationPoliceDao.java @@ -1,4 +1,4 @@ -package com.ycl.dao; +package com.ycl.mapper; import java.util.List; diff --git a/ycl-platform/src/main/java/com/ycl/service/NewsInformationService.java b/ycl-platform/src/main/java/com/ycl/service/NewsInformationService.java index 5a6075d..a5fbfd6 100644 --- a/ycl-platform/src/main/java/com/ycl/service/NewsInformationService.java +++ b/ycl-platform/src/main/java/com/ycl/service/NewsInformationService.java @@ -10,6 +10,6 @@ * @since 2022-11-17 11:38:27 */ public interface NewsInformationService extends IService<NewsInformation> { - + int insertOneInformation(NewsInformation entity); } diff --git a/ycl-platform/src/main/java/com/ycl/service/impl/NewsInformationPoliceServiceImpl.java b/ycl-platform/src/main/java/com/ycl/service/impl/NewsInformationPoliceServiceImpl.java index 7a341ca..c4b0248 100644 --- a/ycl-platform/src/main/java/com/ycl/service/impl/NewsInformationPoliceServiceImpl.java +++ b/ycl-platform/src/main/java/com/ycl/service/impl/NewsInformationPoliceServiceImpl.java @@ -1,7 +1,7 @@ package com.ycl.service.impl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.ycl.dao.NewsInformationPoliceDao; +import com.ycl.mapper.NewsInformationPoliceDao; import com.ycl.entity.NewsInformationPolice; import com.ycl.service.NewsInformationPoliceService; import org.springframework.stereotype.Service; diff --git a/ycl-platform/src/main/java/com/ycl/service/impl/NewsInformationServiceImpl.java b/ycl-platform/src/main/java/com/ycl/service/impl/NewsInformationServiceImpl.java index d08da85..bffdf7b 100644 --- a/ycl-platform/src/main/java/com/ycl/service/impl/NewsInformationServiceImpl.java +++ b/ycl-platform/src/main/java/com/ycl/service/impl/NewsInformationServiceImpl.java @@ -4,6 +4,8 @@ import com.ycl.mapper.NewsInformationDao; import com.ycl.entity.NewsInformation; import com.ycl.service.NewsInformationService; +import org.apache.ibatis.annotations.Param; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; /** @@ -15,5 +17,12 @@ @Service("newsInformationService") public class NewsInformationServiceImpl extends ServiceImpl<NewsInformationDao, NewsInformation> implements NewsInformationService { + @Autowired + NewsInformationDao newsInformationDao; + + @Override + public int insertOneInformation(NewsInformation entity) { + return newsInformationDao.insertOneInformation(entity); + } } diff --git a/ycl-platform/src/main/resources/mapper/NewsDepartmentInformationDao.xml b/ycl-platform/src/main/resources/mapper/NewsDepartmentInformationDao.xml deleted file mode 100644 index fbe809b..0000000 --- a/ycl-platform/src/main/resources/mapper/NewsDepartmentInformationDao.xml +++ /dev/null @@ -1,31 +0,0 @@ -<?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.ycl.mapper.NewsDepartmentInformationDao"> - - <resultMap type="com.ycl.entity.NewsDepartmentInformation" id="NewsDepartmentInformationMap"> - <result property="id" column="id" jdbcType="INTEGER"/> - <result property="newsDepartmentId" column="news_department_id" jdbcType="INTEGER"/> - <result property="newsPoliceId" column="news_police_id" jdbcType="INTEGER"/> - <result property="isSign" column="is_sign" jdbcType="INTEGER"/> - </resultMap> - - <!-- 鎵归噺鎻掑叆 --> - <insert id="insertBatch" keyProperty="id" useGeneratedKeys="true"> - insert into news_website.news_department_information(news_department_id, news_police_id, is_sign) - values - <foreach collection="entities" item="entity" separator=","> - (#{entity.newsDepartmentId}, #{entity.newsPoliceId}, #{entity.isSign}) - </foreach> - </insert> - <!-- 鎵归噺鎻掑叆鎴栨寜涓婚敭鏇存柊 --> - <insert id="insertOrUpdateBatch" keyProperty="id" useGeneratedKeys="true"> - insert into news_website.news_department_information(news_department_id, news_police_id, is_sign) - values - <foreach collection="entities" item="entity" separator=","> - (#{entity.newsDepartmentId}, #{entity.newsPoliceId}, #{entity.isSign}) - </foreach> - on duplicate key update - news_department_id = values(news_department_id) , news_police_id = values(news_police_id) , is_sign = values(is_sign) </insert> - -</mapper> - diff --git a/ycl-platform/src/main/resources/mapper/NewsInformationDao.xml b/ycl-platform/src/main/resources/mapper/NewsInformationDao.xml index d3e7112..1c30fe2 100644 --- a/ycl-platform/src/main/resources/mapper/NewsInformationDao.xml +++ b/ycl-platform/src/main/resources/mapper/NewsInformationDao.xml @@ -31,5 +31,10 @@ on duplicate key update title = values(title) , content = values(content) , publish_time = values(publish_time) , is_sign = values(is_sign) , create_time = values(create_time) , send_to = values(send_to) , image_url = values(image_url) </insert> + <insert id="insertOneInformation" keyProperty="id" useGeneratedKeys="true"> + insert into news_website.news_information(title, content, publish_time, is_sign, create_time, send_to, image_url) + values (#{entity.title}, #{entity.content}, #{entity.publishTime}, #{entity.isSign}, #{entity.createTime}, #{entity.sendTo}, #{entity.imageUrl}) + + </insert> </mapper> diff --git a/ycl-platform/src/main/resources/mapper/NewsInformationPoliceDao.xml b/ycl-platform/src/main/resources/mapper/NewsInformationPoliceDao.xml index 38a5160..4111482 100644 --- a/ycl-platform/src/main/resources/mapper/NewsInformationPoliceDao.xml +++ b/ycl-platform/src/main/resources/mapper/NewsInformationPoliceDao.xml @@ -1,6 +1,6 @@ <?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.ycl.dao.NewsInformationPoliceDao"> +<mapper namespace="com.ycl.mapper.NewsInformationPoliceDao"> <resultMap type="com.ycl.entity.NewsInformationPolice" id="NewsInformationPoliceMap"> <result property="id" column="id" jdbcType="INTEGER"/> -- Gitblit v1.8.0