diff --git a/KnowledgeBase/pom.xml b/KnowledgeBase/pom.xml index 0f2aee7..adb93b8 100644 --- a/KnowledgeBase/pom.xml +++ b/KnowledgeBase/pom.xml @@ -33,7 +33,10 @@ spring-boot-starter-test test - + + org.springframework.boot + spring-boot-starter-data-redis + com.squareup.okhttp3 okhttp @@ -72,6 +75,22 @@ 5.8.12 + + org.mybatis.spring.boot + mybatis-spring-boot-starter + 3.0.3 + + + com.mysql + mysql-connector-j + runtime + + + org.mybatis.spring.boot + mybatis-spring-boot-starter-test + 3.0.3 + test + diff --git a/KnowledgeBase/src/main/java/com/foresee/KnowledgeBase/KnowledgeBaseApplication.java b/KnowledgeBase/src/main/java/com/foresee/KnowledgeBase/KnowledgeBaseApplication.java index 4b863d5..d7f545d 100644 --- a/KnowledgeBase/src/main/java/com/foresee/KnowledgeBase/KnowledgeBaseApplication.java +++ b/KnowledgeBase/src/main/java/com/foresee/KnowledgeBase/KnowledgeBaseApplication.java @@ -3,7 +3,7 @@ package com.foresee.KnowledgeBase; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; -@SpringBootApplication(scanBasePackages = {"com.foresee"}) +@SpringBootApplication public class KnowledgeBaseApplication { public static void main(String[] args) { diff --git a/KnowledgeBase/src/main/java/com/foresee/KnowledgeBase/SynchronizeData/zsdy/Constant.java b/KnowledgeBase/src/main/java/com/foresee/KnowledgeBase/SynchronizeData/zsdy/Constant.java index 073e312..0e48f89 100644 --- a/KnowledgeBase/src/main/java/com/foresee/KnowledgeBase/SynchronizeData/zsdy/Constant.java +++ b/KnowledgeBase/src/main/java/com/foresee/KnowledgeBase/SynchronizeData/zsdy/Constant.java @@ -2,9 +2,9 @@ package com.foresee.KnowledgeBase.SynchronizeData.zsdy; public class Constant { - public static final String appId = "gjdw"; + public static final String appId = "1400386304"; - public static final String appKey = "gjdw"; + public static final String appKey = "917cabe380e071627e3e6700df2b4ee042d46d944b06d26f949c0a9539524367"; public static final String appSecret = "f3dbbf4815734bc39e9ae4374df34813"; diff --git a/KnowledgeBase/src/main/java/com/foresee/KnowledgeBase/SynchronizeData/zsdy/pull/PullData.java b/KnowledgeBase/src/main/java/com/foresee/KnowledgeBase/SynchronizeData/zsdy/pull/PullData.java index 40100f0..61aed15 100644 --- a/KnowledgeBase/src/main/java/com/foresee/KnowledgeBase/SynchronizeData/zsdy/pull/PullData.java +++ b/KnowledgeBase/src/main/java/com/foresee/KnowledgeBase/SynchronizeData/zsdy/pull/PullData.java @@ -20,7 +20,7 @@ public class PullData { String ts = DateUtil.date().getTime() + ""; String signStr = StringUtils.join("appId=", Constant.appId, "&appKey=", Constant.appKey, "&ts=", ts, "&appSecret=", Constant.appSecret); signStr = SmUtil.sm3(signStr); - return "appId="+Constant.appId+"&appKey="+Constant.appKey+"&appSecret="+Constant.appSecret+"&ts="+ts+"&sign="+signStr; + return "appId="+Constant.appId+"&appKey="+Constant.appKey+"&ts="+ts+"&sign="+signStr; } public static void main(String args[]) { @@ -28,11 +28,11 @@ public class PullData { String uri = Constant.host+Constant.idListUrl+"?"+uriParams; System.out.println("请求地址："+uri); Map datasParams = new HashMap(); - datasParams.put("startUpdateTime", "2024-03-03 00:00:00"); + datasParams.put("startUpdateTime", "2023-03-03 00:00:00"); datasParams.put("modelId", "fagui"); Map params = new HashMap(); params.put("params", datasParams); - params.put("dataType", "cmsContent"); + params.put("dataType", "CmsContent"); String jsonString = HttpCloseableClientUtil.post(uri, params); System.out.println(jsonString); } diff --git a/KnowledgeBase/src/main/java/com/foresee/KnowledgeBase/controller/TestController.java b/KnowledgeBase/src/main/java/com/foresee/KnowledgeBase/controller/TestController.java index 664a2f7..4ae8203 100644 --- a/KnowledgeBase/src/main/java/com/foresee/KnowledgeBase/controller/TestController.java +++ b/KnowledgeBase/src/main/java/com/foresee/KnowledgeBase/controller/TestController.java @@ -1,11 +1,21 @@ package com.foresee.KnowledgeBase.controller; -import org.springframework.stereotype.Controller; +import java.util.Date; + +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.data.redis.core.RedisTemplate; +import org.springframework.data.redis.core.StringRedisTemplate; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; +import com.foresee.KnowledgeBase.mapper.CmsUserSearchHistoryMapper; +import com.foresee.KnowledgeBase.pojo.CmsUserSearchHistory; +import com.foresee.KnowledgeBase.service.IUserSearchHistory; + +import cn.hutool.core.lang.UUID; +import jakarta.annotation.Resource; import jakarta.servlet.http.HttpServletRequest; import jakarta.servlet.http.HttpServletResponse; @@ -13,9 +23,27 @@ import jakarta.servlet.http.HttpServletResponse; @RequestMapping(value="/test") public class TestController { + @Autowired + private StringRedisTemplate redisTemplate; + + @Autowired + private IUserSearchHistory userSearchHistoryService; + @GetMapping(value="/sayHello.do") public String sayHello(HttpServletRequest request, HttpServletResponse response) { - return "hello"; + /*String value = (String) redisTemplate.opsForValue().get("testRedis"); + if(value==null) { + redisTemplate.opsForValue().set("testRedis", "success"); + }else { + redisTemplate.opsForValue().set("testRedis", "clean"); + }*/ + CmsUserSearchHistory cmsUserSearchHistory = new CmsUserSearchHistory(); + cmsUserSearchHistory.setId(UUID.randomUUID().toString().replaceAll("-", "")); + cmsUserSearchHistory.setSearchText("sayHello"); + cmsUserSearchHistory.setUserId("is me"); + cmsUserSearchHistory.setCreateDate(new Date()); + userSearchHistoryService.insert(cmsUserSearchHistory); + return "hello "; } @PostMapping(value="/sayHello2.do") diff --git a/KnowledgeBase/src/main/java/com/foresee/KnowledgeBase/mapper/CmsUserSearchHistoryMapper.java b/KnowledgeBase/src/main/java/com/foresee/KnowledgeBase/mapper/CmsUserSearchHistoryMapper.java new file mode 100644 index 0000000..bc2918c --- /dev/null +++ b/KnowledgeBase/src/main/java/com/foresee/KnowledgeBase/mapper/CmsUserSearchHistoryMapper.java @@ -0,0 +1,19 @@ +package com.foresee.KnowledgeBase.mapper; + +import com.foresee.KnowledgeBase.pojo.CmsUserSearchHistory; +import java.util.List; + +import org.apache.ibatis.annotations.Mapper; + +@Mapper +public interface CmsUserSearchHistoryMapper { + int deleteByPrimaryKey(String id); + + int insert(CmsUserSearchHistory record); + + CmsUserSearchHistory selectByPrimaryKey(String id); + + List selectAll(); + + int updateByPrimaryKey(CmsUserSearchHistory record); +} \ No newline at end of file diff --git a/KnowledgeBase/src/main/java/com/foresee/KnowledgeBase/mapper/CmsWordMapper.java b/KnowledgeBase/src/main/java/com/foresee/KnowledgeBase/mapper/CmsWordMapper.java new file mode 100644 index 0000000..9cb03d0 --- /dev/null +++ b/KnowledgeBase/src/main/java/com/foresee/KnowledgeBase/mapper/CmsWordMapper.java @@ -0,0 +1,19 @@ +package com.foresee.KnowledgeBase.mapper; + +import com.foresee.KnowledgeBase.pojo.CmsWord; +import java.util.List; + +import org.apache.ibatis.annotations.Mapper; + +@Mapper +public interface CmsWordMapper { + int deleteByPrimaryKey(Long id); + + int insert(CmsWord record); + + CmsWord selectByPrimaryKey(Long id); + + List selectAll(); + + int updateByPrimaryKey(CmsWord record); +} \ No newline at end of file diff --git a/KnowledgeBase/src/main/java/com/foresee/KnowledgeBase/pojo/CmsUserSearchHistory.java b/KnowledgeBase/src/main/java/com/foresee/KnowledgeBase/pojo/CmsUserSearchHistory.java new file mode 100644 index 0000000..11892b4 --- /dev/null +++ b/KnowledgeBase/src/main/java/com/foresee/KnowledgeBase/pojo/CmsUserSearchHistory.java @@ -0,0 +1,45 @@ +package com.foresee.KnowledgeBase.pojo; + +import java.util.Date; + +public class CmsUserSearchHistory { + private String id; + + private String userId; + + private String searchText; + + private Date createDate; + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id == null ? null : id.trim(); + } + + public String getUserId() { + return userId; + } + + public void setUserId(String userId) { + this.userId = userId == null ? null : userId.trim(); + } + + public String getSearchText() { + return searchText; + } + + public void setSearchText(String searchText) { + this.searchText = searchText == null ? null : searchText.trim(); + } + + public Date getCreateDate() { + return createDate; + } + + public void setCreateDate(Date createDate) { + this.createDate = createDate; + } +} \ No newline at end of file diff --git a/KnowledgeBase/src/main/java/com/foresee/KnowledgeBase/pojo/CmsWord.java b/KnowledgeBase/src/main/java/com/foresee/KnowledgeBase/pojo/CmsWord.java new file mode 100644 index 0000000..01076b2 --- /dev/null +++ b/KnowledgeBase/src/main/java/com/foresee/KnowledgeBase/pojo/CmsWord.java @@ -0,0 +1,75 @@ +package com.foresee.KnowledgeBase.pojo; + +import java.util.Date; + +public class CmsWord { + private Long id; + + private Integer siteId; + + private String name; + + private Integer searchCount; + + private Boolean hidden; + + private String ip; + + private Date createDate; + + public Long getId() { + return id; + } + + public void setId(Long id) { + this.id = id; + } + + public Integer getSiteId() { + return siteId; + } + + public void setSiteId(Integer siteId) { + this.siteId = siteId; + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name == null ? null : name.trim(); + } + + public Integer getSearchCount() { + return searchCount; + } + + public void setSearchCount(Integer searchCount) { + this.searchCount = searchCount; + } + + public Boolean getHidden() { + return hidden; + } + + public void setHidden(Boolean hidden) { + this.hidden = hidden; + } + + public String getIp() { + return ip; + } + + public void setIp(String ip) { + this.ip = ip == null ? null : ip.trim(); + } + + public Date getCreateDate() { + return createDate; + } + + public void setCreateDate(Date createDate) { + this.createDate = createDate; + } +} \ No newline at end of file diff --git a/KnowledgeBase/src/main/java/com/foresee/KnowledgeBase/service/IUserSearchHistory.java b/KnowledgeBase/src/main/java/com/foresee/KnowledgeBase/service/IUserSearchHistory.java new file mode 100644 index 0000000..6a87a5c --- /dev/null +++ b/KnowledgeBase/src/main/java/com/foresee/KnowledgeBase/service/IUserSearchHistory.java @@ -0,0 +1,8 @@ +package com.foresee.KnowledgeBase.service; + +import com.foresee.KnowledgeBase.pojo.CmsUserSearchHistory; + +public interface IUserSearchHistory { + + void insert(CmsUserSearchHistory record); +} diff --git a/KnowledgeBase/src/main/java/com/foresee/KnowledgeBase/service/impl/UserSearchHistoryService.java b/KnowledgeBase/src/main/java/com/foresee/KnowledgeBase/service/impl/UserSearchHistoryService.java new file mode 100644 index 0000000..3b94aaf --- /dev/null +++ b/KnowledgeBase/src/main/java/com/foresee/KnowledgeBase/service/impl/UserSearchHistoryService.java @@ -0,0 +1,22 @@ +package com.foresee.KnowledgeBase.service.impl; + +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import com.foresee.KnowledgeBase.mapper.CmsUserSearchHistoryMapper; +import com.foresee.KnowledgeBase.pojo.CmsUserSearchHistory; +import com.foresee.KnowledgeBase.service.IUserSearchHistory; + +@Service +public class UserSearchHistoryService implements IUserSearchHistory{ + + @Autowired + CmsUserSearchHistoryMapper cmsUserSearchHistoryMapper; + + @Override + public void insert(CmsUserSearchHistory record) { + // TODO Auto-generated method stub + cmsUserSearchHistoryMapper.insert(record); + } + +} diff --git a/KnowledgeBase/src/main/resources/application.properties b/KnowledgeBase/src/main/resources/application.properties index 7039e89..1f81c96 100644 --- a/KnowledgeBase/src/main/resources/application.properties +++ b/KnowledgeBase/src/main/resources/application.properties @@ -1,2 +1,36 @@ spring.application.name=KnowledgeBase -server.port=${port:8081} \ No newline at end of file +server.port=${port:8081} + +# Redis数据库索引（默认为0） +spring.data.redis.database=0 +# Redis服务器地址 +spring.data.redis.host=127.0.0.1 +# Redis服务器连接端口 +spring.data.redis.port=6379 +# Redis服务器连接密码（默认为空） +spring.data.redis.password= +# 连接池最大连接数（使用负值表示没有限制） +spring.data.redis.jedis.pool.max-active=8 +# 连接池最大阻塞等待时间（使用负值表示没有限制） +spring.data.redis.jedis.pool.max-wait=-1ms +# 连接池中的最大空闲连接 +spring.data.redis.jedis.pool.max-idle=8 +# 连接池中的最小空闲连接 +spring.data.redis.jedis.pool.min-idle=0 +# 连接超时时间（毫秒） +spring.data.redis.timeout=5000ms + + +#MySQL +#spring.datasource.url=jdbc:mysql://10.10.152.6:3307/db_swglpt_test +#spring.datasource.username=swglpt +#spring.datasource.password=Sjc*(xn29 + +spring.datasource.url=jdbc:mysql://172.16.140.11:3306/zsktest +spring.datasource.username=root +spring.datasource.password=Nl^PWMe5n*34 +spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver + +#MyBatis +mybatis.mapper-locations=classpath:/mybatis/*.xml + diff --git a/KnowledgeBase/src/main/resources/mybatis/CmsUserSearchHistoryMapper.xml b/KnowledgeBase/src/main/resources/mybatis/CmsUserSearchHistoryMapper.xml new file mode 100644 index 0000000..f57a7e7 --- /dev/null +++ b/KnowledgeBase/src/main/resources/mybatis/CmsUserSearchHistoryMapper.xml @@ -0,0 +1,36 @@ + + + + + + + + + + + delete from cms_user_search_history + where id = #{id,jdbcType=VARCHAR} + + + insert into cms_user_search_history (id, user_id, search_text, + create_date) + values (#{id,jdbcType=VARCHAR}, #{userId,jdbcType=VARCHAR}, #{searchText,jdbcType=VARCHAR}, + #{createDate,jdbcType=TIMESTAMP}) + + + update cms_user_search_history + set user_id = #{userId,jdbcType=VARCHAR}, + search_text = #{searchText,jdbcType=VARCHAR}, + create_date = #{createDate,jdbcType=TIMESTAMP} + where id = #{id,jdbcType=VARCHAR} + + + + \ No newline at end of file diff --git a/KnowledgeBase/src/main/resources/mybatis/CmsWordMapper.xml b/KnowledgeBase/src/main/resources/mybatis/CmsWordMapper.xml new file mode 100644 index 0000000..1a57036 --- /dev/null +++ b/KnowledgeBase/src/main/resources/mybatis/CmsWordMapper.xml @@ -0,0 +1,44 @@ + + + + + + + + + + + + + + delete from cms_word + where id = #{id,jdbcType=BIGINT} + + + insert into cms_word (id, site_id, name, + search_count, hidden, ip, + create_date) + values (#{id,jdbcType=BIGINT}, #{siteId,jdbcType=INTEGER}, #{name,jdbcType=VARCHAR}, + #{searchCount,jdbcType=INTEGER}, #{hidden,jdbcType=BIT}, #{ip,jdbcType=VARCHAR}, + #{createDate,jdbcType=TIMESTAMP}) + + + update cms_word + set site_id = #{siteId,jdbcType=INTEGER}, + name = #{name,jdbcType=VARCHAR}, + search_count = #{searchCount,jdbcType=INTEGER}, + hidden = #{hidden,jdbcType=BIT}, + ip = #{ip,jdbcType=VARCHAR}, + create_date = #{createDate,jdbcType=TIMESTAMP} + where id = #{id,jdbcType=BIGINT} + + + + \ No newline at end of file